修改信息采集重置接口

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -920,15 +920,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
     @Override
     public R createOrderByPackageOrder(FsPackageOrder packageOrder,HuifuOrderConfirmResult result) {
-        logger.info("111111111111111");
-
-        logger.info("2222222222222");
         FsPackage fsPackage = fsPackageMapper.selectFsPackageByPackageId(packageOrder.getPackageId());
         JSONArray objects = JSONUtil.parseArray(fsPackage.getProductJson());
         List<FsPackagePruductDTO> products = JSONUtil.toList(objects, FsPackagePruductDTO.class);
-        logger.info("3333333333333333333");
         Map<String, Object> packageJson = (Map) JSON.parse(packageOrder.getPackageJson());
-        logger.info("55555555555555555555");
         Integer packageSubType = (Integer) packageJson.get("packageSubType");
         Integer productType = (Integer) packageJson.get("productType");
         FsStoreOrder order = new FsStoreOrder();

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

@@ -311,7 +311,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     }
 
 
-    //简化版信息采集创建时没有用户id
+    //创建简化版采集信息(没有用户id)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createSimpleUserInfo(FsUserInformationCollectionParam param) {
@@ -716,7 +716,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             }
         }
 
-
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(param.getId());
         map.setUserConfirm(1);
@@ -732,6 +731,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         if (schedule != null&&(schedule.getStatus() == 2||schedule.getStatus() == 3) && collection.getAmount().compareTo(new BigDecimal(0))==1) {
             return R.error("用户采集信息已更新，请扫描最新二维码确认");
         }
+        Date currentTime=DateUtils.getNowDate();
         if (collection.getStatus() == 1) {
             if (collection.getIsPackage() == 0) {
                 //用户第一次确认添加医生消息
@@ -743,7 +743,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 String companyUserName = companyUserCacheService.selectCompanyUserNameUserById(collection.getCompanyUserId());
                 msg.setContent("患者:" + name + "的信息采集，前往建议，来源客服："+companyUserName);
                 msg.setDoctorId(collection.getDoctorId());
-                msg.setCreateTime(DateUtils.getNowDate());
+                msg.setCreateTime(currentTime);
                 //插入医生消息
                 doctorMsgMapper.insertDoctorMsg(msg);
             }
@@ -751,8 +751,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             map.setStatus(2);
             //设置用户信息采集进度节点
             if (schedule != null) {
-                log.info("同步用户id:{}信息采集进度:{}",param.getUserId(),schedule);
-                log.info("当前采集表isPackage数值:{}",collection.getIsPackage());
                 if (collection.getIsPackage() == 1 ) {
                     if(collection.getAmount().compareTo(new BigDecimal(0))==1 || collection.getPayType() == 1){
                         //带套餐包的 "待支付"节点
@@ -771,7 +769,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             if (collection.getUserConfirm2() == 0 && collection.getIsPackage() == 1) {
                 FsStoreOrder fsStoreOrder = storeOrderService.selectFsStoreOrderByOrderCode(collection.getPackageOrderCode());
                 if (fsStoreOrder != null) {
-                    FsStoreOrder editOrder   = new FsStoreOrder();
+                    FsStoreOrder editOrder = new FsStoreOrder();
                     editOrder.setOrderId(fsStoreOrder.getOrderId());
                     editOrder.setIsConfirm(1);
                     storeOrderService.updateFsStoreOrder(editOrder);
@@ -785,7 +783,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 schedule.setCurrentStep(PrescriptionTaskStepEnum.WAITING_COMPLETED.getCode());
                 //"完成"任务状态
                 schedule.setStatus(CollectionTaskStatusEnum.COMPLETED.getCode());
-                schedule.setCompletedTime(DateUtils.getNowDate());
+                schedule.setCompletedTime(currentTime);
                 log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_COMPLETED.getDesc(),schedule.getCollectionId());
             }
         }
@@ -794,7 +792,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             FsDoctorConfirm doctorConfirm = new FsDoctorConfirm();
             doctorConfirm.setCollectionId(collection.getId());
             doctorConfirm.setDoctorId(collection.getDoctorId());
-            doctorConfirm.setStartTime(DateUtils.getNowDate());
+            doctorConfirm.setStartTime(currentTime);
             doctorConfirmService.insertFsDoctorConfirm(doctorConfirm);
             //医生确认时间存入缓存 医生确认后删除
             redisCache.setCacheObject("doctorConfirm:" + collection.getId(), doctorConfirm);
@@ -818,10 +816,11 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //更新采集信息状态
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(collection.getId());
+        map.setUserConfirm(0);
         map.setUserConfirm2(0);
         map.setStatus(1);
-        map.setUserConfirm(0);
         map.setDoctorConfirm(0);
+        map.setFillFlag(0);//填写标识 0:未填写
         //更新用户信息采集状态
         fsUserInformationCollectionMapper.updateFsUserInformationCollection(map);
 
@@ -1071,8 +1070,10 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(param.getCollectionId());
         map.setUserConfirm(0);
+        map.setUserConfirm2(0);
         map.setDoctorConfirm(0);
         map.setStatus(1);
+        map.setFillFlag(0);//重置为未填写
         if(fsUserInformationCollectionMapper.updateFsUserInformationCollection(map) > 0) {
             //根据采集表id查询信息采集进度信息
             FsUserInformationCollectionSchedule schedule;
@@ -1088,7 +1089,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             schedule.setStatus(CollectionTaskStatusEnum.TERMINATED.getCode());
             // "用户采集进度"取消原因
             schedule.setRemark(param.getRemark());
-            // "用户采集进度"中止操作人员
+            // "用户采集进度"取消操作人员
             schedule.setTerminatedBy(operateId);
             int result = scheduleMapper.updateFsUserInformationCollectionSchedule(schedule);
             if (StringUtils.isNotBlank(param.getOrderCode())){