Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

js-dev/mc.js

@@ -602,6 +602,21 @@ window.saveVisitForm = function(_trigger, _silent = false, _close = false, _done
                     else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('history_surgical/edit') !== -1) {
                         $('.visit-segment[data-segment-template-name="omega_history_surgical"]').find('.refresh-segment').trigger('click');
                     }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('allergies-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_allergies"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('medications-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_medications"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('problems-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_problems"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('goals-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_goals"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('careteam-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_care_team"]').find('.refresh-segment').trigger('click');
+                    }
                 }
                 else if(form.attr('url') === '/api/visitPoint/upsertChildPlan') {
                     if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('past_medical_history/edit') !== -1) {
@@ -616,6 +631,21 @@ window.saveVisitForm = function(_trigger, _silent = false, _close = false, _done
                     else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('history_surgical/edit') !== -1) {
                         $('.visit-segment[data-segment-template-name="omega_history_surgical"]').find('.refresh-segment').trigger('click');
                     }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('allergies-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_allergies"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('medications-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_medications"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('problems-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_problems"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('goals-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_goals"]').find('.refresh-segment').trigger('click');
+                    }
+                    else if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('careteam-center') !== -1) {
+                        $('.visit-segment[data-segment-template-name="omega_care_team"]').find('.refresh-segment').trigger('click');
+                    }
                 }
                 else if(form.attr('url') === '/api/visitPoint/destroyCurrentChildReview' || form.attr('url') === '/api/visitPoint/destroyCurrentChildPlan') {
                     if(form.closest('.stag-popup').attr('stag-popup-key').indexOf('allergies-center') !== -1) {

resources/views/app/patient/segment-templates/omega_assessment_system/summary.blade.php

@@ -22,7 +22,7 @@ foreach ($points as $point) {
     if ($point->data) {
         $point->data = json_decode($point->data);
     }
-    if($point->category === 'ALLERGY' && @$point->data->name) $allergies[] = $point->data->name;
+    // if($point->category === 'ALLERGY' && @$point->data->name) $allergies[] = $point->data->name;
     if($point->category === 'PROBLEM' && @$point->data->name) $problems[] = $point->data->name . (@$point->data->icd ? ' (' . $point->data->icd . ')' : '');
 }
 ?>