优化信息采集表进度展示逻辑

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

@@ -14,6 +14,7 @@ import com.fs.common.exception.CustomException;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.*;
 import com.fs.common.utils.ip.IpUtils;
+import com.fs.company.cache.ICompanyUserCacheService;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyDept;
 import com.fs.company.domain.CompanyMoneyLogs;
@@ -316,6 +317,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     private IFsOrderSopLogService fsOrderSopLogService;
 
+    @Autowired
+    private ICompanyUserCacheService companyUserCacheService;
+
     //ERP 类型到服务的映射
     private Map<Integer, IErpOrderService> erpServiceMap;
     @PostConstruct
@@ -935,7 +939,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             String name = collection.getUserName() != null ? collection.getUserName() : "-";
             msg.setTitle("用户信息采集开方");
             msg.setType(1);
-            msg.setContent("患者:" + name + "的信息采集，前往开方");
+            String companyUserName = companyUserCacheService.selectCompanyUserNameUserById(collection.getCompanyUserId());
+            msg.setContent("患者:" + name + "的信息采集，前往开方，来源客服："+companyUserName);
             msg.setDoctorId(collection.getDoctorId());
             msg.setCreateTime(DateUtils.getNowDate());
             doctorMsgMapper.insertDoctorMsg(msg);

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

@@ -22,6 +22,7 @@ import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.utils.StringUtils;
+import com.fs.company.cache.ICompanyUserCacheService;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.company.service.ICompanyService;
@@ -176,6 +177,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     @Autowired
     private FsUserInformationCollectionScheduleMapper scheduleMapper;
+
+    @Autowired
+    private ICompanyUserCacheService companyUserCacheService;
     /**
      * 查询用户信息采集
      *
@@ -660,7 +664,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 //没套餐包的添加医生信息采集建议消息
                 msg.setTitle("用户采集信息建议");
                 msg.setType(3);
-                msg.setContent("患者:" + name + "的信息采集，前往建议");
+                String companyUserName = companyUserCacheService.selectCompanyUserNameUserById(collection.getCompanyUserId());
+                msg.setContent("患者:" + name + "的信息采集，前往建议，来源客服："+companyUserName);
                 msg.setDoctorId(collection.getDoctorId());
                 msg.setCreateTime(DateUtils.getNowDate());
                 //插入医生消息
@@ -670,7 +675,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             map.setStatus(2);
             //设置用户信息采集进度节点
             if (schedule != null) {
-                if (schedule.getPackageId() != null&&collection.getIsPackage() == 1) {
+                log.info("同步用户id:{}信息采集进度:{}",param.getUserId(),schedule);
+                log.info("当前采集表isPackage数值:{}",collection.getIsPackage());
+                if (collection.getIsPackage() == 1) {
                     //带套餐包的 "待开方"节点
                     schedule.setCurrentStep(PrescriptionTaskStepEnum.WAITING_PRESCRIBE.getCode());
                     log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_PRESCRIBE.getDesc(),schedule.getCollectionId());