To fetch patient document attachment in diagnostic report

Author: SanoferSameera

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

@@ -213,7 +213,8 @@ public List<Obs> getMedicalHistoryDiagnosisForProgram(String programName, Date f
     }
 
     public Map<Encounter, List<Obs>> getPatientDocumentsForVisit(Visit visit){
-        List<Obs> patientObs = encounterDao.GetAllObsForVisit(visit, Config.PATIENT_DOCUMENT.getValue(), Config.DOCUMENT_TYPE.getValue());
+        List<Obs> patientObs = encounterDao.GetAllObsForVisit(visit, Config.PATIENT_DOCUMENT.getValue(),null)
+                .stream().filter(o -> !o.getConcept().getName().getName().equals(Config.DOCUMENT_TYPE.getValue()) ).collect(Collectors.toList());
         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<>();

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

@@ -185,10 +185,13 @@ private List<Attachment> getAttachments(Obs obs) throws IOException {
         List<Attachment> attachments = new ArrayList<>();
         Attachment attachment = new Attachment();
         StringBuilder valueText = new StringBuilder();
+        Set<Obs> obsList = obs.getGroupMembers();
         StringBuilder contentType = new StringBuilder();
-        if(obs.getConcept().getName().getName().equals(Config.DOCUMENT_TYPE.getValue())){
-            valueText.append(obs.getValueText());
-            contentType.append(FHIRUtils.getTypeOfTheObsDocument(obs.getValueText()));
+        for(Obs obs1 : obsList) {
+            if (obs1.getConcept().getName().getName().equals(Config.DOCUMENT_TYPE.getValue())) {
+                valueText.append(obs1.getValueText());
+                contentType.append(FHIRUtils.getTypeOfTheObsDocument(obs1.getValueText()));
+            }
         }
         if(obs.getConcept().getName().getName().equals(Config.IMAGE.getValue()) || obs.getConcept().getName().getName().equals(Config.PATIENT_VIDEO.getValue())){
             valueText.append(obs.getValueComplex());