优化医生确认处方涉及的用户采集信息进度逻辑

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

@@ -1336,20 +1336,6 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             collectionMapper.updateFsUserInformationCollection(map);
             //确认完成后删除缓存
             redisCache.deleteObject("collectionPrescribeId:" + fsPrescribe.getPrescribeId());
-            //同步用户信息采集进度
-            FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collection.getId());
-            if (schedule != null){
-                //"待药师审核“节点
-                schedule.setCurrentStep(PrescriptionTaskStepEnum.WAITING_PHARMACIST_REVIEW.getCode());
-                //根据处方id查询处方订单号
-                FsStoreOrder fsStoreOrder=storeOrderMapper.selectByPrescriptionId(fsPrescribe.getPrescribeId());
-                if (fsStoreOrder != null){
-                    schedule.setOrderCode(fsStoreOrder.getOrderCode());
-                    scheduleMapper.updateFsUserInformationCollectionSchedule(schedule);
-                    log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_PHARMACIST_REVIEW.getDesc(),schedule.getCollectionId());
-                }
-
-            }
         }
         //医生确认后生成处方单
         PrescriptionTaskRecord record = new PrescriptionTaskRecord();
@@ -1369,6 +1355,25 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         msg.setContent("处方编号："+fsPrescribe.getPrescribeCode()+"待审核");
         msg.setCreateTime(DateUtils.getNowDate());
         doctorMsgMapper.insertDoctorMsg(msg);
+
+        //根据处方id查询订单号，然后根据订单号查询用户采集信息
+        FsStoreOrder fsStoreOrder=storeOrderMapper.selectByPrescriptionId(fsPrescribe.getPrescribeId());
+        if(fsStoreOrder != null){
+            FsUserInformationCollection collectionResult = collectionMapper.selectByOrderCode(fsStoreOrder.getOrderCode());
+            if (collectionResult != null){
+                //同步用户信息采集进度
+                FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collectionResult.getId());
+                if (schedule != null){
+                    //"待药师审核“节点
+                    schedule.setCurrentStep(PrescriptionTaskStepEnum.WAITING_PHARMACIST_REVIEW.getCode());
+                    //写入处方订单号
+                    schedule.setOrderCode(fsStoreOrder.getOrderCode());
+                    scheduleMapper.updateFsUserInformationCollectionSchedule(schedule);
+                    log.info("同步用户信息采集进度节点为:{},信息采集表id:{}",PrescriptionTaskStepEnum.WAITING_PHARMACIST_REVIEW.getDesc(),schedule.getCollectionId());
+                }
+            }
+        }
+
     }
 
     @Override

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderVO.java

@@ -258,4 +258,6 @@ public class FsStoreOrderVO implements Serializable {
 
     private String qwSubject;
     private String source;
+
+    private Integer erpType;//1:聚水潭、2:兔灵
 }