日志机制调整

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

@@ -71,15 +71,9 @@ public class DataPageDockFacade {
              return RespDTO.onError("请输入医院id");
         }
         //初始日志记录信息
-        if (StringUtil.isNotBlank(hisStaticKnowledgeVO.getHospitalCode())) {
-            CdssLogUtil.addBizSubHospitalCode(hisStaticKnowledgeVO.getHospitalCode());
-        }
-        if (StringUtil.isNotBlank(hisStaticKnowledgeVO.getHospitalName())) {
-            CdssLogUtil.addBizSubHospitalName(hisStaticKnowledgeVO.getHospitalName());
-        }
-        if (hisStaticKnowledgeVO.getHospitalId()!=null) {
-            CdssLogUtil.addBizHospitalId(hisStaticKnowledgeVO.getHospitalId());
-        }
+        hisStaticKnowledgeVO.setSubHospitalCode(hisStaticKnowledgeVO.getHospitalCode());
+        hisStaticKnowledgeVO.setSubHospitalName(hisStaticKnowledgeVO.getHospitalName());
+        //hisStaticKnowledgeVO.setSceneName();
         //判断是否有静态知识
         StaticKnowledgeHISVO staticKnowledgeHISVO=new StaticKnowledgeHISVO();
         BeanUtils.copyProperties(hisStaticKnowledgeVO,staticKnowledgeHISVO);
@@ -120,18 +114,9 @@ public class DataPageDockFacade {
             return RespDTO.onError("请输入方案编码");
         }
         //初始日志记录信息
-        if (StringUtil.isNotBlank(dataPageDockVO.getHospitalCode())) {
-            CdssLogUtil.addBizSubHospitalCode(dataPageDockVO.getHospitalCode());
-        }
-        if (StringUtil.isNotBlank(dataPageDockVO.getHospitalName())) {
-            CdssLogUtil.addBizSubHospitalName(dataPageDockVO.getHospitalName());
-        }
-        if (dataPageDockVO.getHospitalId()!=null) {
-            CdssLogUtil.addBizHospitalId(dataPageDockVO.getHospitalId());
-        }
-        if (dataPageDockVO.getPlanCode()!=null) {
-            CdssLogUtil.addBizSceneName(dataPageDockVO.getPlanCode());
-        }
+        dataPageDockVO.setSubHospitalCode(dataPageDockVO.getHospitalCode());
+        dataPageDockVO.setSubHospitalName(dataPageDockVO.getHospitalName());
+        dataPageDockVO.setSceneName(dataPageDockVO.getPlanCode());
 
         String url="";
         String pushMrId="";

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

@@ -21,7 +21,6 @@ public class CdssLogBaseVO {
     /**
      * 医院id
      */
-    @NotNull(message = "请输入医院id")
     private Long hospitalId;
 
     /**

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

@@ -21,7 +21,7 @@ import java.util.Map;
  **/
 @Getter
 @Setter
-public class DataPageDockVO {
+public class DataPageDockVO extends CdssLogBaseVO{
     @NotNull(message = "请输入展示类型,横版：ver，或竖版hor")
     private String showType;//横版：ver，或竖版hor
 

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

@@ -3,9 +3,12 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 @Getter
 @Setter
-public class HisStaticKnowledgeVO extends StaticKnowledgeHISVO{
+public class HisStaticKnowledgeVO extends CdssLogBaseVO{
     /**
      * 医院编码
      */
@@ -14,4 +17,28 @@ public class HisStaticKnowledgeVO extends StaticKnowledgeHISVO{
      * 医院名称
      */
     private String hospitalName;
+
+    /**
+     * his名称
+     */
+    private String hisName;
+    /**
+     * his明细名称
+     */
+    private String hisDetailName;
+
+    /**
+     * 标准术语名称
+     */
+    private String name;
+    /**
+     * 术语类型
+     */
+    @NotNull(message = "请输入术语类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作")
+    private Integer type;
+    /**
+     * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
+     */
+    private List<Integer> contentTypes;
+
 }