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 e724e54..ff0c53c 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 @@ -591,8 +591,8 @@ public class MedicalRecordService { .map(MedicalRecordUserEntity::getId) .distinct() // 可选:去重 .collect(Collectors.toList()); - if (!userIds.isEmpty()){ - return ResponseDTO.userErrorParam("请勿上传重复病例"); + if (userIds.isEmpty()){ + return ResponseDTO.userErrorParam("操作失败"); } // 获取该患者的全部病例 @@ -600,11 +600,13 @@ public class MedicalRecordService { medicalRecordQueryWrapper.in(MedicalRecordEntity::getUserId, userIds); List medicalRecords = medicalRecorDao.selectList(medicalRecordQueryWrapper); for (MedicalRecordEntity medicalRecord: medicalRecords) { - // 判断是否是今天 - // 同一个患者ID可以提交多份病例(入院时间不同入院时间不同),所有病例对比 - boolean isSameDate = medicalRecord.getAdmissionTime().toLocalDate().isEqual(form.getAdmissionTime().toLocalDate()); - if (isSameDate){ - return ResponseDTO.userErrorParam("请勿上传重复病例"); + if (!Objects.equals(form.getId(), medicalRecord.getId())){ + // 判断是否是今天 + // 同一个患者ID可以提交多份病例(入院时间不同入院时间不同),所有病例对比 + boolean isSameDate = medicalRecord.getAdmissionTime().toLocalDate().isEqual(form.getAdmissionTime().toLocalDate()); + if (isSameDate){ + return ResponseDTO.userErrorParam("请勿上传重复病例"); + } } } }