From 488c31178899c2fa769cd44866eefcf597384cc0 Mon Sep 17 00:00:00 2001 From: Ranyunqiao <2499115710@qq.com> Date: Mon, 30 Mar 2026 10:34:48 +0800 Subject: [PATCH] =?UTF-8?q?288=20=E9=97=A8=E8=AF=8A=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E7=AB=99-=E3=80=8B=E8=AF=8A=E6=96=ADTAB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=AF=8A=E6=96=AD=E7=82=B9=E3=80=90?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AF=8A=E6=96=AD=E3=80=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E2=80=9C=E4=BF=9D=E5=AD=98=E8=AF=8A=E6=96=AD=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E7=A8=8D=E5=90=8E=E9=87=8D=E8=AF=95=E2=80=9D?= =?UTF-8?q?=20289=20=E6=89=8B=E6=9C=AF=E7=AE=A1=E7=90=86-=E3=80=8B?= =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF=E5=AE=89=E6=8E=92=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E3=80=90=E4=BF=9D=E5=AD=98=E3=80=91=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E6=96=B0=E5=A2=9E=E6=89=8B=E6=9C=AF?= =?UTF-8?q?=E5=AE=89=E6=8E=92=E5=A4=B1=E8=B4=A5=EF=BC=8C=E8=AF=B7=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=E2=80=9D=20298=20?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?= =?UTF-8?q?=E3=80=8B=E5=A5=97=E9=A4=90=E8=AE=BE=E7=BD=AE=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=AA=E4=BA=BA=E5=A5=97=E9=A4=90=E3=80=90=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=80=91=E6=8A=A5=E9=94=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/CheckPackageAppServiceImpl.java | 5 ++++- .../impl/SurgicalScheduleAppServiceImpl.java | 6 +++--- .../web/clinicalmanage/dto/OpCreateScheduleDto.java | 11 +++++++++-- .../com/openhis/check/domain/CheckPackageDetail.java | 2 ++ .../openhis/surgicalschedule/domain/OpSchedule.java | 8 ++++---- .../doctorstation/components/diagnosis/diagnosis.vue | 6 +++--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java index da96306c..d81edbce 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPackageAppServiceImpl.java @@ -128,7 +128,10 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService { // 保存套餐明细 if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) { List details = convertToDetails(checkPackageDto.getItems(), checkPackage.getId(), 1); - checkPackageDetailService.saveBatch(details); + boolean detailSaveResult = checkPackageDetailService.saveBatch(details); + if (!detailSaveResult) { + throw new RuntimeException("保存套餐明细失败"); + } } return R.ok(checkPackage.getId(), "保存成功"); 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 d84ddf09..757b823f 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 @@ -413,10 +413,10 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi /** * 格式化安排时间 */ - private String formatScheduleDate(LocalDate scheduleDate) { + private String formatScheduleDate(LocalDateTime scheduleDate) { if (scheduleDate == null) return ""; - // 格式化为 yyyy-MM-dd - return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")); + // 格式化为 yyyy-MM-dd HH:mm:ss + return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); } } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java index 5dfc1cba..57eadb8b 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java @@ -45,9 +45,10 @@ public class OpCreateScheduleDto { private String postoperativeDiagnosis; /** - * 手术安排日期 + * 手术安排日期时间 */ - private LocalDate scheduleDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime scheduleDate; /** * 手术台次序号 @@ -82,11 +83,13 @@ public class OpCreateScheduleDto { /** * 入院时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime admissionTime; /** * 入手术室时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime entryTime; /** @@ -167,21 +170,25 @@ public class OpCreateScheduleDto { /** * 手术开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; /** * 手术结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; /** * 麻醉开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime anesStart; /** * 麻醉结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime anesEnd; /** diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java index 2e725e8a..8cef7578 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/check/domain/CheckPackageDetail.java @@ -42,6 +42,7 @@ public class CheckPackageDetail { private String dose; /** 途径 */ + @TableField("\"method\"") private String method; /** 频次 */ @@ -54,6 +55,7 @@ public class CheckPackageDetail { private Integer quantity; /** 单位 */ + @TableField("\"unit\"") private String unit; /** 单价 */ 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 84c2a9ce..54599d7b 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 @@ -1,7 +1,6 @@ package com.openhis.surgicalschedule.domain; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; @@ -52,9 +51,10 @@ public class OpSchedule extends HisBaseEntity { @TableField(value = "postoperative_diagnosis", insertStrategy = FieldStrategy.IGNORED) private String postoperativeDiagnosis; - /** 手术安排日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate scheduleDate; + /** 手术安排日期时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime scheduleDate; /** 手术台次序号 */ private Integer sequenceNo; diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue index aa7f424b..e45c8343 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue @@ -628,11 +628,11 @@ async function handleSaveDiagnosis() { // 开始加载状态，防止重复提交 saveLoading.value = true; - // 保存前按排序号排序，并转换日期格式 + // 保存前按排序号排序，并转换日期格式为ISO字符串 const diagnosisChildList = form.value.diagnosisList.map(item => ({ ...item, - onsetDate: item.onsetDate ? new Date(item.onsetDate) : null, - diagnosisTime: item.diagnosisTime ? new Date(item.diagnosisTime) : null + onsetDate: item.onsetDate ? new Date(item.onsetDate).toISOString() : null, + diagnosisTime: item.diagnosisTime ? new Date(item.diagnosisTime).toISOString() : null })); // 调用保存诊断接口