From ae12cb2135e724b80af26d931b2e2658029abcbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Thu, 11 Jun 2026 09:26:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(#735):=20=E5=81=9C=E5=98=B1=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D=EF=BC=88=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=20PatientManageMapper=20=E5=86=B2=E7=AA=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/regdoctorstation/AdviceManageAppMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml index f1df52205..35bfef5b5 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml @@ -222,8 +222,8 @@ T1.based_on_id AS based_on_id, T1.medication_id AS advice_definition_id, T1.content_json::jsonb ->> 'remark' AS remark, - T1.effective_dose_end AS stop_time, - T1.update_by AS stop_user_name + 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 @@ -339,8 +339,8 @@ T1.based_on_id AS based_on_id, T1.activity_id AS advice_definition_id, T1.remark AS remark, - T1.occurrence_end_time AS stop_time, - T1.update_by AS stop_user_name + 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