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

Fix Bug #437: 【门诊手术计费】保存签章TOCTOU竞态致重复提交，且耗材计费项目缺失/重复、手术单号未关联

Browse Source 
Fix: 频次总量计算改用字典store动态读取，el-input-number新增@input实时计算
This commit is contained in:
wangjian963
2026-05-14 12:00:18 +08:00
committed by 关羽
parent 4a03088ca0
commit 41bdfb13b8
6 changed files with 55 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java
View File

@@ -107,8 +107,4 @@ public class OpScheduleDto extends OpSchedule {
*/
private String createByName;
/**
* 费用类别
*/
private String feeType;
}

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -1529,6 +1529,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
}
deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());// 产品批号
@@ -1835,6 +1836,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
}
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
@@ -2030,10 +2032,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
sourceEnum, sourceBillNo);
// 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
// 手术计费场景：sourceBillNo 不为空时，过滤掉药品（1），保留耗材（2）和诊疗（3/6）
if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
&& (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
&& dto.getAdviceType() == 1);
}
for (RequestBaseDto requestBaseDto : requestBaseInfo) {
// 请求状态

5
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -539,7 +539,8 @@
AND T1.refund_medicine_id IS NULL
ORDER BY T1.status_enum,T1.sort_number)
UNION ALL
-- 🔧 新增：查询门诊术中计费生成的耗材数据（这些数据存在于 adm_charge_item 和 wor_device_request）
-- 🔧 查询仅存在于 adm_charge_item 的"孤儿"耗材数据（DeviceRequest 缺失或 generate_source_enum 未设置）
-- 正常 DeviceRequest（generate_source_enum 已赋值）由下方 Part 3 统一负责，此处不做重复覆盖避免 UNION ALL 重复行
(SELECT 2 AS advice_type,
CI.service_id AS request_id,
CI.service_id || '-ci-dev' AS unique_key,
@@ -584,7 +585,7 @@
WHERE CI.delete_flag = '0'
AND CI.service_table = 'wor_device_request'
<if test="generateSourceEnum != null">
AND (DR.generate_source_enum IS NULL OR DR.generate_source_enum = #{generateSourceEnum})
AND DR.generate_source_enum IS NULL <!-- 仅匹配孤儿记录，normal DeviceRequest 由 Part 3 负责，避免 UNION ALL 重复 -->
</if>
<if test="historyFlag == '0'.toString()">
AND CI.encounter_id = #{encounterId}