33333
This commit is contained in:
parent
983d0f098d
commit
2ffaab3de5
@ -591,8 +591,8 @@ public class MedicalRecordService {
|
|||||||
.map(MedicalRecordUserEntity::getId)
|
.map(MedicalRecordUserEntity::getId)
|
||||||
.distinct() // 可选:去重
|
.distinct() // 可选:去重
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (!userIds.isEmpty()){
|
if (userIds.isEmpty()){
|
||||||
return ResponseDTO.userErrorParam("请勿上传重复病例");
|
return ResponseDTO.userErrorParam("操作失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取该患者的全部病例
|
// 获取该患者的全部病例
|
||||||
@ -600,6 +600,7 @@ public class MedicalRecordService {
|
|||||||
medicalRecordQueryWrapper.in(MedicalRecordEntity::getUserId, userIds);
|
medicalRecordQueryWrapper.in(MedicalRecordEntity::getUserId, userIds);
|
||||||
List<MedicalRecordEntity> medicalRecords = medicalRecorDao.selectList(medicalRecordQueryWrapper);
|
List<MedicalRecordEntity> medicalRecords = medicalRecorDao.selectList(medicalRecordQueryWrapper);
|
||||||
for (MedicalRecordEntity medicalRecord: medicalRecords) {
|
for (MedicalRecordEntity medicalRecord: medicalRecords) {
|
||||||
|
if (!Objects.equals(form.getId(), medicalRecord.getId())){
|
||||||
// 判断是否是今天
|
// 判断是否是今天
|
||||||
// 同一个患者ID可以提交多份病例(入院时间不同入院时间不同),所有病例对比
|
// 同一个患者ID可以提交多份病例(入院时间不同入院时间不同),所有病例对比
|
||||||
boolean isSameDate = medicalRecord.getAdmissionTime().toLocalDate().isEqual(form.getAdmissionTime().toLocalDate());
|
boolean isSameDate = medicalRecord.getAdmissionTime().toLocalDate().isEqual(form.getAdmissionTime().toLocalDate());
|
||||||
@ -608,6 +609,7 @@ public class MedicalRecordService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return ResponseDTO.app_ok();
|
return ResponseDTO.app_ok();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user