1.增加子医院相关业务逻辑代码

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -133,6 +133,10 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/cache/clearRuleAll").permitAll()
                 .antMatchers("/term/termMatching").permitAll()
                 .antMatchers("/sys/mr/testIndication").permitAll()
+                .antMatchers("/dataPage/docking/getDataService").permitAll()
+                .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
+                .antMatchers("/dataPage/docking/getDataEngine").permitAll()
+                .antMatchers("/dataPage/docking/addUserAndRole").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -175,6 +175,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/cache/clearRuleAll", request)
                 || matchers("/term/termMatching", request)
                 || matchers("/sys/mr/testIndication", request)
+                || matchers("/dataPage/docking/getDataService", request)
+                || matchers("/dataPage/docking/getStaticKnowledge", request)
+                || matchers("/dataPage/docking/getDataEngine", request)
+                || matchers("/dataPage/docking/addUserAndRole", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -1,11 +1,16 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushPlanDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.SysUser;
 import com.diagbot.entity.TranDatadockingLog;
+import com.diagbot.entity.TranHospitalRelation;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
@@ -35,6 +40,9 @@ public class DataPageDockFacade {
     @Autowired
     private DataDockingLogFacade dataDockingLogFacade;
 
+    @Autowired
+    private TranHospitalRelationFacade tranHospitalRelationFacade;
+
     @Value("${data-page.url}")
     private String dataPageUrl;
 
@@ -45,8 +53,13 @@ public class DataPageDockFacade {
      **/
     public RespDTO<String> getStaticKnowledge(HisStaticKnowledgeVO hisStaticKnowledgeVO){
         if(StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalCode()) && StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalName())){
-            //查找基层医院术语，等新表构建后编写业务
-            hisStaticKnowledgeVO.setHospitalId(null);
+            //查找基层医院
+            Long hospitalId=getHospitalRelation(hisStaticKnowledgeVO.getHospitalCode(),hisStaticKnowledgeVO.getHospitalName());
+            if(hospitalId!=null){
+                hisStaticKnowledgeVO.setHospitalId(hospitalId);
+            }else{
+                return RespDTO.onError("子医院信息异常");
+            }
         }else if(hisStaticKnowledgeVO.getHospitalId()==null){
              return RespDTO.onError("请输入医院id");
         }
@@ -81,8 +94,13 @@ public class DataPageDockFacade {
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
         if(StringUtil.isNotEmpty(dataPageDockVO.getHospitalCode()) && StringUtil.isNotEmpty(dataPageDockVO.getHospitalName())){
-            //查找基层医院术语，等新表构建后编写业务
-            dataPageDockVO.setHospitalId(null);
+            //查找基层医院
+            Long hospitalId=getHospitalRelation(dataPageDockVO.getHospitalCode(),dataPageDockVO.getHospitalName());
+            if(hospitalId!=null){
+                dataPageDockVO.setHospitalId(hospitalId);
+            }else{
+                return RespDTO.onError("子医院信息异常");
+            }
         }if(dataPageDockVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院id");
         }else if("".equals(dataPageDockVO.getShowType())){
@@ -232,4 +250,23 @@ public class DataPageDockFacade {
         return pushPlanDTO;
     }
 
+    private Long getHospitalRelation(String hospitalCode,String hospitalName){
+        Long hospitalId=null;
+        try{
+            TranHospitalRelation tranHospitalRelation=new TranHospitalRelation();
+            QueryWrapper<TranHospitalRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("code", hospitalCode)
+                    .eq("name", hospitalName)
+                    .eq("is_deleted", IsDeleteEnum.N.getKey());
+            tranHospitalRelation=tranHospitalRelationFacade.getOne(queryWrapper);
+            if(tranHospitalRelation!=null){
+                hospitalId=tranHospitalRelation.getHospitalId();
+            }
+        }catch (Exception e){
+            log.error("子医院信息获取异常======",e.getMessage());
+            e.printStackTrace();
+        }
+        return hospitalId;
+    }
+
 }