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 1e9460f6a..a84360296 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 @@ -195,7 +195,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi = westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), - DispenseStatus.SUMMARIZED.getValue(), DispenseStatus.SUBMITTED.getValue()); + DispenseStatus.SUMMARIZED.getValue(), DispenseStatus.SUBMITTED.getValue(), + DispenseStatus.DRAFT.getValue()); encounterInfoPage.getRecords().forEach(encounterInfo -> { // 性别 encounterInfo.setGenderEnum_enumText( @@ -234,7 +235,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus, PublicationStatus.ACTIVE.getValue(), DispenseStatus.SUMMARIZED.getValue(), - DispenseStatus.SUBMITTED.getValue()); + DispenseStatus.SUBMITTED.getValue(), DispenseStatus.DRAFT.getValue()); medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> { // 发药状态 medicineDispenseOrder.setStatusEnum_enumText( diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java index 1971ecf8a..b97f2dae4 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java @@ -25,6 +25,7 @@ public interface WesternMedicineDispenseMapper { * @param page 分页 * @param queryWrapper 查询条件 * @param statusEnum 发药状态 + * @param draft 发药状态:草稿 * @param inProgress 发药状态:待发药 * @param completed 发药状态:已发药 * @param preparation 发药状态:待配药 @@ -36,7 +37,8 @@ public interface WesternMedicineDispenseMapper { @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress, @Param("completed") Integer completed, @Param("preparation") Integer preparation, @Param("prepared") Integer prepared, @Param("summarized") Integer summarized, - @Param("submitted") Integer submitted); + @Param("submitted") Integer submitted, + @Param("draft") Integer draft); /** * 发药单查询 @@ -48,6 +50,7 @@ public interface WesternMedicineDispenseMapper { * @param preparation 发药状态:待配药 * @param prepared 发药状态:已配药 * @param dispenseStatus 发药状态 + * @param draft 发药状态:草稿 * @param active 库房状态:启用 * @return 发耗材单列表 */ @@ -56,7 +59,8 @@ public interface WesternMedicineDispenseMapper { @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("summarized") Integer summarized, @Param("submitted") Integer submitted); + @Param("summarized") Integer summarized, @Param("submitted") Integer submitted, + @Param("draft") Integer draft); /** * 获取配药人下拉选列表 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 e9167ce55..d2f7ad02e 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 @@ -97,10 +97,10 @@ ON T4.med_req_id = T5.id AND T5.delete_flag = '0' WHERE - T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) T4.status_enum = #{completed} @@ -268,10 +268,10 @@ -- 因发药配药合并,前台只能看到待发药,已发药状态,但是后台配药发药状态都查 AND - T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) T1.status_enum = #{completed}