Quellcode durchsuchen

app 小程序文案修改一致

wangzl vor 3 Monaten
Ursprung
Commit
fa95f5d3ab

+ 9 - 2
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java

@@ -222,6 +222,12 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean wxAppletFinishClinic(BizWxAppletFinishClinicDTO source) {
         BizClinicRoomPO clinicRoom = baseRepository.selectById(source.getClinicId());
+        if (ObjectUtil.isNull(clinicRoom)) {
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "手术信息不存在");
+        }
+        if (ClinicPhaseEnums.AFTER.equals(clinicRoom.getClinicStatus())) {
+            throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "手术已结束,无法结束手术");
+        }
         if (ObjectUtil.compare(source.getClinicEndTime(), new Date()) > 0) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001
                     , String.format("手术结束时间[%s],不得大于当前时间[%s]"
@@ -370,8 +376,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)