gdxz/case-collection
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6666

Browse Source
This commit is contained in:
wucongxing8150 2025-06-26 15:45:25 +08:00
parent daabf3707f
commit 9febf92836
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java
View File

@ -314,7 +314,7 @@ public class MedicalRecordAddForm {
/*************************疾病转归***************************/ /*************************疾病转归***************************/
@ApiModelProperty(value = "疾病转归 出院时间", required = true) @ApiModelProperty(value = "疾病转归 出院时间", required = true)
@NotNull(message = "疾病转归 出院时间 不能为空") @NotNull(message = "疾病转归 出院时间 不能为空")
private LocalDate dischargeTime; private LocalDateTime dischargeTime;
@ApiModelProperty(value = "住院天数", required = true) @ApiModelProperty(value = "住院天数", required = true)
@NotBlank(message = "住院天数 不能为空") @NotBlank(message = "住院天数 不能为空")

8
sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java
View File

@ -358,7 +358,7 @@ public class MedicalRecordService {
return ResponseDTO.userErrorParam("操作失败"); return ResponseDTO.userErrorParam("操作失败");
} }
medicalRecordPrognosis.setDischargeTime(updateForm.getDischargeTime().atStartOfDay()); medicalRecordPrognosis.setDischargeTime(updateForm.getDischargeTime());
medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay())); medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay()));
medicalRecordPrognosis.setDischargeStatus(updateForm.getDischargeStatus()); medicalRecordPrognosis.setDischargeStatus(updateForm.getDischargeStatus());
medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation()); medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation());
@ -501,7 +501,7 @@ public class MedicalRecordService {
// 疾病转归 // 疾病转归
public ResponseDTO checkPrognosis(MedicalRecordUpdateForm form, Long expertId){ public ResponseDTO checkPrognosis(MedicalRecordUpdateForm form, Long expertId){
LocalDateTime admissionTime = form.getAdmissionTime(); LocalDateTime admissionTime = form.getAdmissionTime();
LocalDate dischargeTime = form.getDischargeTime(); LocalDateTime dischargeTime = form.getDischargeTime();
List<DpmsAddForm> dpmas = form.getDpmas(); List<DpmsAddForm> dpmas = form.getDpmas();
if (admissionTime == null || dischargeTime == null) { if (admissionTime == null || dischargeTime == null) {
@ -509,7 +509,7 @@ public class MedicalRecordService {
} }
// 出院时间大于住院时间 // 出院时间大于住院时间
boolean isAfter = dischargeTime.isAfter(ChronoLocalDate.from(admissionTime)); boolean isAfter = dischargeTime.isAfter(admissionTime);
if (!isAfter){ if (!isAfter){
return ResponseDTO.userErrorParam("疾病转归:出院时间需大于住院时间"); return ResponseDTO.userErrorParam("疾病转归:出院时间需大于住院时间");
} }
@ -521,7 +521,7 @@ public class MedicalRecordService {
return ResponseDTO.userErrorParam("人工肝治疗:" + "第 " + (i + 1) + " 次治疗时间不能为空"); return ResponseDTO.userErrorParam("人工肝治疗:" + "第 " + (i + 1) + " 次治疗时间不能为空");
} }
if (treatTime.isBefore(admissionTime) || treatTime.isAfter(dischargeTime.atStartOfDay())) { if (treatTime.isBefore(admissionTime) || treatTime.isAfter(dischargeTime)) {
return ResponseDTO.userErrorParam("人工肝治疗:" + "第 " + (i + 1) + " 次治疗时间不在入院和出院时间之间"); return ResponseDTO.userErrorParam("人工肝治疗:" + "第 " + (i + 1) + " 次治疗时间不在入院和出院时间之间");
} }
} }