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

fix(#Bug#739): guanyu (文件合入)

Browse Source
This commit is contained in:
关羽
2026-06-13 19:45:48 +08:00
committed by 华佗
parent 821737dcc6
commit a397e10ec7
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
View File

@@ -366,11 +366,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
.getRecords().get(0);
// 查询患者当前科室（从就诊记录获取）
Encounter encounter = iEncounterService.getById(encounterId);
Long currentOrgId = encounter != null ? encounter.getOrganizationId() : null;
if (currentOrgId == null) {
log.warn("转科医嘱：就诊记录 organizationId 为空, encounterId={}, 回退到医嘱定义默认科室", encounterId);
currentOrgId = activityAdviceBaseDto.getPositionId();
}
Long currentOrgId = encounter != null ? encounter.getOrganizationId() : activityAdviceBaseDto.getPositionId();
// 查询转入科室名称，用于医嘱名称拼接
String targetOrgName = "";
@@ -379,13 +375,8 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
Organization targetOrg = iOrganizationService.getById(targetOrgId);
if (targetOrg != null && StringUtils.isNotEmpty(targetOrg.getName())) {
targetOrgName = targetOrg.getName();
} else {
log.warn("转科医嘱：查询转入科室失败, targetOrgId={}, 尝试通过 orgId 直接查", targetOrgId);
}
}
if (StringUtils.isEmpty(targetOrgName) && targetOrgId != null) {
log.warn("转科医嘱：转入科室名称为空, targetOrgId={}, contentJson 中 adviceName 将缺少科室名", targetOrgId);
}
// 保存转科医嘱请求
ServiceRequest serviceRequest = new ServiceRequest();

11
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
View File

@@ -189,7 +189,6 @@
T1.id AS request_id,
T1.id || '-1' AS unique_key,
T1.practitioner_id AS requester_id,
ap.name AS requester_id_dict_text,
T1.create_time AS request_time,
CASE WHEN T1.practitioner_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
T1.content_json AS content_json,
@@ -197,7 +196,6 @@
T1.infusion_flag AS inject_flag,
T1.group_id AS group_id,
T2.NAME AS advice_name,
T2.category_code AS category_code,
T3.total_volume AS volume,
T1.lot_number AS lot_number,
T1.quantity AS quantity,
@@ -225,7 +223,6 @@
CASE WHEN T1.status_enum = 6 THEN T1.effective_dose_end ELSE NULL END AS stop_time,
CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM med_medication_request AS T1
LEFT JOIN adm_practitioner AS ap ON ap.id = T1.practitioner_id AND ap.delete_flag = '0'
LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
AND T2.delete_flag = '0'
LEFT JOIN med_medication AS T3 ON T3.medication_def_id = T2.ID
@@ -249,7 +246,6 @@
T1.id AS request_id,
T1.id || '-2' AS unique_key,
T1.requester_id AS requester_id,
ap.name AS requester_id_dict_text,
T1.create_time AS request_time,
CASE WHEN T1.requester_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
T1.content_json AS content_json,
@@ -257,7 +253,6 @@
null AS inject_flag,
null AS group_id,
T2.NAME AS advice_name,
'' AS category_code,
T2.SIZE AS volume,
T1.lot_number AS lot_number,
T1.quantity AS quantity,
@@ -285,7 +280,6 @@
NULL::timestamp AS stop_time,
'' AS stop_user_name
FROM wor_device_request AS T1
LEFT JOIN adm_practitioner AS ap ON ap.id = T1.requester_id AND ap.delete_flag = '0'
LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
AND T2.delete_flag = '0'
LEFT JOIN adm_charge_item AS T3
@@ -306,15 +300,13 @@
T1.id AS request_id,
T1.id || '-3' AS unique_key,
T1.requester_id AS requester_id,
ap.name AS requester_id_dict_text,
T1.create_time AS request_time,
CASE WHEN T1.requester_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
T1.content_json AS content_json,
null AS skin_test_flag,
null AS inject_flag,
null AS group_id,
COALESCE(T2.NAME, T1.content_json::jsonb->>'surgeryName', T1.content_json::jsonb->>'adviceName') AS advice_name,
'' AS category_code,
COALESCE(T1.content_json::jsonb->>'adviceName', T2.NAME, T1.content_json::jsonb->>'surgeryName') AS advice_name,
'' AS volume,
'' AS lot_number,
T1.quantity AS quantity,
@@ -342,7 +334,6 @@
CASE WHEN T1.status_enum = 6 THEN T1.occurrence_end_time ELSE NULL END AS stop_time,
CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM wor_service_request AS T1
LEFT JOIN adm_practitioner AS ap ON ap.id = T1.requester_id AND ap.delete_flag = '0'
LEFT JOIN wor_activity_definition AS T2
ON T2.ID = T1.activity_id
AND T2.delete_flag = '0'