区分处方订单消息 和 信息采集消息

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

@@ -920,7 +920,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         order.setStoreId(fsPackage.getStoreId());
         FsUserInformationCollection collection = userInformationCollectionMapper.selectByOrderCode(packageOrder.getOrderSn());
         logger.info("用户采集信息{}：=================>",collection);
-        if (collection != null) {
+        if (collection != null && collection.getIsPackage() == 1 ) {
             //是否确认（用户信息采集 为0的不推送到ERP）1推送
             order.setIsConfirm(0);
             //存入用户信息采集信息 用于第一次医生确认处方修改医生确认状态

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

@@ -640,7 +640,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         //用户信息采集表id
         Long collectionId = collection.getId();
         FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collectionId);
-        if (collection.getStatus() == 1) {
+        if (collection.getStatus() == 1 && collection.getIsPackage() == 0) {
             //用户第一次确认添加医生消息
             DoctorMsg msg = new DoctorMsg();
             String name = collection.getUserName() != null ? collection.getUserName() : "-";
@@ -947,7 +947,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             // "用户采集进度"中止操作人员
             fsUserInformationCollectionSchedule.setTerminatedBy(operateId);
             scheduleMapper.updateFsUserInformationCollectionSchedule(fsUserInformationCollectionSchedule);
-            
+
             return R.ok();
         }
         return R.error("终止失败");