diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java index fd11e97f4..3eb5fda12 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java @@ -191,7 +191,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi Page encounterInfoPage = westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), - DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue()); + DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), + DispenseStatus.SUMMARIZED.getValue()); encounterInfoPage.getRecords().forEach(encounterInfo -> { // 性别 encounterInfo.setGenderEnum_enumText( @@ -229,7 +230,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi = westernMedicineDispenseMapper.selectMedicineDispenseOrderPage(new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus, - PublicationStatus.ACTIVE.getValue()); + PublicationStatus.ACTIVE.getValue(), DispenseStatus.SUMMARIZED.getValue()); medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> { // 发药状态 medicineDispenseOrder.setStatusEnum_enumText( diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java index 8e10832cf..24a18660e 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java @@ -35,7 +35,7 @@ public interface WesternMedicineDispenseMapper { @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress, @Param("completed") Integer completed, @Param("preparation") Integer preparation, - @Param("prepared") Integer prepared); + @Param("prepared") Integer prepared, @Param("summarized") Integer summarized); /** * 发药单查询 @@ -54,7 +54,8 @@ public interface WesternMedicineDispenseMapper { @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("inProgress") Integer inProgress, @Param("completed") Integer completed, @Param("preparation") Integer preparation, @Param("prepared") Integer prepared, - @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active); + @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active, + @Param("summarized") Integer summarized); /** * 获取配药人下拉选列表 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml index 3f98a9be6..7268e2ca1 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml @@ -97,10 +97,10 @@ ON T4.med_req_id = T5.id AND T5.delete_flag = '0' WHERE - T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) + T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T4.status_enum IN (#{inProgress},#{preparation},#{prepared}) + T4.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized}) T4.status_enum = #{completed} @@ -269,10 +269,10 @@ AND T1.summary_no != '' AND - T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) + T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T1.status_enum IN (#{inProgress},#{preparation},#{prepared}) + T1.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized}) T1.status_enum = #{completed}