fix(门诊预约): 修复取消预约次数限制逻辑错误
修复取消预约次数限制逻辑与配置不一致的问题,使用配置值而非硬编码值进行校验。同时优化诊前退号检查逻辑,增加病历记录、费用明细、班段结束时间等校验条件,防止不当退号操作。 refactor(检验申请): 优化检验申请单列表查询SQL 从明细表聚合项目名称和金额,避免直接查询申请单表导致的数据重复问题。
This commit is contained in:
@@ -41,11 +41,18 @@
|
||||
</select>
|
||||
|
||||
<!-- 分页查询检验申请单列表(根据就诊ID查询,按申请时间降序)
|
||||
直接查询申请单表,不关联明细表,避免重复记录-->
|
||||
从明细表聚合项目名称和金额-->
|
||||
<select id="getInspectionApplyListPage" resultType="com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto">
|
||||
SELECT t1.id AS applicationId,
|
||||
t1.apply_no AS applyNo,
|
||||
t1.inspection_item AS itemName,
|
||||
(SELECT STRING_AGG(t2.item_name, '+')
|
||||
FROM lab_apply_item t2
|
||||
WHERE t2.apply_no = t1.apply_no AND t2.delete_flag = '0'
|
||||
) AS itemName,
|
||||
(SELECT SUM(t2.item_amount)
|
||||
FROM lab_apply_item t2
|
||||
WHERE t2.apply_no = t1.apply_no AND t2.delete_flag = '0'
|
||||
) AS itemAmount,
|
||||
t1.apply_doc_name AS applyDocName,
|
||||
t1.priority_code AS priorityCode,
|
||||
t1.apply_status AS applyStatus,
|
||||
|
||||
Reference in New Issue
Block a user