BAH-2371 | Refactor. To ignore consultation image and video upload in physical examination

Author: SanoferSameera

.github/workflows/build_and_upload.yml

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

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

@@ -34,7 +34,7 @@ public enum Config {
 
     //Physical_Examination_Ignoring_Form_List
     Forms_To_Ignore_In_Physical_Examination("Discharge Summary, Death Note, Delivery Note, Opioid Substitution Therapy - Intake, Opportunistic Infection, " +
-            "Safe Abortion, ECG Notes, Operative Notes, USG Notes, Procedure Notes,Triage Reference, History and Examination, Visit Diagnoses"),
+            "Safe Abortion, ECG Notes, Operative Notes, USG Notes, Procedure Notes,Triage Reference, History and Examination, Visit Diagnoses, Patient Video"),
 
 
     PROP_HFR_ID("bahmniHip.healthFacilityRegistryId"),

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

@@ -92,7 +92,6 @@ 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.getValueComplex() == null
                         &&  o.getObsGroup() == null
                         && !Arrays.asList(formNames).contains(o.getConcept().getName().getName()) )
                 .collect(Collectors.toList());

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

@@ -30,7 +30,7 @@ public class ConsultationService {
     private final OPConsultDao opConsultDao;
     private final DiagnosticReportService diagnosticReportService;
 
-    public static Set<String> conceptNames = new HashSet<>(Arrays.asList("Tuberculosis, Treatment Plan","Tuberculosis, Next Followup Visit","Tuberculosis, Plan for next visit","Tuberculosis, Patient Category","Current Followup Visit After",
+    public static Set<String> conceptNames = new HashSet<>(Arrays.asList("Image","Tuberculosis, Treatment Plan","Tuberculosis, Next Followup Visit","Tuberculosis, Plan for next visit","Tuberculosis, Patient Category","Current Followup Visit After",
             "Tuberculosis, Plan for next visit","Malaria, Parents Name","Malaria, Death Date", "Childhood Illness, Vitamin A Capsules Provided","Childhood Illness, Albendazole Given","Childhood Illness, Referred out",
             "Childhood Illness, Vitamin A Capsules Provided","Childhood Illness, Albendazole Given","Nutrition, Bal Vita Provided by FCHV","Bal Vita Provided by FCHV","ART, Condoms given","HIVTC, Marital Status","Malaria, Contact number",
             "HIVTC, Transferred out", "HIVTC, Regimen when transferred out", "HIVTC, Date of transferred out", "HIVTC, Transferred out to", "HIVTC, Chief Complaint"));