diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java index 0cd8798..fea7721 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/domain/MedicalRecordAddForm.java @@ -314,7 +314,7 @@ public class MedicalRecordAddForm { /*************************疾病转归***************************/ @ApiModelProperty(value = "疾病转归 出院时间", required = true) @NotNull(message = "疾病转归 出院时间 不能为空") - private LocalDate dischargeTime; + private LocalDateTime dischargeTime; @ApiModelProperty(value = "住院天数", required = true) @NotBlank(message = "住院天数 不能为空") diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java index 83d683d..a3d52b2 100644 --- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java +++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java @@ -358,7 +358,7 @@ public class MedicalRecordService { return ResponseDTO.userErrorParam("操作失败"); } - medicalRecordPrognosis.setDischargeTime(updateForm.getDischargeTime().atStartOfDay()); + medicalRecordPrognosis.setDischargeTime(updateForm.getDischargeTime()); medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay())); medicalRecordPrognosis.setDischargeStatus(updateForm.getDischargeStatus()); medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation()); @@ -501,7 +501,7 @@ public class MedicalRecordService { // 疾病转归 public ResponseDTO checkPrognosis(MedicalRecordUpdateForm form, Long expertId){ LocalDateTime admissionTime = form.getAdmissionTime(); - LocalDate dischargeTime = form.getDischargeTime(); + LocalDateTime dischargeTime = form.getDischargeTime(); List dpmas = form.getDpmas(); 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){ return ResponseDTO.userErrorParam("疾病转归:出院时间需大于住院时间"); } @@ -521,7 +521,7 @@ public class MedicalRecordService { 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) + " 次治疗时间不在入院和出院时间之间"); } }