diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java index 6f3b9432..7e788db2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java @@ -43,6 +43,12 @@ public class OutpatientSkinTestRecordDto { private Long performerId; private String performerId_dictText; + /** 开单医生 */ + @Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name") + @JsonSerialize(using = ToStringSerializer.class) + private Long doctorId; + private String doctorId_dictText; + /** 核对人 */ @Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name") @JsonSerialize(using = ToStringSerializer.class) diff --git a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml index d5a569d3..d4e5b35e 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientManageMapper.xml @@ -21,6 +21,7 @@ sr.occurrence_end_time,--预计结束时间 ai.clinical_status_enum, --皮试结果 ai.verification_status_enum, --皮试检查项目状态 + ep.practitioner_id as doctorId, --开单医生 ai.note --备注 FROM wor_service_request sr @@ -31,11 +32,13 @@ LEFT JOIN med_medication m ON m.id = mr.medication_id LEFT JOIN med_medication_definition md ON md.id = m.medication_def_id LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id + LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_id ad.bus_no = 'ps001' -- 皮试检查的编号,todo:编号未定,后期修改 AND mr.skin_test_flag = 1 AND md.skin_test_flag = 1 AND sr.status_enum = 2 --服务状态有效 + AND ep.type_code = '1' --参与者身份类型是医生 @@ -79,11 +82,13 @@ LEFT JOIN med_medication m ON m.id = mr.medication_id LEFT JOIN med_medication_definition md ON md.id = m.medication_def_id LEFT JOIN cli_allergy_intolerance ai ON ai.request_id = sr.id + LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_id ad.bus_no = 'ps001' -- 皮试检查的编号,todo:编号未定,后期修改 AND mr.skin_test_flag = 1 AND md.skin_test_flag = 1 AND sr.status_enum = 2 --服务状态有效 + AND ep.type_code = '1' --参与者身份类型是医生