BAH-2371 | Add. To fetch consutation image and video upload as a part of Patient Documents

Author: SanoferSameera

api/src/main/java/org/bahmni/module/hip/Config.java

@@ -29,6 +29,8 @@ public enum Config {
     LAB_REPORT( "LAB_REPORT"),
     RADIOLOGY_ORDER( "Radiology Order"),
     LAB_ORDER( "Lab Order"),
+    IMAGE("Image"),
+    PATIENT_VIDEO("Patient Video"),
 
     //Physical_Examination_Ignoring_Form_List
     Forms_To_Ignore_In_Physical_Examination("Discharge Summary, Death Note, Delivery Note, Opioid Substitution Therapy - Intake, Opportunistic Infection, " +

api/src/main/java/org/bahmni/module/hip/api/dao/OPConsultDao.java

@@ -17,4 +17,5 @@ public interface OPConsultDao {
     List<Obs> getProceduresForProgram(String programName, Date fromDate, Date toDate, Patient patient);
     Map<Encounter, List<Condition>> getMedicalHistoryConditionsForProgram(String programName, Date fromDate, Date toDate, Patient patient);
     List<Obs> getMedicalHistoryDiagnosisForProgram(String programName, Date fromDate, Date toDate, Patient patient);
+    Map<Encounter, List<Obs>> getPatientDocumentsForVisit(Visit visit);
 }

api/src/main/java/org/bahmni/module/hip/api/dao/impl/OPConsultDaoImpl.java

@@ -212,6 +212,20 @@ public List<Obs> getMedicalHistoryDiagnosisForProgram(String programName, Date f
         return obsSet;
     }
 
+    public Map<Encounter, List<Obs>> getPatientDocumentsForVisit(Visit visit){
+        List<Obs> patientObs = encounterDao.GetAllObsForVisit(visit, Config.PATIENT_DOCUMENT.getValue(), Config.DOCUMENT_TYPE.getValue());
+        patientObs.addAll(encounterDao.GetAllObsForVisit(visit, Config.CONSULTATION.getValue(), Config.IMAGE.getValue()));
+        patientObs.addAll(encounterDao.GetAllObsForVisit(visit, Config.CONSULTATION.getValue(), Config.PATIENT_VIDEO.getValue()));
+        HashMap<Encounter, List<Obs>> encounterListMap = new HashMap<>();
+        for (Obs obs: patientObs) {
+            Encounter encounter = obs.getEncounter();
+            if(!encounterListMap.containsKey(encounter))
+                encounterListMap.put(encounter, new ArrayList<Obs>(){{ add(obs); }});
+            else
+                encounterListMap.get(encounter).add(obs);
+        }
+        return encounterListMap;
+    }
 
     private org.openmrs.module.emrapi.conditionslist.Condition convertCoreConditionToEmrapiCondition(org.openmrs.Condition coreCondition) {
         org.openmrs.module.emrapi.conditionslist.Condition cListCondition = new org.openmrs.module.emrapi.conditionslist.Condition();

omod/src/main/java/org/bahmni/module/hip/web/service/ConsultationService.java

@@ -75,9 +75,7 @@ public Map<Encounter, List<OpenMrsCondition>> getEncounterMedicalHistoryConditio
     }
 
     public Map<Encounter, List<Obs>> getEncounterPatientDocumentsMap(Visit visit) {
-        final int patientDocumentEncounterType = 9;
-        Map<Encounter, List<Obs>> encounterDiagnosticReportsMap = diagnosticReportService.getAllObservationsForVisits(visit);
-        return getEncounterListMapForPatientDocument(patientDocumentEncounterType, encounterDiagnosticReportsMap);
+        return opConsultDao.getPatientDocumentsForVisit(visit);
     }
 
     public Map<Encounter, List<Obs>> getEncounterPatientDocumentsMapForProgram(String programName, Date fromDate, Date toDate, Patient patient,String programEnrollmentId) {