From 8b97b44e3f9021df278839267eebb8989d45df16 Mon Sep 17 00:00:00 2001 From: guanyu Date: Thu, 18 Jun 2026 23:48:55 +0800 Subject: [PATCH 1/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 --- .../impl/DoctorStationDiagnosisAppServiceImpl.java | 2 ++ .../his/web/doctorstation/dto/DiagnosisQueryDto.java | 5 +++++ .../mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index d290d3388..b76f680f1 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -255,6 +255,8 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); + encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification()); // 分类 + encounterDiagnosis.setName(saveDiagnosisChildParam.getName()); // 病名 encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime()); encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate()); // 设置租户ID，避免数据库约束错误 diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java index 667472554..be00d7a8e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java @@ -106,4 +106,9 @@ public class DiagnosisQueryDto { */ private Integer hasInfectiousReport; + /** + * 分类（西医/中医等） + */ + private String classification; + } 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 0cfb6e0c6..714e38326 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 @@ -174,4 +174,5 @@ ) AS counts - \ No newline at end of file + + T1.classification, \ No newline at end of file From 3198eef4035a7809bb0369f1d0789d10109b8456 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Thu, 18 Jun 2026 23:50:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(#770):=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 --- .../components/surgery/surgeryApplication.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue b/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue index 1512adfa5..15887323e 100755 --- a/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue +++ b/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue @@ -1813,14 +1813,24 @@ defineExpose({ padding: 20px 0; } -/* Bug #770: 对话框 body 滚动区域限制，防止 footer 按钮遮盖表单字段 */ +/* Bug #770: Dialog flex 布局 — 防止 footer 按钮遮盖表单字段 */ +:deep(.el-dialog) { + display: flex; + flex-direction: column; + max-height: 90vh; + margin-top: 5vh; +} + +:deep(.el-dialog__header) { + flex-shrink: 0; +} + :deep(.el-dialog__body) { - max-height: calc(100vh - 220px); + flex: 1; overflow-y: auto; padding-bottom: 10px; } -/* Bug #770: 确保 footer 固定在对话框底部，不随内容滚动 */ :deep(.el-dialog__footer) { flex-shrink: 0; border-top: 1px solid #ebeef5;