不包含套餐包，医生已确认用户信息采集自动确认

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -1852,6 +1852,25 @@ public class Task {
         }
     }
 
+    //不包含套餐包，医生已确认用户信息采集自动确认
+    void autoConfirm(){
+        List<FsUserInformationCollection> collections = userInformationCollectionMapper.selectAutoConfirm();
+        if (ObjectUtil.isNotEmpty(collections)) {
+            for(FsUserInformationCollection collection :collections) {
+                try {
+                    FsUserInformationCollection map = new FsUserInformationCollection();
+                    map.setUserConfirm2(1);
+                    map.setId(collection.getId());
+                    userInformationCollectionMapper.updateFsUserInformationCollection(map);
+                    Thread.sleep(2000);
+                } catch (Exception e) {
+                    logger.info("自动确认失败，id：{}", collection.getId());
+                    continue;
+                }
+            }
+        }
+    }
+
 
 
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsUserInformationCollectionMapper.java

@@ -85,4 +85,10 @@ public interface FsUserInformationCollectionMapper extends BaseMapper<FsUserInfo
      */
     @Select("SELECT id,package_order_code FROM fs_user_information_collection uic LEFT JOIN fs_package_order po ON uic.package_order_code = po.order_sn  WHERE uic.doctor_confirm_time <= DATE_SUB(NOW(), INTERVAL 24 HOUR) and  uic.package_order_code IS NOT NULL   AND  uic.user_confirm2 = 0 AND po.is_pay = 1")
     List<FsUserInformationCollection> selectAutoRefundOrderCode();
+
+    /**
+     * 查询需要自动确认订单(医生确认超过2小时，未第二次确认的信息采集)
+     */
+    @Select("SELECT * FROM fs_user_information_collection WHERE is_package = 0 AND user_confirm = 1 AND doctor_confirm = 1 AND user_confirm2 = 0 AND doctor_confirm_time <= DATE_SUB(NOW(), INTERVAL 2 HOUR)")
+    List<FsUserInformationCollection> selectAutoConfirm();
 }