fixes for #70 (#73)

IsantePlus · Jan 7, 2022 · 424013d · 424013d
1 parent a0137c4
commit 424013d
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/xdssender/api/xds/XdsUtil.java b/api/src/main/java/org/openmrs/module/xdssender/api/xds/XdsUtil.java
@@ -504,7 +504,7 @@ private static void mapPatientResource(Map<String, Object> ccdStringMap, org.hl7
         XdsUtil util = new XdsUtil();
         HumanName patientName = pat.getNameFirstRep();
         Date birthDate = pat.getBirthDate();
-        String gender = pat.getGender().getDisplay();
+        String gender = pat.getGender() != null ? pat.getGender().getDisplay() : "";
         Address addressFirstRep = pat.getAddressFirstRep();
         org.hl7.fhir.r4.model.Patient.ContactComponent patientContacts = pat.getContactFirstRep();
         Reference patientGeneralPractitioner = pat.getGeneralPractitionerFirstRep();
@@ -515,7 +515,7 @@ private static void mapPatientResource(Map<String, Object> ccdStringMap, org.hl7
         putValue(ccdStringMap, "givenName", patientName.getGiven().toString().replace("[", "").replace("]", ""));
         putValue(ccdStringMap, "birthDate", util.formatDate(birthDate));
         putValue(ccdStringMap, "gender", gender);
-        putValue(ccdStringMap, "address", addressFirstRep);
+        putValue(ccdStringMap, "address", addressFirstRep.getText());
 
         putValue(ccdStringMap, "patientId", patientId.getValue());
         putValue(ccdStringMap, "maritalStatus", maritalStatus.getText());
@@ -536,8 +536,17 @@ private static void putValue(Map<String, Object> ccdStringMap, String key, Objec
                             || ccdStringMap.get(key) == null
                             || ((String) ccdStringMap.get(key)).isEmpty())) {
                 ccdStringMap.put(key, value);
+            } else {
+                if(!ccdStringMap.containsKey(key)) {
+                    ccdStringMap.put(key,"");
+                }
             }
+            return;
         } catch (Exception e) {
+            if(!ccdStringMap.containsKey(key)) {
+                ccdStringMap.put(key,"");
+            }
+        } finally {
             return;
         }
     }