From f85b01d6b539bf191f7a2236ad2173419db492e6 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Mon, 11 Mar 2013 20:38:08 -0700
Subject: [PATCH] Moved diagnoses from orders to individual procedures.

---
 interface/forms/procedure_order/new.php    | 29 +++++++++++++++--------------
 interface/forms/procedure_order/report.php |  2 +-
 interface/orders/gen_hl7_order.inc.php     | 10 +++++-----
 interface/orders/single_order_results.php  |  8 +++++---
 sql/4_1_1-to-4_1_2_upgrade.sql             | 11 +++++++++++
 sql/database.sql                           |  2 +-
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/interface/forms/procedure_order/new.php b/interface/forms/procedure_order/new.php
index f2b2b3014..3b2d25c8f 100644
--- a/interface/forms/procedure_order/new.php
+++ b/interface/forms/procedure_order/new.php
@@ -75,7 +75,6 @@ if ($_POST['bn_save'] || $_POST['bn_xmit']) {
     "date_collected = " . QuotedOrNull(formData('form_date_collected')) . ", " .
     "order_priority = '" . formData('form_order_priority')              . "', " .
     "order_status = '" . formData('form_order_status')                  . "', " .
-    "diagnoses = '" . formData('form_diagnoses')                        . "', " .
     "patient_instructions = '" . formData('form_patient_instructions')  . "', " .
     "patient_id = '" . $pid                                             . "', " .
     "encounter_id = '" . $encounter                                     . "'";
@@ -112,9 +111,10 @@ if ($_POST['bn_save'] || $_POST['bn_xmit']) {
 
     $poseq = sqlInsert("INSERT INTO procedure_order_code SET ".
       "procedure_order_id = ?, " .
+      "diagnoses = ?, " .
       "procedure_code = (SELECT procedure_code FROM procedure_type WHERE procedure_type_id = ?), " .
       "procedure_name = (SELECT name FROM procedure_type WHERE procedure_type_id = ?)",
-      array($formid, $ptid, $ptid));
+      array($formid, strip_escape_custom($_POST['form_proc_type_diag'][$i]), $ptid, $ptid));
 
     $qres = sqlStatement("SELECT " .
       "q.procedure_code, q.question_code, q.options, q.fldtype " .
@@ -292,6 +292,12 @@ function addProcLine() {
   " title='<?php echo xla('Click to select the desired procedure'); ?>'" +
   "  style='width:100%;cursor:pointer;cursor:hand' readonly />" +
   " <input type='hidden' name='form_proc_type[" + i + "]' value='-1' />" +
+  "<br /><b><?php echo xla('Diagnoses'); ?>: </b>" +
+  "<input type='text' size='50' name='form_proc_type_diag[" + i + "]'" +
+  " onclick='sel_related(this.name)'" +
+  " title='<?php echo xla('Click to add a diagnosis'); ?>'" +
+  " onfocus='this.blur()'" +
+  " style='cursor:pointer;cursor:hand' readonly />" +
   " <div style='width:95%;' id='qoetable[" + i + "]'></div>";
  sel_proc_type(i);
  return false;
@@ -424,17 +430,6 @@ generate_form_field(array('data_type'=>1,'field_id'=>'order_status',
  </tr>
 
  <tr>
-  <td width='1%' valign='top' nowrap><b><?php xl('Diagnoses','e'); ?>:</b></td>
-  <td valign='top'>
-   <input type='text' size='50' name='form_diagnoses'
-    value='<?php echo $row['diagnoses'] ?>' onclick='sel_related(this.name)'
-    title='<?php echo xla('Click to add a diagnosis'); ?>'
-    onfocus='this.blur()'
-    style='width:100%;cursor:pointer;cursor:hand' readonly />
-  </td>
- </tr>
-
- <tr>
   <td width='1%' valign='top' nowrap><b><?php xl('Patient Instructions','e'); ?>:</b></td>
   <td valign='top'>
    <textarea rows='3' cols='40' name='form_patient_instructions' style='width:100%'
@@ -465,7 +460,7 @@ generate_form_field(array('data_type'=>1,'field_id'=>'order_status',
   if ($formid) {
     $opres = sqlStatement("SELECT " .
       "pc.procedure_order_seq, pc.procedure_code, pc.procedure_name, " .
-      "pt.procedure_type_id " .
+      "pc.diagnoses, pt.procedure_type_id " .
       "FROM procedure_order_code AS pc " .
       "LEFT JOIN procedure_type AS pt ON pt.lab_id = ? AND " .
       "pt.procedure_code = pc.procedure_code " .
@@ -495,6 +490,12 @@ generate_form_field(array('data_type'=>1,'field_id'=>'order_status',
     title='<?php xla('Click to select the desired procedure','e'); ?>'
     style='width:100%;cursor:pointer;cursor:hand' readonly />
    <input type='hidden' name='form_proc_type[<?php echo $i; ?>]' value='<?php echo $ptid ?>' />
+   <br /><b><?php echo xlt('Diagnoses'); ?>:</b>
+   <input type='text' size='50' name='form_proc_type_diag[<?php echo $i; ?>]'
+    value='<?php echo attr($oprow['diagnoses']) ?>' onclick='sel_related(this.name)'
+    title='<?php echo xla('Click to add a diagnosis'); ?>'
+    onfocus='this.blur()'
+    style='cursor:pointer;cursor:hand' readonly />
    <!-- MSIE innerHTML property for a TABLE element is read-only, so using a DIV here. -->
    <div style='width:95%;' id='qoetable[<?php echo $i; ?>]'>
 <?php
diff --git a/interface/forms/procedure_order/report.php b/interface/forms/procedure_order/report.php
index ea4b3f5dc..b8a5901ea 100644
--- a/interface/forms/procedure_order/report.php
+++ b/interface/forms/procedure_order/report.php
@@ -12,7 +12,7 @@ include_once($GLOBALS["srcdir"] . "/options.inc.php");
 
 function procedure_order_report($pid, $encounter, $cols, $id) {
   $data = sqlQuery("SELECT " .
-    "po.procedure_order_id, po.date_ordered, po.diagnoses, " .
+    "po.procedure_order_id, po.date_ordered, " .
     "po.order_status, po.specimen_type, " .
     "pp.name AS labname, pr.procedure_report_id, " .
     "u.lname AS ulname, u.fname AS ufname, u.mname AS umname " .
diff --git a/interface/orders/gen_hl7_order.inc.php b/interface/orders/gen_hl7_order.inc.php
index 808d88d91..608a875a5 100644
--- a/interface/orders/gen_hl7_order.inc.php
+++ b/interface/orders/gen_hl7_order.inc.php
@@ -2,7 +2,7 @@
 /**
 * Functions to support HL7 order generation.
 *
-* Copyright (C) 2012 Rod Roark <rod@sunsetsystems.com>
+* Copyright (C) 2012-2013 Rod Roark <rod@sunsetsystems.com>
 *
 * LICENSE: This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -150,7 +150,7 @@ function gen_hl7_order($orderid, &$out) {
   $out = '';
 
   $porow = sqlQuery("SELECT " .
-    "po.date_collected, po.date_ordered, po.order_priority, po.diagnoses, " .
+    "po.date_collected, po.date_ordered, po.order_priority, " .
     "pp.*, " .
     "pd.pid, pd.pubpid, pd.fname, pd.lname, pd.mname, pd.DOB, pd.ss, " .
     "pd.phone_home, pd.phone_biz, pd.sex, pd.street, pd.city, pd.state, pd.postal_code, " .
@@ -168,7 +168,7 @@ function gen_hl7_order($orderid, &$out) {
   if (empty($porow)) return "Procedure order or lab is missing for order ID '$orderid'";
 
   $pcres = sqlStatement("SELECT " .
-    "pc.procedure_code, pc.procedure_name, pc.procedure_order_seq " .
+    "pc.procedure_code, pc.procedure_name, pc.procedure_order_seq, pc.diagnoses " .
     "FROM procedure_order_code AS pc " .
     "WHERE " .
     "pc.procedure_order_id = ? " .
@@ -337,8 +337,8 @@ function gen_hl7_order($orderid, &$out) {
     // Diagnoses.  Currently hard-coded for ICD9 and we'll surely want to make
     // this more flexible (probably when some lab needs another diagnosis type).
     $setid2 = 0;
-    if (!empty($porow['diagnoses'])) {
-      $relcodes = explode(';', $porow['diagnoses']);
+    if (!empty($pcrow['diagnoses'])) {
+      $relcodes = explode(';', $pcrow['diagnoses']);
       foreach ($relcodes as $codestring) {
         if ($codestring === '') continue;
         list($codetype, $code) = explode(':', $codestring);
diff --git a/interface/orders/single_order_results.php b/interface/orders/single_order_results.php
index 94ca84df1..a75c2aa07 100644
--- a/interface/orders/single_order_results.php
+++ b/interface/orders/single_order_results.php
@@ -78,15 +78,17 @@ if (!empty($_POST['form_sign_list'])) {
 }
 
 $orow = sqlQuery("SELECT " .
-  "po.procedure_order_id, po.date_ordered, po.diagnoses, " .
+  "po.procedure_order_id, po.date_ordered, " .
   "po.order_status, po.specimen_type, " .
   "pd.pubpid, pd.lname, pd.fname, pd.mname, " .
+  "fe.date, " .
   "pp.name AS labname, " .
   "u.lname AS ulname, u.fname AS ufname, u.mname AS umname " .
   "FROM procedure_order AS po " .
   "LEFT JOIN patient_data AS pd ON pd.pid = po.patient_id " .
   "LEFT JOIN procedure_providers AS pp ON pp.ppid = po.lab_id " .
   "LEFT JOIN users AS u ON u.id = po.provider_id " .
+  "LEFT JOIN form_encounter AS fe ON fe.pid = po.patient_id AND fe.encounter = po.encounter_id " .
   "WHERE po.procedure_order_id = ?",
   array($orderid));
 ?>
@@ -160,8 +162,8 @@ var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
  <tr bgcolor='#cccccc'>
   <td nowrap><?php echo xlt('Order Status'); ?></td>
   <td><?php echo myCellText($orow['order_status']); ?></td>
-  <td nowrap><?php echo xlt('Diagnoses'); ?></td>
-  <td><?php echo myCellText($orow['diagnoses']); ?></td>
+  <td nowrap><?php echo xlt('Encounter Date'); ?></td>
+  <td><?php echo myCellText(oeFormatShortDate(substr($orow['date'], 0, 10))); ?></td>
  </tr>
  <tr bgcolor='#cccccc'>
   <td nowrap><?php echo xlt('Lab'); ?></td>
diff --git a/sql/4_1_1-to-4_1_2_upgrade.sql b/sql/4_1_1-to-4_1_2_upgrade.sql
index e08764e02..de53a8037 100644
--- a/sql/4_1_1-to-4_1_2_upgrade.sql
+++ b/sql/4_1_1-to-4_1_2_upgrade.sql
@@ -329,3 +329,14 @@ CREATE TABLE IF NOT EXISTS `direct_message_log` (
   KEY `patient_id` (`patient_id`)
 ) ENGINE=MyISAM;
 #EndIf
+
+#IfMissingColumn procedure_order_code diagnoses
+ALTER TABLE `procedure_order_code`
+  ADD COLUMN `diagnoses` text NOT NULL DEFAULT '' COMMENT
+  'diagnoses and maybe other coding (e.g. ICD9:111.11)';
+UPDATE procedure_order_code AS pc, procedure_order AS po
+  SET pc.diagnoses = po.diagnoses
+  WHERE po.procedure_order_id = pc.procedure_order_id;
+ALTER TABLE `procedure_order` DROP COLUMN diagnoses;
+#EndIf
+
diff --git a/sql/database.sql b/sql/database.sql
index 3334fb7d5..335d7facd 100644
--- a/sql/database.sql
+++ b/sql/database.sql
@@ -5457,7 +5457,6 @@ CREATE TABLE `procedure_order` (
   `date_ordered`           date         DEFAULT NULL,
   `order_priority`         varchar(31)  NOT NULL DEFAULT '',
   `order_status`           varchar(31)  NOT NULL DEFAULT '' COMMENT 'pending,routed,complete,canceled',
-  `diagnoses`              text         NOT NULL DEFAULT '' COMMENT 'diagnoses and maybe other coding (e.g. ICD9:111.11)',
   `patient_instructions`   text         NOT NULL DEFAULT '',
   `activity`               tinyint(1)   NOT NULL DEFAULT 1  COMMENT '0 if deleted',
   `control_id`             bigint(20)   NOT NULL            COMMENT 'This is the CONTROL ID that is sent back from lab',
@@ -5476,6 +5475,7 @@ CREATE TABLE `procedure_order_code` (
   `procedure_code`      varchar(31) NOT NULL DEFAULT ''     COMMENT 'like procedure_type.procedure_code',
   `procedure_name`      varchar(255) NOT NULL DEFAULT ''    COMMENT 'descriptive name of the procedure code',
   `procedure_source`    char(1)     NOT NULL DEFAULT '1'    COMMENT '1=original order, 2=added after order sent',
+  `diagnoses`           text        NOT NULL DEFAULT ''     COMMENT 'diagnoses and maybe other coding (e.g. ICD9:111.11)',
   PRIMARY KEY (`procedure_order_id`, `procedure_order_seq`)
 ) ENGINE=MyISAM;
 
-- 
2.11.4.GIT