added drugConceptId check

merovingienne · Aug 25, 2017 · 0cedcea · 0cedcea
1 parent ec0373a
commit 0cedcea
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/...penmrs/module/operationtheater/fragment/controller/PostTheaterDataFragmentController.java b/...penmrs/module/operationtheater/fragment/controller/PostTheaterDataFragmentController.java
@@ -97,11 +97,21 @@ public FragmentActionResult addTheaterDrugPrescription(UiUtils ui,
             return new FailureResult(ui.message("Wrong surgery workflow position."));
         }
 
+        if (drugConceptId == null || drugConceptId.length() == 0 || drugConceptId == "undefined"){
+            return new FailureResult(ui.message("Invalid drug."));
+        }
+
         ConceptService conceptService = Context.getConceptService();
         ObsService obsService = Context.getObsService();
 
+        Concept drug = null;
+
 
-        Concept drug = conceptService.getConcept(Integer.parseInt(drugConceptId));
+        try {
+            drug = conceptService.getConcept(Integer.parseInt(drugConceptId));
+        } catch (NumberFormatException e) {
+            return new FailureResult(ui.message("Invalid drug."));
+        }
 
         Obs surgeryInfoObs = SurgeryObsUtil.getSurgeryObs(surgery, patient);
 

diff --git a/...openmrs/module/operationtheater/fragment/controller/PretheaterDataFragmentController.java b/...openmrs/module/operationtheater/fragment/controller/PretheaterDataFragmentController.java
@@ -213,8 +213,8 @@ public FragmentActionResult addPretheaterDrugPrescription(UiUtils ui,
             return new FailureResult(ui.message("operationtheater.patient.notFound"));
         }
 
-        if (drugConceptId == null || drugConceptId.length() == 0){
-            return new FailureResult(ui.message("Drug not found."));
+        if (drugConceptId == null || drugConceptId.length() == 0 || drugConceptId == "undefined"){
+            return new FailureResult(ui.message("Invalid drug."));
         }
 
         if (drugQuantity == null || drugQuantity.length() == 0){
@@ -226,7 +226,13 @@ public FragmentActionResult addPretheaterDrugPrescription(UiUtils ui,
         ObsService obsService = Context.getObsService();
 
 
-        Concept drug = conceptService.getConcept(Integer.parseInt(drugConceptId));
+        Concept drug = null;
+
+        try {
+            drug = conceptService.getConcept(Integer.parseInt(drugConceptId));
+        } catch (NumberFormatException e) {
+            return new FailureResult(ui.message("Invalid drug."));
+        }
 
         Obs surgeryInfoObs = SurgeryObsUtil.getSurgeryObs(surgery, patient);
 

diff --git a/omod/src/main/webapp/pages/surgery.gsp b/omod/src/main/webapp/pages/surgery.gsp
@@ -7,6 +7,7 @@
     ui.includeJavascript("operationtheater", "preTheaterForm_page/pastProcedures.js")
     ui.includeJavascript("operationtheater", "preTheaterForm_page/drugs.js")
     ui.includeJavascript("operationtheater", "postTheaterForm_page/drugs.js")
+    ui.includeJavascript("operationtheater", "postTheaterForm_page/surgeryNote.js")
 
     ui.includeJavascript("uicommons", "emr.js")
     ui.includeJavascript("uicommons", "typeahead.js");
@@ -327,6 +328,22 @@ fieldset {
         ${ ui.includeFragment('operationtheater', 'postTheaterDrugs',[
                 includeForm: false,
         ])}
+
+        <br>
+        <div class="section-item">
+            <h3>Surgery notes</h3>
+            <div id="surgery-note-div">
+                <table id="surgery-note-table" style="margin: 10px 0px">
+                    <tbody id="surgery-note-table-body">
+
+                    </tbody>
+
+                </table>
+            </div>
+        </div>
+
+
+
         <% } %>