USM-36:Add Results Received Date to the VL HIE. (#173)

mohuganda · Aug 9, 2024 · 96d4d0b · 96d4d0b
1 parent a108442
commit 96d4d0b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/ugandaemrsync/api/impl/UgandaEMRSyncServiceImpl.java b/api/src/main/java/org/openmrs/module/ugandaemrsync/api/impl/UgandaEMRSyncServiceImpl.java
@@ -188,6 +188,7 @@ public Encounter addVLToEncounter(String vlQualitative, String vlQuantitative, S
             Concept dateSampleTaken = Context.getConceptService().getConcept("163023");
             Concept viralLoadQualitative = Context.getConceptService().getConcept("1305");
             Concept viralLoadQuantitative = Context.getConceptService().getConcept("856");
+            Concept viralLoadReturnDate= Context.getConceptService().getConcept("167944");
             Concept valueCoded = null;
 
             String dateFormat = getDateFormat(vlDate);
@@ -215,11 +216,15 @@ public Encounter addVLToEncounter(String vlQualitative, String vlQuantitative, S
 
             Obs viralLoadQualitativeObs = null;
             Obs viralLoadQuantitativeObs = null;
+            Obs viralLoadReturnDateObs = null;
 
             if (viralLoadQualitative != null && valueCoded != null) {
                 viralLoadQualitativeObs = createObs(encounter, order, viralLoadQualitative, valueCoded, null, null);
                 viralLoadTestGroupObs.addGroupMember(viralLoadQualitativeObs);
             }
+
+
+
             if (vlQuantitative != null) {
                 Double quantitativeValue = 1.0;
                 quantitativeValue = Double.valueOf(vlQuantitative);
@@ -236,11 +241,15 @@ public Encounter addVLToEncounter(String vlQualitative, String vlQuantitative, S
             if (viralLoadQualitativeObs == null && viralLoadQuantitativeObs == null)
                 return null;
 
+            viralLoadReturnDateObs = createObs(encounter, order, viralLoadReturnDate, null, new Date(), null);
+
+            viralLoadTestGroupObs.addGroupMember(viralLoadReturnDateObs);
 
             //Void Similar observation
             voidObsFound(encounter, dateSampleTaken);
             voidObsFound(encounter, viralLoadQualitative);
             voidObsFound(encounter, viralLoadQuantitative);
+            voidObsFound(encounter, viralLoadReturnDate);
 
             encounter.addObs(viralLoadTestGroupObs);
             Context.getEncounterService().saveEncounter(encounter);

diff --git a/api/src/test/resources/org/openmrs/module/ugandaemrsync/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/module/ugandaemrsync/include/standardTestDataset.xml
@@ -143,7 +143,7 @@
     <concept  concept_id="1331"  retired="0"  datatype_id="1"  class_id="1"  is_set="0"  creator="1"  date_created="2006-06-09 14:14:37"  version="1"  changed_by="1"  date_changed="2006-06-16 13:08:45"  uuid="dca19938-30ab-102d-86b0-7a5022ba4115"/>
     <concept  concept_id="1332"  retired="0"  datatype_id="1"  class_id="1"  is_set="0"  creator="1"  date_created="2006-06-09 14:15:28"  version="1"  changed_by="1"  date_changed="2006-06-16 13:10:30"  uuid="dca19d5e-30ab-102d-86b0-7a5022ba4115"/>
     <concept  concept_id="1334"  retired="0"  datatype_id="1"  class_id="1"  is_set="0"  creator="1"  date_created="2006-06-09 14:17:35"  version="1"  changed_by="1"  date_changed="2006-06-16 13:27:01"  uuid="dca1a5ac-30ab-102d-86b0-7a5022ba4115"/>
-
+	<concept  concept_id="167944"   retired="0"   creator="1"  date_created="2023-02-08 14:24:38"  version="" 	datatype_id="6" 	class_id="11"	  is_set="0"  uuid="5b4037d6-a7e2-11ed-afa1-0242ac120002"/>
 
 
     <concept_numeric  concept_id="856" precise="false" />
@@ -243,7 +243,7 @@
     <concept_name  concept_name_id="1329"  concept_id="1331"  name="ABSOLUTE MONOCYTE COUNT"  locale="en"  locale_preferred="0"  creator="1"  date_created="2006-06-09 14:14:37"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="df1d318f-30ab-102d-86b0-7a5022ba4115" />
     <concept_name  concept_name_id="1330"  concept_id="1332"  name="ABSOLUTE EOSINOPHIL COUNT"  locale="en"  locale_preferred="0"  creator="1"  date_created="2006-06-09 14:15:28"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="df1d35c5-30ab-102d-86b0-7a5022ba4115" />
     <concept_name  concept_name_id="1332"  concept_id="1334"  name="ABSOLUTE ATYPICAL LYMPHOCYTE COUNT"  locale="en"  locale_preferred="0"  creator="1"  date_created="2006-06-09 14:17:35"  concept_name_type="FULLY_SPECIFIED"  voided="0"  uuid="df1da16a-30ab-102d-86b0-7a5022ba4115" />
-
+	<concept_name concept_id="167944"   concept_name_id="180355"  voided="0" locale="en"  concept_name_type="FULLY_SPECIFIED"  locale_preferred="1"  creator="1"  date_created="2023-02-08 14:24:38"    uuid="238d57ee-a7e5-11ed-afa1-0242ac120002" name="DATE RESULT RECIEVED"/>
 
 
     <concept_answer  concept_answer_id="966"  concept_id="1305"  answer_concept="1306" creator="1"  date_created="2006-06-05 17:21:54"  sort_weight="1"  uuid="dd82efa1-30ab-102d-86b0-7a5022ba4115"/>