BAH-2371 | Refactor. To send consultation image and video upload as attachment

Author: SanoferSameera

.github/workflows/build_and_upload.yml

@@ -7,6 +7,7 @@ on:
  push:
     branches:
      - master
+     - BAH-2371
  workflow_dispatch:
 env:
   ORG_NAME: BahmniIndiaDistro

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

@@ -91,7 +91,9 @@ public List<Obs> getAllObs(String programName, Date fromDate, Date toDate, Patie
     public List<Obs> getPhysicalExamination(Visit visit) {
         final String[] formNames = Config.Forms_To_Ignore_In_Physical_Examination.getValue().split("\\s*,\\s*");
         List<Obs> physicalExaminationObsMap = encounterDao.GetAllObsForVisit(visit,Config.CONSULTATION.getValue(),null)
-                .stream().filter(o -> o.getValueCoded() == null &&  o.getObsGroup() == null
+                .stream().filter(o -> o.getValueCoded() == null
+                        && o.getValueComplex() == null
+                        &&  o.getObsGroup() == null
                         && !Arrays.asList(formNames).contains(o.getConcept().getName().getName()) )
                 .collect(Collectors.toList());
         return physicalExaminationObsMap;

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

@@ -12,4 +12,9 @@ public class Constants {
     static final String GIF = "gif";
     static final String PDF = "pdf";
     static final String MIMETYPE_PDF = "application/pdf";
+    static final String MIMETYPE_VIDEO_MPEG = "video/mpeg";
+    static final String MIMETYPE_VIDEO_MP4 = "video/mp4";
+    static final String MP4 = "mp4";
+    static final String MPEG = "mpeg";
+
 }

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

@@ -179,14 +179,15 @@ public DocumentReference mapToDocumentDocumentReference(Obs obs) {
     private List<Attachment> getAttachments(Obs obs) throws IOException {
         List<Attachment> attachments = new ArrayList<>();
         Attachment attachment = new Attachment();
-        Set<Obs> obsList = obs.getGroupMembers();
         StringBuilder valueText = new StringBuilder();
         StringBuilder contentType = new StringBuilder();
-        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.DOCUMENT_TYPE.getValue())){
+            valueText.append(obs.getValueText());
+            contentType.append(FHIRUtils.getTypeOfTheObsDocument(obs.getValueText()));
+        }
+        if(obs.getConcept().getName().getName().equals(Config.IMAGE.getValue()) || obs.getConcept().getName().getName().equals(Config.PATIENT_VIDEO.getValue())){
+            valueText.append(obs.getValueComplex());
+            contentType.append(FHIRUtils.getTypeOfTheObsDocument(obs.getValueComplex()));
         }
         attachment.setContentType(contentType.toString());
         byte[] fileContent = Files.readAllBytes(new File(Config.PATIENT_DOCUMENTS_PATH.getValue() + valueText).toPath());
@@ -197,6 +198,8 @@ private List<Attachment> getAttachments(Obs obs) throws IOException {
             title.append(Config.PATIENT_DOCUMENT.getValue());
         else if(encounterId.equals(Config.RADIOLOGY_TYPE.getValue()))
             title.append(Config.RADIOLOGY_REPORT.getValue());
+        else if(encounterId.equals(Config.CONSULTATION.getValue()))
+            title.append("Consultation");
         title.append(": ").append(obs.getConcept().getName().getName());
         attachment.setTitle(title.toString());
         attachments.add(attachment);

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

@@ -22,6 +22,10 @@
 import static org.bahmni.module.hip.web.service.Constants.JPG;
 import static org.bahmni.module.hip.web.service.Constants.MIMETYPE_IMAGE_JPEG;
 import static org.bahmni.module.hip.web.service.Constants.MIMETYPE_PDF;
+import static org.bahmni.module.hip.web.service.Constants.MIMETYPE_VIDEO_MP4;
+import static org.bahmni.module.hip.web.service.Constants.MIMETYPE_VIDEO_MPEG;
+import static org.bahmni.module.hip.web.service.Constants.MP4;
+import static org.bahmni.module.hip.web.service.Constants.MPEG;
 import static org.bahmni.module.hip.web.service.Constants.PDF;
 import static org.bahmni.module.hip.web.service.Constants.PNG;
 
@@ -200,6 +204,10 @@ public static String getTypeOfTheObsDocument(String valueText) {
             return IMAGE + extension;
         } else if (extension.compareTo(PDF) == 0) {
             return MIMETYPE_PDF;
+        } else if (extension.compareTo(MP4) == 0) {
+            return MIMETYPE_VIDEO_MP4;
+        } else if (extension.compareTo(MPEG) == 0) {
+            return MIMETYPE_VIDEO_MPEG;
         } else {
             return "";
         }