diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java index a84360296..4ba299945 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java @@ -155,6 +155,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi // ε‘θ―ηŠΆζ€ List dispenseStatusOptions = new ArrayList<>(); + dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.DRAFT.getValue(), + DispenseStatus.DRAFT.getInfo())); dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.SUBMITTED.getValue(), DispenseStatus.SUBMITTED.getInfo())); dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.IN_PROGRESS.getValue(), diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml index d2f7ad02e..311ff2cb3 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml @@ -108,6 +108,9 @@ T4.status_enum = #{submitted} + + T4.status_enum = #{draft} + ) AS ii ${ew.customSqlSegment} GROUP BY ii.encounter_id, @@ -279,6 +282,9 @@ T1.status_enum = #{submitted} + + T1.status_enum = #{draft} + AND T14.inventory_status_enum = #{active} ORDER BY prescription_no DESC ) AS ii