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

503

Browse Source 
【住院发退药】发药明细与发药汇总单数据触发时机不一致，存在业务脱节风险
This commit is contained in:
wangjian963
2026-06-02 10:05:41 +08:00
parent c3ecadcfe0
commit 5a970cf492
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,7 +191,8 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
Page<EncounterInfoDto> encounterInfoPage Page<EncounterInfoDto> encounterInfoPage
= westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper, = westernMedicineDispenseMapper.selectEncounterInfoListPage(new Page<>(pageNo, pageSize), queryWrapper,
statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), statusEnum, DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue()); DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(),
DispenseStatus.SUMMARIZED.getValue());
encounterInfoPage.getRecords().forEach(encounterInfo -> { encounterInfoPage.getRecords().forEach(encounterInfo -> {
// 性别 // 性别
encounterInfo.setGenderEnum_enumText( encounterInfo.setGenderEnum_enumText(
@@ -229,7 +230,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
= westernMedicineDispenseMapper.selectMedicineDispenseOrderPage(new Page<>(pageNo, pageSize), queryWrapper, = westernMedicineDispenseMapper.selectMedicineDispenseOrderPage(new Page<>(pageNo, pageSize), queryWrapper,
DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(), DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.COMPLETED.getValue(),
DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus, DispenseStatus.PREPARATION.getValue(), DispenseStatus.PREPARED.getValue(), dispenseStatus,
PublicationStatus.ACTIVE.getValue()); PublicationStatus.ACTIVE.getValue(), DispenseStatus.SUMMARIZED.getValue());
medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> { medicineDispenseOrderPage.getRecords().forEach(medicineDispenseOrder -> {
// 发药状态 // 发药状态
medicineDispenseOrder.setStatusEnum_enumText( medicineDispenseOrder.setStatusEnum_enumText(

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/WesternMedicineDispenseMapper.java
View File

@@ -35,7 +35,7 @@ public interface WesternMedicineDispenseMapper {
@Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper, @Param(Constants.WRAPPER) QueryWrapper<EncounterInfoSearchParam> queryWrapper,
@Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress, @Param("statusEnum") Integer statusEnum, @Param("inProgress") Integer inProgress,
@Param("completed") Integer completed, @Param("preparation") Integer preparation, @Param("completed") Integer completed, @Param("preparation") Integer preparation,
@Param("prepared") Integer prepared); @Param("prepared") Integer prepared, @Param("summarized") Integer summarized);
/** /**
* 发药单查询 * 发药单查询
@@ -54,7 +54,8 @@ public interface WesternMedicineDispenseMapper {
@Param(Constants.WRAPPER) QueryWrapper<ItemDispenseOrderDto> queryWrapper, @Param(Constants.WRAPPER) QueryWrapper<ItemDispenseOrderDto> queryWrapper,
@Param("inProgress") Integer inProgress, @Param("completed") Integer completed, @Param("inProgress") Integer inProgress, @Param("completed") Integer completed,
@Param("preparation") Integer preparation, @Param("prepared") Integer prepared, @Param("preparation") Integer preparation, @Param("prepared") Integer prepared,
@Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active); @Param("dispenseStatus") Integer dispenseStatus, @Param("active") Integer active,
@Param("summarized") Integer summarized);
/** /**
* 获取配药人下拉选列表 * 获取配药人下拉选列表

8
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -97,10 +97,10 @@
ON T4.med_req_id = T5.id ON T4.med_req_id = T5.id
AND T5.delete_flag = '0' AND T5.delete_flag = '0'
WHERE <if test="statusEnum == null"> WHERE <if test="statusEnum == null">
T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="statusEnum == 3"> <if test="statusEnum == 3">
T4.status_enum IN (#{inProgress},#{preparation},#{prepared}) T4.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="statusEnum == 4"> <if test="statusEnum == 4">
T4.status_enum = #{completed} T4.status_enum = #{completed}
@@ -269,10 +269,10 @@
AND T1.summary_no != '' AND T1.summary_no != ''
AND AND
<if test="dispenseStatus == null"> <if test="dispenseStatus == null">
T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="dispenseStatus == 3"> <if test="dispenseStatus == 3">
T1.status_enum IN (#{inProgress},#{preparation},#{prepared}) T1.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="dispenseStatus == 4"> <if test="dispenseStatus == 4">
T1.status_enum = #{completed} T1.status_enum = #{completed}