Explorar o código

push5.0 PushMode不判断

kongwz %!s(int64=4) %!d(string=hai) anos
pai
achega
26565f136c
Modificáronse 1 ficheiros con 6 adicións e 18 borrados
  1. 6 18
      src/main/java/com/diagbot/facade/PushFacade.java

+ 6 - 18
src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,23 +1,14 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.PushNewServiceClient;
-import com.diagbot.dto.PushBaseDTO;
-import com.diagbot.dto.PushDTO;
-import com.diagbot.dto.PushNewDTO;
-import com.diagbot.dto.PushPlanDTO;
-import com.diagbot.dto.WordCrfDTO;
+import com.diagbot.dto.*;
 import com.diagbot.enums.DiagnoseTypeEnum;
-import com.diagbot.enums.DiseasePushTypeEnum;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.model.entity.Diag;
 import com.diagbot.process.PushProcess;
-import com.diagbot.util.CoreUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.ParamUtil;
-import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.*;
 import com.diagbot.vo.PushNewVO;
 import com.diagbot.vo.PushPlanVO;
 import com.diagbot.vo.PushVO;
@@ -28,11 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 推送facade
@@ -88,7 +75,8 @@ public class PushFacade {
             pushVo.setAgeNum(CoreUtil.convertAge(pushVo.getAge()));
         }
         PushDTO pushDTO = new PushDTO();
-        Integer pushMode = tranHospitalInfoFacade.getPushMode(pushVo.getHospitalId());
+        pushDTO = this.pushFacIcss(pushVo);
+        /*Integer pushMode = tranHospitalInfoFacade.getPushMode(pushVo.getHospitalId());
         //全科推送,走5.0
         if (pushMode.equals(DiseasePushTypeEnum.gp.getKey())) {
             pushDTO = this.pushFacIcss(pushVo);
@@ -97,7 +85,7 @@ public class PushFacade {
             //pushDTO = this.pushFac(pushVo);
             // 2021/2/22 同老楼确认专科也走5.0
             pushDTO = this.pushFacIcss(pushVo);
-        }
+        }*/
 
         return pushDTO;
     }