用户信息采集在用户确认和医生确认后暂时无法修改

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -148,6 +148,16 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     @Override
     public int updateFsUserInformationCollection(FsUserInformationCollectionParam param)
     {
+        if (param.getId() == null || param.getId() < 1) {
+            throw new CustomException("参数错误");
+        }
+        FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(param.getId());
+        if (collection == null) {
+            throw new CustomException("没有用户采集信息");
+        }
+        if (collection.getUserConfirm() == 1 || collection.getDoctorConfirm() == 1) {
+            throw new CustomException("确认中，暂无法修改");
+        }
         FsUserInformationCollection fsUserInformationCollection = getFsUserInformationCollection(param);
         fsUserInformationCollection.setUpdateTime(DateUtils.getNowDate());
         return baseMapper.updateFsUserInformationCollection(fsUserInformationCollection);
@@ -262,7 +272,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                     scene,
                     "pages_order/confirmUserinfo",
                     true,
-                    "trial",//release trial
+                    "release",//release trial
                     430,
                     true,
                     null,
@@ -311,14 +321,13 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         }
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(collection.getId());
+        map.setDoctorAdvice(collection.getDoctorAdvice());
         if (answerVOS != null && !answerVOS.isEmpty()) {
             map.setJsonInfo(JSON.toJSONString(answerVOS));
         }
         if (fsUserInformationCollection.getIsPackage() == 1) {
-            map.setDoctorAdvice(collection.getDoctorAdvice());
             map.setDoctorConfirm(1);
         } else {
-
             //没有关联套餐包医生确认清空所有状态
             map.setDoctorConfirm(0);
             map.setUserConfirm(0);
@@ -347,7 +356,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(id);
 
         if (collection != null) {
-            //TODO 测试完放开
+
             if (!Objects.equals(collection.getUserId(), userId)) {
                 return vo;
             }