Fixes for UAT

caleboau2012 · Jul 26, 2017 · abac7a9 · abac7a9
1 parent ba65452
commit abac7a9
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 29 deletions.
diff --git a/_resource/pms_setup.sql b/_resource/pms_setup.sql
@@ -256,6 +256,7 @@ CREATE TABLE IF NOT EXISTS `chemical_pathology_request` (
   `doctor_id` int(11) DEFAULT NULL,
   `lab_attendant_id` int(11) DEFAULT NULL,
   `status_id` int(11) NOT NULL DEFAULT '5',
+  `bill_status` int(11) NOT NULL DEFAULT '1',
   `cp_ref_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`cpreq_id`),
   UNIQUE KEY `NewIndex1` (`laboratory_ref`),
@@ -415,6 +416,7 @@ INSERT INTO `emergency_detail` (`emergency_status_id`, `emergency_status`) VALUE
 --
 -- Table structure for table `treatment_procedure`
 --
+
 CREATE TABLE `treatment_procedure` (
   `id` int(11) NOT NULL,
   `treatment_id` int(11) NOT NULL,
@@ -424,6 +426,25 @@ CREATE TABLE `treatment_procedure` (
   `modified_date` datetime DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `treatment_procedure`
+--
+ALTER TABLE `treatment_procedure`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `treatment_procedure`
+--
+ALTER TABLE `treatment_procedure`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;COMMIT;
 --
 -- HMO Table
 --
@@ -506,28 +527,51 @@ ALTER TABLE `hmo`
 -- Table structure for table `encounter`
 --
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `encounter`
+--
 DROP TABLE IF EXISTS `encounter`;
-CREATE TABLE IF NOT EXISTS `encounter` (
-  `encounter_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+CREATE TABLE `encounter` (
+  `encounter_id` int(11) UNSIGNED NOT NULL,
   `personnel_id` int(11) DEFAULT NULL,
   `patient_id` int(11) UNSIGNED DEFAULT NULL,
   `admission_id` int(11) UNSIGNED DEFAULT NULL,
   `comments` text,
   `created_date` datetime DEFAULT NULL,
   `active_fg` tinyint(1) DEFAULT '1',
   `treatment_id` int(11) DEFAULT NULL,
-  `symptoms` varchar(200) DEFAULT NULL,
-  `consultation` varchar(200) DEFAULT NULL,
+  `symptoms` text,
+  `consultation` text,
   `status` int(11) DEFAULT '1',
   `bill_status` int(11) DEFAULT '1',
   `modified_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `diagnosis` text,
-  PRIMARY KEY (`encounter_id`),
-  KEY `fk_PatientEncountered` (`patient_id`),
-  KEY `fk_PersonnelEncountered` (`personnel_id`),
-  KEY `fk_AdmissionEncounter` (`admission_id`)
+  `diagnosis` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `encounter`
+--
+ALTER TABLE `encounter`
+  ADD PRIMARY KEY (`encounter_id`),
+  ADD KEY `fk_PatientEncountered` (`patient_id`),
+  ADD KEY `fk_PersonnelEncountered` (`personnel_id`),
+  ADD KEY `fk_AdmissionEncounter` (`admission_id`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `encounter`
+--
+ALTER TABLE `encounter`
+  MODIFY `encounter_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;COMMIT;
 -- --------------------------------------------------------
 
 --

diff --git a/js/billing.js b/js/billing.js
@@ -242,10 +242,10 @@ Billing = {
                 });
             }
             if(data.data.test.blood_test){
-                $.each(data.data.test.chemical_test, function(key, value ) {
+                $.each(data.data.test.blood_test, function(key, value ) {
                     $('#test').append("<tr>" +
                         "<td>Haematology</td>" +
-                        "<td>" + checkNull(value.clinical_diagnosis) + "</td>" +
+                        "<td>" + checkNull(value.clinical_diagnosis_details) + "</td>" +
                         "<td>" + value.created_date + "</td>" +
                         "</tr>");
                 });

diff --git a/view/treatment/in-patient.php b/view/treatment/in-patient.php
@@ -133,11 +133,11 @@
 
 <script id="tmplTreatmentHistory" type="text/html">
     <li class="list-group-item">
-        <a class="collapsed treatment-history-template" data-toggle="collapse" data-parent="#accordion{{userid}}"
-           href="#collapse{{treatmentid}}" aria-expanded="false" aria-controls="collapse{{treatmentid}}">
+        <a class="collapsed treatment-history-template" data-toggle="collapse" data-parent="#treatment{{userid}}"
+           href="#collapseTreatment{{treatmentid}}" aria-expanded="false" aria-controls="collapseTreatment{{treatmentid}}">
             <span>Session {{treatmentid}}</span> <b>Diagnosis:</b> {{diagnosis}}
         </a>
-        <div id="collapse{{treatmentid}}" class="panel-collapse collapse" role="tabpanel"
+        <div id="collapseTreatment{{treatmentid}}" class="panel-collapse collapse" role="tabpanel"
              aria-labelledby="heading{{treatmentid}}">
             <div class="panel-body">
                 <p><b>Comments:</b> {{comments}}</p>
@@ -185,10 +185,10 @@
 <script id="tmplVitals" type="text/html">
     <li class="list-group-item">
         <a class="collapsed" data-toggle="collapse" data-parent="#vitals{{userid}}"
-           href="#collapse{{id}}" aria-expanded="false" aria-controls="collapse{{id}}">
+           href="#collapseVitals{{id}}" aria-expanded="false" aria-controls="collapseVitals{{id}}">
             <b>Date:</b> {{created_date}}
         </a>
-        <div id="collapse{{id}}" class="panel-collapse collapse" role="tabpanel"
+        <div id="collapseVitals{{id}}" class="panel-collapse collapse" role="tabpanel"
              aria-labelledby="heading{{id}}">
             <div class="panel-body">
                 <p><b>Blood Pressure:</b> {{blood_pressure}}</p>
@@ -298,15 +298,15 @@
                             </div>
                         </div>
                         <div class="col-xs-12">
-                            <div class="panel-group" id="accordion">
+                            <div class="panel-group" id="socialMedical">
                                 <div class="panel panel-danger">
                                     <div class="panel-heading">
                                         <h4 class="panel-title">
-                                            <a data-toggle="collapse" data-parent="#accordion" href="#collapse1">
+                                            <a data-toggle="collapse" data-parent="#socialMedical" href="#socialMedicalHistory">
                                                 Social/Medical History</a>
                                         </h4>
                                     </div>
-                                    <div id="collapse1" class="panel-collapse collapse">
+                                    <div id="socialMedicalHistory" class="panel-collapse collapse">
                                         <div class="panel-body">
                                             <div class="row">
                                                 <div class="col-md-6">

diff --git a/view/treatment/out-patient.php b/view/treatment/out-patient.php
@@ -128,11 +128,11 @@
 
 <script id="tmplTreatmentHistory" type="text/html">
     <li class="list-group-item">
-        <a class="collapsed treatment-history-template" data-toggle="collapse" data-parent="#accordion{{userid}}"
-           href="#collapse{{treatmentid}}" aria-expanded="false" aria-controls="collapse{{treatmentid}}">
+        <a class="collapsed treatment-history-template" data-toggle="collapse" data-parent="#treatment{{userid}}"
+           href="#collapseTreatment{{treatmentid}}" aria-expanded="false" aria-controls="collapseTreatment{{treatmentid}}">
             <span>Session {{treatmentid}}</span> <b>Diagnosis:</b> {{diagnosis}}
         </a>
-        <div id="collapse{{treatmentid}}" class="panel-collapse collapse" role="tabpanel"
+        <div id="collapseTreatment{{treatmentid}}" class="panel-collapse collapse" role="tabpanel"
              aria-labelledby="heading{{treatmentid}}">
             <div class="panel-body">
                 <p><b>Comments:</b> {{comments}}</p>
@@ -180,10 +180,10 @@
 <script id="tmplVitals" type="text/html">
     <li class="list-group-item">
         <a class="collapsed" data-toggle="collapse" data-parent="#vitals{{userid}}"
-           href="#collapse{{id}}" aria-expanded="false" aria-controls="collapse{{id}}">
+           href="#collapseVitals{{id}}" aria-expanded="false" aria-controls="collapseVitals{{id}}">
             <b>Date:</b> {{created_date}}
         </a>
-        <div id="collapse{{id}}" class="panel-collapse collapse" role="tabpanel"
+        <div id="collapseVitals{{id}}" class="panel-collapse collapse" role="tabpanel"
              aria-labelledby="heading{{id}}">
             <div class="panel-body">
                 <p><b>Blood Pressure:</b> {{blood_pressure}}</p>
@@ -293,23 +293,23 @@
                             </div>
                         </div>
                         <div class="col-xs-12">
-                            <div class="panel-group" id="accordion">
+                            <div class="panel-group" id="socialMedical">
                                 <div class="panel panel-danger">
                                     <div class="panel-heading">
                                         <h4 class="panel-title">
-                                            <a data-toggle="collapse" data-parent="#accordion" href="#collapse1">
+                                            <a data-toggle="collapse" data-parent="#socialMedical" href="#socialMedicalHistory">
                                                 Social/Medical History</a>
                                         </h4>
                                     </div>
-                                    <div id="collapse1" class="panel-collapse collapse">
+                                    <div id="socialMedicalHistory" class="panel-collapse collapse">
                                         <div class="panel-body">
                                             <div class="row">
                                                 <div class="col-md-6">
                                                     <span>
                                                         <b>Allergies:</b>
                                                         <span class="capitalize-first allergies"></span>
                                                         </span><br>
-                                                            <span>
+                                                    <span>
                                                         <b>Alcohol Usage:</b>
                                                         <span class="capitalize-first alcohol_usage"></span><br>
                                                         <span>
@@ -323,7 +323,8 @@
                                                     <span class="capitalize-first tobacco_usage"></span><br>
                                                     <span>
                                                         <b>Medical History:</b>
-                                                        <span class="capitalize-first medical_history"></span><br>
+                                                        <span class="capitalize-first medical_history"></span>
+                                                        <br>
                                                         <b>Family History:</b>
                                                         <span class="capitalize-first family_history"></span><br>
                                                         <span>