Fix code that returned incorrect results

openmrs · May 6, 2024 · df5c208 · df5c208
1 parent 6dbae27
commit df5c208
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 38 deletions.
diff --git a/api/src/main/java/org/openmrs/module/emrapi/db/EmrVisitDAOImpl.java b/api/src/main/java/org/openmrs/module/emrapi/db/EmrVisitDAOImpl.java
@@ -87,20 +87,10 @@ public List<Obs> getConfirmedDiagnoses(Visit visit, DiagnosisMetadata diagnosisM
    @SuppressWarnings("unchecked")
    @Override
    public List<Obs> getConfirmedPrimaryDiagnoses(Visit visit, DiagnosisMetadata diagnosisMetadata) {
-      String queryString = "";
-      try {
-         queryString = IOUtils.toString(getClass().getClassLoader().getResourceAsStream(CONFIRMED_PRIMARY_DIAGNOSES_HQL));
-      } catch (IOException e) {
-         log.error(RESOURCE_NOT_FOUND, e);
-         return Collections.emptyList();
-      }
-      Query query = sessionFactory.getCurrentSession().createQuery(queryString);
-      query.setInteger("visitId", visit.getId());
-      query.setInteger("diagnosisOrderConceptId", diagnosisMetadata.getDiagnosisOrderConcept().getId());
-      query.setInteger("primaryOrderConceptId", diagnosisMetadata.getConceptFor(Diagnosis.Order.PRIMARY).getId());
-      query.setInteger("diagnosisCertaintyConceptId", diagnosisMetadata.getDiagnosisCertaintyConcept().getId());
-      query.setInteger("confirmedCertaintyConceptId", diagnosisMetadata.getConceptFor(Diagnosis.Certainty.CONFIRMED).getId());
-      return (List<Obs>) query.list();
+      List<Obs> confirmedDiagnoses = getConfirmedDiagnoses(visit, diagnosisMetadata);
+      List<Obs> primaryDiagnoses = getPrimaryDiagnoses(visit, diagnosisMetadata);
+      confirmedDiagnoses.retainAll(primaryDiagnoses);
+      return confirmedDiagnoses;
    }
 
    @Override

diff --git a/api/src/main/resources/hql/visit_confirmed_primary_diagnoses.hql b/api/src/main/resources/hql/visit_confirmed_primary_diagnoses.hql
diff --git a/api/src/test/java/org/openmrs/module/emrapi/visit/VisitDomainWrapperComponentTest.java b/api/src/test/java/org/openmrs/module/emrapi/visit/VisitDomainWrapperComponentTest.java
@@ -73,6 +73,7 @@ public void setup() throws Exception {
         ContextSensitiveMetadataTestUtils.setupAdmissionDecisionConcept(conceptService, emrApiProperties);
         ContextSensitiveMetadataTestUtils.setupDiagnosisMetadata(conceptService, emrApiProperties);
         Context.getAdministrationService().setGlobalProperty(EmrApiConstants.GP_USE_LEGACY_DIAGNOSIS_SERVICE, "true");
+        Context.flushSession();
     }
 
     @Test
@@ -250,7 +251,6 @@ public void getUniqueDiagnoses_shouldConvergeWithLegacyImpl() throws ParseExcept
        /*
         * Setup
         */
-
        Patient patient = testDataManager.randomPatient().birthdate("1970-03-15").save();
 
        Location visitLocation = testDataManager.location().name("Visit Location")
@@ -271,8 +271,8 @@ public void getUniqueDiagnoses_shouldConvergeWithLegacyImpl() throws ParseExcept
        // Adding a bunch of encounters to the test visit
        List<Encounter> encounters = createRandomEncountersWithDiagnoses(50, 0.15, 2, visit, patient, emrApiProperties.getVisitNoteEncounterType(), sampleDiagnoses);
        for (Encounter e : encounters) {
-           Context.getEncounterService().saveEncounter(e);
            visit.addEncounter(e);
+           Context.getEncounterService().saveEncounter(e);
        }
        visit = Context.getVisitService().saveVisit(visit);
        VisitDomainWrapper visitDomainWrapper = factory.newVisitDomainWrapper( visit );