|
@@ -169,12 +169,17 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public Boolean wxAppletFinishClinic(BizWxAppletFinishClinicDTO source) {
|
|
public Boolean wxAppletFinishClinic(BizWxAppletFinishClinicDTO source) {
|
|
|
BizClinicRoomPO clinicRoom = baseRepository.selectById(source.getClinicId());
|
|
BizClinicRoomPO clinicRoom = baseRepository.selectById(source.getClinicId());
|
|
|
- if(ObjectUtil.compare(source.getClinicEndTime(),new Date())<0){
|
|
|
|
|
|
|
+ if(ObjectUtil.compare(source.getClinicEndTime(),new Date())>0){
|
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001
|
|
|
,String.format("手术结束时间[%s],不得大于当前时间[%s]"
|
|
,String.format("手术结束时间[%s],不得大于当前时间[%s]"
|
|
|
,DateUtil.formatDateTime(source.getClinicEndTime())
|
|
,DateUtil.formatDateTime(source.getClinicEndTime())
|
|
|
,DateUtil.formatDateTime(new Date())));
|
|
,DateUtil.formatDateTime(new Date())));
|
|
|
}
|
|
}
|
|
|
|
|
+ if(ObjectUtil.compare(clinicRoom.getClinicStartTime(),new Date())>0){
|
|
|
|
|
+ throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001
|
|
|
|
|
+ ,String.format("手术开始时间为[%s],尚未开始"
|
|
|
|
|
+ ,DateUtil.formatDateTime(source.getClinicEndTime())));
|
|
|
|
|
+ }
|
|
|
//精确到
|
|
//精确到
|
|
|
if (ObjectUtil.isNull(clinicRoom)) {
|
|
if (ObjectUtil.isNull(clinicRoom)) {
|
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"未查询到手术信息");
|
|
throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001,"未查询到手术信息");
|