优化小程序用户采集信息确认逻辑

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

@@ -671,6 +671,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //用户信息采集表id
         Long collectionId = collection.getId();
         FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collectionId);
+        if (schedule != null&&(schedule.getStatus() == 2||schedule.getStatus() == 3)) {
+            return R.error("用户采集信息已更新，请扫描最新二维码确认");
+        }
         if (collection.getStatus() == 1) {
             if (collection.getIsPackage() == 0) {
                 //用户第一次确认添加医生消息
@@ -959,7 +962,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R stopCollection(FsUserInformationCollectionSchedule param, Long operateId) {
-        FsUserInformationCollection collection = this.fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(param.getCollectionId());
+        FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(param.getCollectionId());
         if (collection == null) {
             return R.error("未找到采集信息");
         }
@@ -977,7 +980,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         if(fsUserInformationCollectionMapper.updateFsUserInformationCollection(map) > 0) {
             //根据采集表id查询信息采集进度信息
             FsUserInformationCollectionSchedule schedule;
-            // 有进度id主键就用进度id查询，没有就行采集表id查询
+            // 有进度id主键就用进度id查询，没有就用采集表id查询
             if (param.getId()!=null){
                 schedule=scheduleMapper.selectFsUserInformationCollectionScheduleById(param.getId());
             }else {