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 })); // 调用保存诊断接口