From 5a970cf4922d1d8f2bcf5d04b2e4129c257a5c58 Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Tue, 2 Jun 2026 10:05:41 +0800 Subject: [PATCH] =?UTF-8?q?503=20=E3=80=90=E4=BD=8F=E9=99=A2=E5=8F=91?= =?UTF-8?q?=E9=80=80=E8=8D=AF=E3=80=91=E5=8F=91=E8=8D=AF=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=8E=E5=8F=91=E8=8D=AF=E6=B1=87=E6=80=BB=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A7=A6=E5=8F=91=E6=97=B6=E6=9C=BA=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=EF=BC=8C=E5=AD=98=E5=9C=A8=E4=B8=9A=E5=8A=A1=E8=84=B1?= =?UTF-8?q?=E8=8A=82=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WesternMedicineDispenseAppServiceImpl.java | 5 +++-- .../mapper/WesternMedicineDispenseMapper.java | 5 +++-- .../pharmacymanage/WesternMedicineDispenseMapper.xml | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) 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}