From f1087b04f076f0348deea9cedbca2d2fb70643ff Mon Sep 17 00:00:00 2001 From: chenqi Date: Thu, 19 Mar 2026 15:52:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(surgery):=20=E8=A7=A3=E5=86=B3=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98=20BUG#23?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了前端手术对话框中的错误注释代码 - 在手术排班服务中添加了对多个可为空字符串字段的默认值处理 - 为手术实体类中的关键字段添加了MyBatis-Plus字段策略注解 - 确保术前诊断、术后诊断、麻醉方式等字段在数据库操作时正确处理空值情况 - 统一了手术相关字段的插入策略为忽略空值，避免数据库约束错误 --- .../impl/SurgicalScheduleAppServiceImpl.java | 76 +++++++++++++++++++ .../surgicalschedule/domain/OpSchedule.java | 12 +++ .../src/views/surgerymanage/index.vue | 2 +- 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java index ceed3671..dd914033 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java @@ -113,6 +113,44 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi OpSchedule opSchedule = new OpSchedule(); BeanUtils.copyProperties(opCreateScheduleDto, opSchedule); + // 处理可能为null的字符串字段，设置默认值为空字符串 + if (opSchedule.getPreoperativeDiagnosis() == null) { + opSchedule.setPreoperativeDiagnosis(""); + } + if (opSchedule.getPostoperativeDiagnosis() == null) { + opSchedule.setPostoperativeDiagnosis(""); + } + if (opSchedule.getAnesMethod() == null) { + opSchedule.setAnesMethod(""); + } + if (opSchedule.getAnesDoctor1Code() == null) { + opSchedule.setAnesDoctor1Code(""); + } + if (opSchedule.getAnesDoctor2Code() == null) { + opSchedule.setAnesDoctor2Code(""); + } + if (opSchedule.getAnesDoctor3Code() == null) { + opSchedule.setAnesDoctor3Code(""); + } + if (opSchedule.getScrubNurseCode() == null) { + opSchedule.setScrubNurseCode(""); + } + if (opSchedule.getCircuNurse1Code() == null) { + opSchedule.setCircuNurse1Code(""); + } + if (opSchedule.getCircuNurse2Code() == null) { + opSchedule.setCircuNurse2Code(""); + } + if (opSchedule.getScrubNurse1Code() == null) { + opSchedule.setScrubNurse1Code(""); + } + if (opSchedule.getScrubNurse2Code() == null) { + opSchedule.setScrubNurse2Code(""); + } + if (opSchedule.getSurgeonCode() == null) { + opSchedule.setSurgeonCode(""); + } + // 设置创建者ID opSchedule.setCreatorId(userId); //设置创建人名称 @@ -158,6 +196,44 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi OpSchedule opSchedule = new OpSchedule(); BeanUtils.copyProperties(opScheduleDto, opSchedule); + // 处理可能为null的字符串字段，设置默认值为空字符串 + if (opSchedule.getPreoperativeDiagnosis() == null) { + opSchedule.setPreoperativeDiagnosis(""); + } + if (opSchedule.getPostoperativeDiagnosis() == null) { + opSchedule.setPostoperativeDiagnosis(""); + } + if (opSchedule.getAnesMethod() == null) { + opSchedule.setAnesMethod(""); + } + if (opSchedule.getAnesDoctor1Code() == null) { + opSchedule.setAnesDoctor1Code(""); + } + if (opSchedule.getAnesDoctor2Code() == null) { + opSchedule.setAnesDoctor2Code(""); + } + if (opSchedule.getAnesDoctor3Code() == null) { + opSchedule.setAnesDoctor3Code(""); + } + if (opSchedule.getScrubNurseCode() == null) { + opSchedule.setScrubNurseCode(""); + } + if (opSchedule.getCircuNurse1Code() == null) { + opSchedule.setCircuNurse1Code(""); + } + if (opSchedule.getCircuNurse2Code() == null) { + opSchedule.setCircuNurse2Code(""); + } + if (opSchedule.getScrubNurse1Code() == null) { + opSchedule.setScrubNurse1Code(""); + } + if (opSchedule.getScrubNurse2Code() == null) { + opSchedule.setScrubNurse2Code(""); + } + if (opSchedule.getSurgeonCode() == null) { + opSchedule.setSurgeonCode(""); + } + // 更新时间 opSchedule.setUpdateTime(new Date()); diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java index 4f587d3c..5e7e4a65 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java @@ -45,9 +45,11 @@ public class OpSchedule extends HisBaseEntity { private String operName; /** 术前诊断 */ + @TableField(value = "preoperative_diagnosis", insertStrategy = FieldStrategy.IGNORED) private String preoperativeDiagnosis; /** 术后诊断 */ + @TableField(value = "postoperative_diagnosis", insertStrategy = FieldStrategy.IGNORED) private String postoperativeDiagnosis; /** 手术安排日期 */ @@ -87,33 +89,43 @@ public class OpSchedule extends HisBaseEntity { private String tableNo; /** 麻醉方式 */ + @TableField(value = "anes_method", insertStrategy = FieldStrategy.IGNORED) private String anesMethod; /** 麻醉医生1编码 */ + @TableField(value = "anes_doctor1_code", insertStrategy = FieldStrategy.IGNORED) private String anesDoctor1Code; /** 麻醉医生2编码 */ + @TableField(value = "anes_doctor2_code", insertStrategy = FieldStrategy.IGNORED) private String anesDoctor2Code; /** 麻醉医生3编码 */ + @TableField(value = "anes_doctor3_code", insertStrategy = FieldStrategy.IGNORED) private String anesDoctor3Code; /** 洗手护士编码 */ + @TableField(value = "scrub_nurse_code", insertStrategy = FieldStrategy.IGNORED) private String scrubNurseCode; /** 巡回护士1编码 */ + @TableField(value = "circu_nurse1_code", insertStrategy = FieldStrategy.IGNORED) private String circuNurse1Code; /** 巡回护士2编码 */ + @TableField(value = "circu_nurse2_code", insertStrategy = FieldStrategy.IGNORED) private String circuNurse2Code; /** 器械护士1编码 */ + @TableField(value = "scrub_nurse1_code", insertStrategy = FieldStrategy.IGNORED) private String scrubNurse1Code; /** 器械护士2编码 */ + @TableField(value = "scrub_nurse2_code", insertStrategy = FieldStrategy.IGNORED) private String scrubNurse2Code; /** 主刀医生编码 */ + @TableField(value = "surgeon_code", insertStrategy = FieldStrategy.IGNORED) private String surgeonCode; /** 助手1编码 */ diff --git a/openhis-ui-vue3/src/views/surgerymanage/index.vue b/openhis-ui-vue3/src/views/surgerymanage/index.vue index 8b386ac9..ee769841 100644 --- a/openhis-ui-vue3/src/views/surgerymanage/index.vue +++ b/openhis-ui-vue3/src/views/surgerymanage/index.vue @@ -195,7 +195,7 @@ - ElMessageBox is not defined +