|
|
@@ -370,8 +370,9 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
|
|
|
}
|
|
|
if (ObjectUtil.compare(clinicRoom.getClinicStartTime(), finishDTO.getClinicEndTime()) > 0) {
|
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001
|
|
|
- , String.format("手术开始时间为[%s],尚未开始"
|
|
|
- , DateUtil.formatDateTime(finishDTO.getClinicEndTime())));
|
|
|
+ , String.format("手术结束时间[%s],不得早于开始时间[%s]"
|
|
|
+ , DateUtil.formatDateTime(finishDTO.getClinicEndTime())
|
|
|
+ ,DateUtil.formatDateTime(clinicRoom.getClinicStartTime())));
|
|
|
}
|
|
|
int update = baseRepository.update(null, new LambdaUpdateWrapper<BizClinicRoomPO>()
|
|
|
.set(BizClinicRoomPO::getClinicStatus, ClinicPhaseEnums.AFTER)
|
|
|
@@ -635,9 +636,9 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
|
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "医生信息不存在");
|
|
|
}
|
|
|
List<String> clinicIds = source.getClinicIds();
|
|
|
- if(clinicIds.stream().anyMatch(Objects::isNull)){
|
|
|
- throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "手术信息id包含空值");
|
|
|
- }
|
|
|
+ if(clinicIds.stream().anyMatch(Objects::isNull)){
|
|
|
+ throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "手术信息id包含空值");
|
|
|
+ }
|
|
|
//先删除跟手术医生关联
|
|
|
clinicRoomDoctorUserRepository.delete(new LambdaQueryWrapper<BizClinicRoomDoctorUserPO>()
|
|
|
.in(BizClinicRoomDoctorUserPO::getClinicRoomId, clinicIds));
|