Merge pull request #11 from IsantePlus/ITOS-9

ITOS-9: added CCD importing during searching
IsantePlus · May 22, 2018 · ed07d8c · ed07d8c
2 parents 5391ecd + f928534
commit ed07d8c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...nmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java b/...nmrs/module/registrationapp/fragment/controller/search/M2SysSearchFragmentController.java
@@ -49,7 +49,7 @@ public List<SimpleObject> getPatients(@SpringBean("registrationCoreService") Reg
         return simplify(ui, patients);
     }
 
-    public FragmentActionResult importMpiPatient(@RequestParam("nationalFingerprintId") String nationalId,
+    public FragmentActionResult importMpiPatientWithCcd(@RequestParam("nationalFingerprintId") String nationalId,
             @SpringBean("registrationCoreService") RegistrationCoreService registrationService,
             @SpringBean("tempFingerprintService") TempFingerprintService tempFingerprintService,
             HttpSession session) {
@@ -62,9 +62,13 @@ public FragmentActionResult importMpiPatient(@RequestParam("nationalFingerprintI
             Patient registeredPatient = registrationService.findByPatientIdentifier(
                     enrollmentResult.getLocalBiometricSubject().getSubjectId(),
                     PropertiesUtil.getLocalFpType().getUuid());
+            if (registrationService.importCcd(registeredPatient) == null) {
+                LOGGER.error("Ccd import failure");
+            }
             result = new SuccessResult(registeredPatient.getUuid());
         } catch (Exception ex) {
-            String message = "Error during importing patient by national fingerprint id. Details: " + ex.getMessage();
+            String message = "Error during importing patient with ccd by national fingerprint id. Details: " + ex
+                    .getMessage();
             LOGGER.error(message, ex);
             result = new FailureResult(message);
         }

diff --git a/omod/src/main/webapp/fragments/search/m2SysSearch.gsp b/omod/src/main/webapp/fragments/search/m2SysSearch.gsp
@@ -47,9 +47,9 @@
         });
     });
 
-    function importMpiPatient(patient) {
+    function importMpiPatientWithCcd(patient) {
         emr.getFragmentActionWithCallback(
-                "registrationapp", "search/m2SysSearch", "importMpiPatient",
+                "registrationapp", "search/m2SysSearch", "importMpiPatientWithCcd",
                 { nationalFingerprintId: patient.nationalFingerprintPatientIdentifier.identifier },
                 function (successResponse) {
                     redirectToPatient(successResponse.message);
@@ -65,7 +65,7 @@
         actions: {
           confirm: function () {
             emrDialog.close();
-            importMpiPatient(patient);
+            importMpiPatientWithCcd(patient);
           },
           cancel: function () {
           }