Add filters on drugorder while showing count

Bahmni · Apr 18, 2024 · 0ab00e3 · 0ab00e3
1 parent 23adce7
commit 0ab00e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateWardDAO.java b/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateWardDAO.java
@@ -59,7 +59,7 @@ public List<AdmittedPatient> getAdmittedPatients(Location location, Provider pro
                     "JOIN org.openmrs.module.bedmanagement.entity.BedLocationMapping locmap on locmap.bed = assignment.bed " +
                     "JOIN org.openmrs.Location l on locmap.location = l " +
                     "LEFT JOIN careTeam.participants ctp ON ctp.voided = 0 " +
-                    "LEFT JOIN org.openmrs.Order o on o.encounter = e " +
+                    "LEFT JOIN org.openmrs.Order o on o.encounter = e and o.dateStopped is null and o.action!='DISCONTINUE' and o.careSetting.careSettingId = 2 " +
                     "LEFT JOIN Slot s on s.order = o " +
                     "where assignment.endDatetime is null and v.stopDatetime is null ";
 

diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -388,7 +388,7 @@
         <addForeignKeyConstraint constraintName="care_team_participant_voided_by_fk" baseTableName="care_team_participant" baseColumnNames="voided_by" referencedTableName="users" referencedColumnNames="user_id"/>
     </changeSet>
 
-    <changeSet id="mark-slots-as-missed-202403041331" author="Bahmni">
+    <changeSet id="mark-slots-as-missed-202404181732" author="Bahmni">
         <preConditions onFail="MARK_RAN">
             <sqlCheck expectedResult="0">
                 SELECT COUNT(*) FROM scheduler_task_config WHERE name = "Mark Slots As Missed";
@@ -400,7 +400,7 @@
             start_on_startup, created_by, date_created, uuid)
             VALUES
             ('Mark Slots As Missed', 'Mark Slots As Missed', 'org.openmrs.module.ipd.api.scheduler.tasks.MarkSlotsAsMissed',
-            TIMESTAMP(CURDATE()), 'MM/dd/yyyy HH:mm:ss', 86340, false, 1, NOW(), UUID());
+            TIMESTAMP(CURDATE(), "23:59"), 'MM/dd/yyyy HH:mm:ss', 86400, false, 1, NOW(), UUID());
         </sql>
     </changeSet>