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})