wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#741): 请修复 Bug #741

Browse Source 
由 AI Agent (guanyu) 自动修复，请查看 diff 确认变更内容。
This commit is contained in:
华佗
2026-06-11 11:47:23 +08:00
parent f05cc8da66
commit eedf104a99
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
View File

@@ -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(

8
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
View File

@@ -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);
/**
* 获取配药人下拉选列表

8
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -97,10 +97,10 @@
ON T4.med_req_id = T5.id
AND T5.delete_flag = '0'
WHERE <if test="statusEnum == null">
T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
T4.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if>
<if test="statusEnum == 3">
T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
T4.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized})
</if>
<if test="statusEnum == 4">
T4.status_enum = #{completed}
@@ -268,10 +268,10 @@
-- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
AND
<if test="dispenseStatus == null">
T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
T1.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if>
<if test="dispenseStatus == 3">
T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
T1.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized})
</if>
<if test="dispenseStatus == 4">
T1.status_enum = #{completed}