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

fix bug249:手术管理-》门诊手术安排：【新增手术安排】-》【查找】在门诊医生站已【删除】作废的手术申请单在查询界面还能查询出来

Browse Source
This commit is contained in:
yangkexiang
2026-05-15 15:44:36 +08:00
committed by 关羽
parent b4167c9994
commit 532cd17c10
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
View File

@@ -75,7 +75,8 @@
</select> </select>
<select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto"> <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
SELECT wsr.quantity, SELECT wsr.activity_id AS activity_id,
wsr.quantity,
wsr.unit_code, wsr.unit_code,
COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name, COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
aci.total_price aci.total_price
@@ -147,9 +148,9 @@
fc.contract_name AS fee_type, fc.contract_name AS fee_type,
COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
FROM doc_request_form drf FROM doc_request_form drf
LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0' INNER JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0' INNER JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0' INNER JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0' LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0' LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0' LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
@@ -184,6 +185,8 @@
</if> </if>
AND drf.delete_flag = '0' AND drf.delete_flag = '0'
AND os.schedule_id IS NULL AND os.schedule_id IS NULL
<!-- 已取消(4)、已完成(3)的手术申请不参与门诊手术安排查找 -->
AND cs.status_enum NOT IN (3, 4)
</where> </where>
ORDER BY drf.create_time DESC ORDER BY drf.create_time DESC
</select> </select>