From ef07eadbf9cf5c12c84d2cd7ac10492c63a53944 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Fri, 19 Jun 2026 05:24:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(#786):=20zhaoyun=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/inpatientNurse/inpatientNurseStation/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/healthlink-his-ui/src/views/inpatientNurse/inpatientNurseStation/index.js b/healthlink-his-ui/src/views/inpatientNurse/inpatientNurseStation/index.js index 4e7048be6..1be7419e0 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/inpatientNurseStation/index.js +++ b/healthlink-his-ui/src/views/inpatientNurse/inpatientNurseStation/index.js @@ -39,4 +39,5 @@ export { InpatientRecord, RollFee, Criticalrecord, + MedicineReturn, }; From 1d55523d69ade37f9bddfa88d2f743936400b8a6 Mon Sep 17 00:00:00 2001 From: guanyu Date: Fri, 19 Jun 2026 05:27:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(#768):=20guanyu=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml index 714e38326..86f586920 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml @@ -136,6 +136,7 @@ T1.diagnosis_time AS diagnosisTime, T1.doctor AS diagnosisDoctor, T1.long_term_flag AS longTermFlag, + T1.classification, CASE WHEN EXISTS ( SELECT 1 FROM infectious_card T4 WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1 @@ -174,5 +175,4 @@ ) AS counts - - T1.classification, \ No newline at end of file + \ No newline at end of file