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

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-11 09:15:38 +08:00
parent 1924cfa3ec
commit 233bea7aad
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml
View File

@@ -12,7 +12,7 @@
pt.name AS patientName, --病人姓名 pt.name AS patientName, --病人姓名
pt.bus_no AS patientBusNo, --病人ID（前台显示用） pt.bus_no AS patientBusNo, --病人ID（前台显示用）
sr.patient_id, --病人ID sr.patient_id, --病人ID
md.bus_no || ' ' || md.name || ' <br>规格：' || COALESCE(m.total_volume, '') AS medicationDetail,--药品 md.bus_no || ' ' || md.name || ' 规格：' || COALESCE(m.total_volume, '') AS medicationDetail,--药品
m.lot_number AS medicationLotNumber, --药品批次号 m.lot_number AS medicationLotNumber, --药品批次号
mr.status_enum, --药品状态 mr.status_enum, --药品状态
sr.performer_id, --执行护士 sr.performer_id, --执行护士
@@ -30,13 +30,12 @@
LEFT JOIN med_medication_request mr ON mr.prescription_no = sr.prescription_no LEFT JOIN med_medication_request mr ON mr.prescription_no = sr.prescription_no
LEFT JOIN med_medication_definition md ON md.id = mr.medication_id LEFT JOIN med_medication_definition md ON md.id = mr.medication_id
LEFT JOIN med_medication m ON m.medication_def_id = md.id LEFT JOIN med_medication m ON m.medication_def_id = md.id
LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_id
LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id
<where> <where>
ad.bus_no = 'ps001' -- 皮试检查的编号，todo：编号未定，后期修改 ad.bus_no = 'ps001' -- 皮试检查的编号，todo：编号未定，后期修改
AND mr.skin_test_flag = 1 AND mr.skin_test_flag = 1
AND md.skin_test_flag = 1 AND md.skin_test_flag = 1
AND ep.type_code = '1' --首诊医生 AND sr.status_enum = 2 --服务状态有效
<!-- 门诊号 查询条件--> <!-- 门诊号 查询条件-->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''">
@@ -55,7 +54,8 @@
<!-- 时间筛选 --> <!-- 时间筛选 -->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null">
AND ai.recorded_date BETWEEN AND ai.recorded_date BETWEEN
TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.beginTime} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS') AND TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.beginTime} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS')
AND
TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.endTime} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS') TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.endTime} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if> </if>
@@ -78,13 +78,12 @@
LEFT JOIN med_medication_request mr ON mr.prescription_no = sr.prescription_no LEFT JOIN med_medication_request mr ON mr.prescription_no = sr.prescription_no
LEFT JOIN med_medication_definition md ON md.id = mr.medication_id LEFT JOIN med_medication_definition md ON md.id = mr.medication_id
LEFT JOIN med_medication m ON m.medication_def_id = md.id LEFT JOIN med_medication m ON m.medication_def_id = md.id
LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_id
LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id
<where> <where>
ad.bus_no = 'ps001' -- 皮试检查的编号，todo：编号未定，后期修改 ad.bus_no = 'ps001' -- 皮试检查的编号，todo：编号未定，后期修改
AND mr.skin_test_flag = 1 AND mr.skin_test_flag = 1
AND md.skin_test_flag = 1 AND md.skin_test_flag = 1
AND ep.type_code = '1' --首诊医生 AND sr.status_enum = 2 --服务状态有效
<!-- 门诊号 查询条件--> <!-- 门诊号 查询条件-->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''">
@@ -104,7 +103,8 @@
<!-- 时间筛选 --> <!-- 时间筛选 -->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null">
AND ai.recorded_date BETWEEN AND ai.recorded_date BETWEEN
TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.beginTime} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS') AND TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.beginTime} || ' 00:00:00', 'YYYY-MM-DD HH24:MI:SS')
AND
TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.endTime} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS') TO_TIMESTAMP(#{OutpatientSkinTestRecordSearchParam.endTime} || ' 23:59:59', 'YYYY-MM-DD HH24:MI:SS')
</if> </if>
@@ -115,6 +115,4 @@
</where> </where>
</select> </select>
<!-- 门诊皮试记录相关更新-->
</mapper> </mapper>