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 11:09:17 +08:00
parent 88da828139
commit f6276d2819
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java
View File

@@ -43,6 +43,12 @@ public class OutpatientSkinTestRecordDto {
private Long performerId; private Long performerId;
private String performerId_dictText; 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") @Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)

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

@@ -21,6 +21,7 @@
sr.occurrence_end_time,--预计结束时间 sr.occurrence_end_time,--预计结束时间
ai.clinical_status_enum, --皮试结果 ai.clinical_status_enum, --皮试结果
ai.verification_status_enum, --皮试检查项目状态 ai.verification_status_enum, --皮试检查项目状态
ep.practitioner_id as doctorId, --开单医生
ai.note --备注 ai.note --备注
FROM FROM
wor_service_request sr wor_service_request sr
@@ -31,11 +32,13 @@
LEFT JOIN med_medication m ON m.id = mr.medication_id 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 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 cli_allergy_intolerance ai ON ai.request_id = sr.id
LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_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 sr.status_enum = 2 --服务状态有效 AND sr.status_enum = 2 --服务状态有效
AND ep.type_code = '1' --参与者身份类型是医生
<!-- 门诊号 查询条件--> <!-- 门诊号 查询条件-->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''">
@@ -79,11 +82,13 @@
LEFT JOIN med_medication m ON m.id = mr.medication_id 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 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 cli_allergy_intolerance ai ON ai.request_id = sr.id
LEFT JOIN adm_encounter_participant ep ON ep.encounter_id = sr.encounter_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 sr.status_enum = 2 --服务状态有效 AND sr.status_enum = 2 --服务状态有效
AND ep.type_code = '1' --参与者身份类型是医生
<!-- 门诊号 查询条件--> <!-- 门诊号 查询条件-->
<if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''"> <if test="OutpatientSkinTestRecordSearchParam != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != null and OutpatientSkinTestRecordSearchParam.encounterBusNo != ''">