diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java index 2e703a4ab..7679526fe 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java @@ -52,7 +52,8 @@ public class PendingMedicationDetailsAppServiceImpl implements IPendingMedicatio Page pendingMedicationPage = pendingMedicationDetailsMapper .selectPendingMedicationDetailsPage(new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.PREPARATION.getValue(), - DispenseStatus.PREPARED.getValue(), EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue()); + DispenseStatus.PREPARED.getValue(), DispenseStatus.SUMMARIZED.getValue(), + EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue()); pendingMedicationPage.getRecords().forEach(e -> { // 发药类型 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java index 6ff972bf5..9f614e57c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java @@ -22,6 +22,7 @@ public interface PendingMedicationDetailsMapper { * @param inProgress 发药类型:待发药 * @param preparation 发药类型:待配药 * @param prepared 发药类型:已配药 + * @param summarized 发药类型:已汇总 * @param amb 门诊类型 * @param imp 住院类型 * @return 待发药明细 @@ -32,6 +33,7 @@ public interface PendingMedicationDetailsMapper { @Param("inProgress") Integer inProgress, @Param("preparation") Integer preparation, @Param("prepared") Integer prepared, + @Param("summarized") Integer summarized, @Param("amb") Integer amb, @Param("imp") Integer imp); diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml index a8b01b229..6c5a45c82 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml @@ -51,7 +51,7 @@ ON T5.medication_def_id = T6.id AND T5.delete_flag = '0' WHERE T1.delete_flag = '0' - AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared}) + AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared}, #{summarized}) ORDER BY T1.create_time DESC ) AS T7 ${ew.customSqlSegment}