1.入参调整，增加医院编码及名称，用于基层医院对接区分时使用

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

@@ -43,19 +43,26 @@ public class DataPageDockFacade {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO<String> getStaticKnowledge(StaticKnowledgeHISVO staticKnowledgeHISVO){
-        String url=dataPageUrl+"/informationOut.html?hospitalId="+staticKnowledgeHISVO.getHospitalId()
-                +"&type="+staticKnowledgeHISVO.getType()
-                +"&hisName="+staticKnowledgeHISVO.getHisName();
-        if(StringUtil.isNotEmpty(staticKnowledgeHISVO.getHisDetailName())){
-            url+="&hisDetailName="+staticKnowledgeHISVO.getHisDetailName();
+    public RespDTO<String> getStaticKnowledge(HisStaticKnowledgeVO hisStaticKnowledgeVO){
+        if(StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalCode()) && StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHospitalName())){
+            //查找基层医院术语，等新表构建后编写业务
+            hisStaticKnowledgeVO.setHospitalId(null);
+        }else if(hisStaticKnowledgeVO.getHospitalId()==null){
+             return RespDTO.onError("请输入医院id");
+        }
+
+        String url=dataPageUrl+"/informationOut.html?hospitalId="+hisStaticKnowledgeVO.getHospitalId()
+                +"&type="+hisStaticKnowledgeVO.getType()
+                +"&hisName="+hisStaticKnowledgeVO.getHisName();
+        if(StringUtil.isNotEmpty(hisStaticKnowledgeVO.getHisDetailName())){
+            url+="&hisDetailName="+hisStaticKnowledgeVO.getHisDetailName();
         }
         try{
             TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
-            tranDatadockingLog.setHospitalId(staticKnowledgeHISVO.getHospitalId());
-            tranDatadockingLog.setParamIn(JSON.toJSONString(staticKnowledgeHISVO));
+            tranDatadockingLog.setHospitalId(hisStaticKnowledgeVO.getHospitalId());
+            tranDatadockingLog.setParamIn(JSON.toJSONString(hisStaticKnowledgeVO));
             tranDatadockingLog.setParamOut(url);
-            tranDatadockingLog.setRemark("页面推送模式，静态知识:"+staticKnowledgeHISVO.getType());
+            tranDatadockingLog.setRemark("页面推送模式，静态知识:"+hisStaticKnowledgeVO.getType());
 
             tranDatadockingLog.setTransTime(new Date());
 
@@ -73,7 +80,10 @@ public class DataPageDockFacade {
      **/
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
-        if(dataPageDockVO.getHospitalId()==null){
+        if(StringUtil.isNotEmpty(dataPageDockVO.getHospitalCode()) && StringUtil.isNotEmpty(dataPageDockVO.getHospitalName())){
+            //查找基层医院术语，等新表构建后编写业务
+            dataPageDockVO.setHospitalId(null);
+        }if(dataPageDockVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院id");
         }else if("".equals(dataPageDockVO.getShowType())){
             return RespDTO.onError("请输入展示类型,横版：ver，或竖版hor");

src/main/java/com/diagbot/vo/DataEngineVO.java

@@ -29,4 +29,13 @@ public class DataEngineVO extends SearchData{
      */
     @ApiModelProperty(hidden = true)
     private Integer getStaticKnowledge = 0;
+
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
 }

src/main/java/com/diagbot/vo/DataPageDockVO.java

@@ -20,6 +20,12 @@ public class DataPageDockVO extends SearchData{
     @NotNull(message = "请输入方案编码")
     private String planCode;//方案编码，用于控制哪些展示项
 
-    //@NotNull(message = "请输入医院编码")
-    //private Long hospitalId;//医院编码
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
 }

src/main/java/com/diagbot/vo/HisStaticKnowledgeVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class HisStaticKnowledgeVO extends StaticKnowledgeHISVO{
+    /**
+     * 医院编码
+     */
+    private String hospitalCode;
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
+}