Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master_feat_ysy_20250929' into master_feat_ysy_20250929

cgp před 1 týdnem
rodič
revize
253e2d7d39

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

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