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

fix(#735): 停嘱医生字段修复（解决 PatientManageMapper 冲突）

Browse Source
This commit is contained in:
华佗
2026-06-11 09:26:51 +08:00
parent d2a1cd6f29
commit ae12cb2135
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,8 +222,8 @@
T1.based_on_id AS based_on_id, T1.based_on_id AS based_on_id,
T1.medication_id AS advice_definition_id, T1.medication_id AS advice_definition_id,
T1.content_json::jsonb ->> 'remark' AS remark, T1.content_json::jsonb ->> 'remark' AS remark,
T1.effective_dose_end AS stop_time, CASE WHEN T1.status_enum = 6 THEN T1.effective_dose_end ELSE NULL END AS stop_time,
T1.update_by AS stop_user_name CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM med_medication_request AS T1 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 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 LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
@@ -339,8 +339,8 @@
T1.based_on_id AS based_on_id, T1.based_on_id AS based_on_id,
T1.activity_id AS advice_definition_id, T1.activity_id AS advice_definition_id,
T1.remark AS remark, T1.remark AS remark,
T1.occurrence_end_time AS stop_time, CASE WHEN T1.status_enum = 6 THEN T1.occurrence_end_time ELSE NULL END AS stop_time,
T1.update_by AS stop_user_name CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM wor_service_request AS T1 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 adm_practitioner AS ap ON ap.id = T1.requester_id AND ap.delete_flag = '0'
LEFT JOIN wor_activity_definition AS T2 LEFT JOIN wor_activity_definition AS T2