288 门诊医生站-》诊断TAB页面:新增诊断点【保存诊断】报错“保存诊断失败,请稍后重试”
289 手术管理-》门诊手术安排:新增手术安排点击【保存】报错提示“新增手术安排失败,请检查表单信息” 298 检查项目设置-》套餐设置:新增个人套餐【保存】报错。
This commit is contained in:
@@ -128,7 +128,10 @@ public class CheckPackageAppServiceImpl implements ICheckPackageAppService {
|
|||||||
// 保存套餐明细
|
// 保存套餐明细
|
||||||
if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
|
if (checkPackageDto.getItems() != null && !checkPackageDto.getItems().isEmpty()) {
|
||||||
List<CheckPackageDetail> details = convertToDetails(checkPackageDto.getItems(), checkPackage.getId(), 1);
|
List<CheckPackageDetail> 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(), "保存成功");
|
return R.ok(checkPackage.getId(), "保存成功");
|
||||||
|
|||||||
@@ -413,10 +413,10 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
|
|||||||
/**
|
/**
|
||||||
* 格式化安排时间
|
* 格式化安排时间
|
||||||
*/
|
*/
|
||||||
private String formatScheduleDate(LocalDate scheduleDate) {
|
private String formatScheduleDate(LocalDateTime scheduleDate) {
|
||||||
if (scheduleDate == null) return "";
|
if (scheduleDate == null) return "";
|
||||||
|
|
||||||
// 格式化为 yyyy-MM-dd
|
// 格式化为 yyyy-MM-dd HH:mm:ss
|
||||||
return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,9 +45,10 @@ public class OpCreateScheduleDto {
|
|||||||
private String postoperativeDiagnosis;
|
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;
|
private LocalDateTime admissionTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 入手术室时间
|
* 入手术室时间
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime entryTime;
|
private LocalDateTime entryTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -167,21 +170,25 @@ public class OpCreateScheduleDto {
|
|||||||
/**
|
/**
|
||||||
* 手术开始时间
|
* 手术开始时间
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime startTime;
|
private LocalDateTime startTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 手术结束时间
|
* 手术结束时间
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime endTime;
|
private LocalDateTime endTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 麻醉开始时间
|
* 麻醉开始时间
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime anesStart;
|
private LocalDateTime anesStart;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 麻醉结束时间
|
* 麻醉结束时间
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime anesEnd;
|
private LocalDateTime anesEnd;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class CheckPackageDetail {
|
|||||||
private String dose;
|
private String dose;
|
||||||
|
|
||||||
/** 途径 */
|
/** 途径 */
|
||||||
|
@TableField("\"method\"")
|
||||||
private String method;
|
private String method;
|
||||||
|
|
||||||
/** 频次 */
|
/** 频次 */
|
||||||
@@ -54,6 +55,7 @@ public class CheckPackageDetail {
|
|||||||
private Integer quantity;
|
private Integer quantity;
|
||||||
|
|
||||||
/** 单位 */
|
/** 单位 */
|
||||||
|
@TableField("\"unit\"")
|
||||||
private String unit;
|
private String unit;
|
||||||
|
|
||||||
/** 单价 */
|
/** 单价 */
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.openhis.surgicalschedule.domain;
|
package com.openhis.surgicalschedule.domain;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
@@ -52,9 +51,10 @@ public class OpSchedule extends HisBaseEntity {
|
|||||||
@TableField(value = "postoperative_diagnosis", insertStrategy = FieldStrategy.IGNORED)
|
@TableField(value = "postoperative_diagnosis", insertStrategy = FieldStrategy.IGNORED)
|
||||||
private String postoperativeDiagnosis;
|
private String postoperativeDiagnosis;
|
||||||
|
|
||||||
/** 手术安排日期 */
|
/** 手术安排日期时间 */
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDate scheduleDate;
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private LocalDateTime scheduleDate;
|
||||||
|
|
||||||
/** 手术台次序号 */
|
/** 手术台次序号 */
|
||||||
private Integer sequenceNo;
|
private Integer sequenceNo;
|
||||||
|
|||||||
@@ -628,11 +628,11 @@ async function handleSaveDiagnosis() {
|
|||||||
// 开始加载状态,防止重复提交
|
// 开始加载状态,防止重复提交
|
||||||
saveLoading.value = true;
|
saveLoading.value = true;
|
||||||
|
|
||||||
// 保存前按排序号排序,并转换日期格式
|
// 保存前按排序号排序,并转换日期格式为ISO字符串
|
||||||
const diagnosisChildList = form.value.diagnosisList.map(item => ({
|
const diagnosisChildList = form.value.diagnosisList.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
onsetDate: item.onsetDate ? new Date(item.onsetDate) : null,
|
onsetDate: item.onsetDate ? new Date(item.onsetDate).toISOString() : null,
|
||||||
diagnosisTime: item.diagnosisTime ? new Date(item.diagnosisTime) : null
|
diagnosisTime: item.diagnosisTime ? new Date(item.diagnosisTime).toISOString() : null
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// 调用保存诊断接口
|
// 调用保存诊断接口
|
||||||
|
|||||||
Reference in New Issue
Block a user