up
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
pt.name AS patientName, --病人姓名
|
||||
pt.bus_no AS patientBusNo, --病人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, --药品批次号
|
||||
mr.status_enum, --药品状态
|
||||
sr.performer_id, --执行护士
|
||||
@@ -21,7 +21,7 @@
|
||||
sr.occurrence_end_time,--预计结束时间
|
||||
ai.clinical_status_enum, --皮试结果
|
||||
ai.verification_status_enum, --皮试检查项目状态
|
||||
ai.note --备注
|
||||
ai.note --备注
|
||||
FROM
|
||||
wor_service_request sr
|
||||
LEFT JOIN adm_encounter e ON e.id = sr.encounter_id
|
||||
@@ -30,13 +30,12 @@
|
||||
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 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
|
||||
<where>
|
||||
ad.bus_no = 'ps001' -- 皮试检查的编号,todo:编号未定,后期修改
|
||||
AND mr.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 != ''">
|
||||
@@ -55,7 +54,8 @@
|
||||
<!-- 时间筛选 -->
|
||||
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null">
|
||||
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')
|
||||
</if>
|
||||
|
||||
@@ -78,13 +78,12 @@
|
||||
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 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
|
||||
<where>
|
||||
ad.bus_no = 'ps001' -- 皮试检查的编号,todo:编号未定,后期修改
|
||||
AND mr.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 != ''">
|
||||
@@ -104,7 +103,8 @@
|
||||
<!-- 时间筛选 -->
|
||||
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.beginTime != null and OutpatientSkinTestRecordSearchParam.endTime != null">
|
||||
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')
|
||||
</if>
|
||||
|
||||
@@ -115,6 +115,4 @@
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<!-- 门诊皮试记录相关更新-->
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user