From a020cd880f435402c0407ed26cea966d945013f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Sun, 10 May 2026 11:06:33 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#503:=20=E3=80=90=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E5=8F=91=E9=80=80=E8=8D=AF=E3=80=91=E5=8F=91=E8=8D=AF=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=8E=E5=8F=91=E8=8D=AF=E6=B1=87=E6=80=BB=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A7=A6=E5=8F=91=E6=97=B6=E6=9C=BA=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=8C=E5=AD=98=E5=9C=A8=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E8=84=B1=E8=8A=82=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 selectEncounterInfoListPage 和 selectMedicineDispenseOrderPage 两个查询中增加 summary_no IS NOT NULL 过滤条件，使发药明细单仅在护士执行"汇总发药申请"后才显示记录， 与发药汇总单保持一致的触发时机。 Co-Authored-By: Claude Opus 4.7 --- .../mapper/pharmacymanage/WesternMedicineDispenseMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) 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 3edeaebd..a877bbec 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 @@ -113,6 +113,8 @@ T4.status_enum IN (#{completed},8) + AND T4.summary_no IS NOT NULL + AND T4.summary_no != '' ) AS ii ${ew.customSqlSegment} GROUP BY ii.encounter_id, @@ -271,6 +273,8 @@ AND T15.delete_flag = '0' WHERE T1.delete_flag = '0' -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查 + AND T1.summary_no IS NOT NULL + AND T1.summary_no != '' AND T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})