From 4db8c1305c33d47dc43778ee14c0aadbe8df43f1 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <kleinschmidtorama@gmail.com>
Date: Tue, 27 Dec 2016 12:49:01 -0500
Subject: [PATCH] Cleaned up patient history

Resolves #889
---
 app/models/visit.js            | 19 ++++++++++++-
 app/patients/edit/template.hbs | 49 ++++++++++------------------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/models/visit.js b/app/models/visit.js
index b03b0d77e2..4fc207c9dd 100644
--- a/app/models/visit.js
+++ b/app/models/visit.js
@@ -25,6 +25,8 @@ const PAYMENT_STATES = {
   CLEAR: 'clear',
   PENDING: 'pending'
 };
+const COMPLETED_STATUS = 'Completed';
+const FULFILLED_STATUS = 'Fulfilled';
 const REQUESTED_STATUS = 'Requested';
 const STATUS_FIELD = 'status';
 
@@ -86,7 +88,22 @@ export default AbstractModel.extend({
     }
   }),
 
-  hasDoneOrders: computed('labs', 'imaging', function() {
+  hasCompletedImaging: computed('imaging.@each.status', function() {
+    let imaging = this.get('imaging');
+    return imaging.isAny(STATUS_FIELD, COMPLETED_STATUS);
+  }),
+
+  hasCompletedLabs: computed('labs.@each.status', function() {
+    let labs = this.get('labs');
+    return labs.isAny(STATUS_FIELD, COMPLETED_STATUS);
+  }),
+
+  hasCompletedMedication: computed('medication.@each.status', function() {
+    let medication = this.get('medication');
+    return medication.isAny(STATUS_FIELD, FULFILLED_STATUS);
+  }),
+
+  hasDoneOrders: computed('imaging.@each.status', 'labs.@each.status', function() {
     let i18n = this.get('i18n');
     let imaging = this.get('imaging');
     let labs = this.get('labs');
diff --git a/app/patients/edit/template.hbs b/app/patients/edit/template.hbs
index d470617c17..ea99abd454 100644
--- a/app/patients/edit/template.hbs
+++ b/app/patients/edit/template.hbs
@@ -46,67 +46,46 @@
                       <div class="ph-note-item">
                         <h5 class="ph-note-heading">{{t 'labels.procedures' }}</h5>
                         {{#each visit.procedures as |procedure|}}
-                          <div {{action 'editProcedure' procedure }}>
+                          <div {{action 'editProcedure' procedure }} class="clickable">
                             <h5 class="ph-note-heading">
                               {{date-format procedure.procedureDate}}:
-                              {{#if procedure.cptCode}}
-                                [{{t 'labels.cptcode' }} - {{procedure.cptCode}}]
-                              {{/if}}
                               {{procedure.description}}
                             </h5>
-                            <h6>
-                              {{t 'labels.physician'}}: {{procedure.physician}}
-                              {{#if procedure.assistant}}
-                                , {{t 'labels.assisting'}}: {{procedure.assistant}}
-                              {{/if}}
-                              {{#if procedure.anesthesiologist}}
-                                , {{t 'labels.anesthesia'}}: {{procedure.anesthesiologist}}
-                              {{/if}}
-                            </h6>
-                            {{html-line-break procedure.notes}}
                           </div>
                         {{/each}}
                       </div>
                     {{/if}}
-                    {{#if visit.imaging}}
+                    {{#if visit.hasCompletedImaging}}
                       <div class="ph-note-item">
                         <h5 class="ph-note-heading">{{t 'labels.imageOrders' }}</h5>
                         {{#each visit.imaging as |imaging|}}
-                          <div {{action 'editImaging' imaging }}>
+                          {{#if (eq imaging.status 'Completed')}}
                             <h5 class="ph-note-heading">{{date-format imaging.imagingDate}}: {{imaging.imagingType.name}}</h5>
-                            <div>{{imaging.result}}</div>
-                            <div>{{html-line-break imaging.notes}}</div>
-                          </div>
+                          {{/if}}
                         {{/each}}
                       </div>
                     {{/if}}
-                    {{#if visit.labs}}
+                    {{#if visit.hasCompletedLabs}}
                       <div class="ph-note-item">
                         <h5 class="ph-note-heading">{{t 'labels.labOrders' }}</h5>
                         {{#each visit.labs as |lab|}}
-                          <div {{action 'editLab' lab }}>
+                          {{#if (eq lab.status 'Completed')}}
                             <h5 class="ph-note-heading">{{date-format lab.labDate}}: {{lab.labType.name}}</h5>
-                            <div>{{lab.result}}</div>
-                            <div>{{html-line-break lab.notes}}</div>
-                          </div>
+                          {{/if}}
                         {{/each}}
                       </div>
                     {{/if}}
-                    {{#if visit.patientNotes}}
+                    {{#if visit.hasCompletedMedication}}
                       <div class="ph-note-item">
-                        <h5 class="ph-note-heading">{{t 'labels.notes'}}</h5>
-                        {{#each visit.patientNotes as |note|}}
-                          <div {{action 'showAddPatientNote' note }}>
-                            <h5 class="ph-note-heading">{{note.authoredBy}}</h5>
-                            {{date-format note.date}}[{{note.noteType}}]: {{html-line-break note.content}}
-                          </div>
+                        <h5 class="ph-note-heading">{{t 'labels.medication' }}</h5>
+                        {{#each visit.medication as |medication|}}
+                          {{#if (eq medication.status 'Fulfilled')}}
+                            <h5 class="ph-note-heading">{{date-format medication.prescriptionDate}}: {{medication.medicationName}}</h5>
+                          {{/if}}
                         {{/each}}
                       </div>
-                    {{else}}
-                      <div class="ph-note-item">
-                        {{t 'messages.noNotesAvailable'}}
-                      </div>
                     {{/if}}
+
                   </div>
                 {{/each}}
               {{else}}