Merge branch 'dev/mix20191225_security' into dev/cdtk202001_init

# Conflicts:
#	config-server/src/main/resources/shared/gateway-service-pre.yml

aipt-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -7,9 +7,14 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.DisclaimerInformationServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.vo.DisclaimerInformationVO;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wangfeng
@@ -18,15 +23,23 @@ import java.util.List;
  */
 @Component
 public class DisclaimerInformationFacade extends DisclaimerInformationServiceImpl {
-
+    private static final Map<Integer,List<String>> map;
+    static
+    {
+        map = new HashMap<>();
+        map.put(1, Arrays.asList("1", "2", "3"));
+        map.put(2, Arrays.asList("1", "2", "3"));
+        map.put(3, Arrays.asList("4"));
+    }
     /**
      * @return
      */
-    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+    public List<DisclaimerInformationDTO> getDisclaimerInformation(DisclaimerInformationVO disclaimerInformationVO) {
 
         QueryWrapper<DisclaimerInformation> disclaimerInformation = new QueryWrapper<>();
         disclaimerInformation
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("disclaimer_code", map.get(disclaimerInformationVO.getType()))
                 .eq("STATUS", StatusEnum.Enable.getKey())
                 .orderByAsc("order_no");
         List<DisclaimerInformation> data = list(disclaimerInformation);

aipt-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -40,13 +40,13 @@ public class PatientInfoFacade {
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = tranServiceClient.getTopPatientInfo(getTopPatientInfoVO);
-        RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
+        RespDTOUtil.respNGDealCover(respDTO, respDTO.msg);
 
         GetTopPatientInfoDTO getTopPatientInfoDTO = respDTO.data;
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        if (StringUtil.isNotBlank(getTopPatientInfoDTO.getSelfDeptName())){
+        if (StringUtil.isNotBlank(getTopPatientInfoDTO.getSelfDeptName())) {
             if (cryptConfiguer.cryptFlag) {
                 conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDTO.getSelfDeptName()));
             } else {
@@ -74,7 +74,7 @@ public class PatientInfoFacade {
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        if (StringUtil.isNotBlank(getTopPatientInfoDjDTO.getSelfDeptName())){
+        if (StringUtil.isNotBlank(getTopPatientInfoDjDTO.getSelfDeptName())) {
             if (cryptConfiguer.cryptFlag) {
                 conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDjDTO.getSelfDeptName()));
             } else {

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -60,7 +60,7 @@ public class PushFacade {
 
         try {
             Map<String, Object> invokeParams = new HashMap<>();
-            invokeParams.put("pushDTO", pushDTO);
+            invokeParams.put("pushDTO",pushDTO);
             invokeParams.put("featureTypeSet", featureTypeSet);
             invokeParams.put("data", data);
             invokeParams.put("isConnect", isConnect);

aipt-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/1/2 18:11
+ */
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+    /*产品类型
+    1：ICSS
+    2：页面推送模式
+    3：预问诊
+     */
+    private Integer type;
+}

aipt-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -5,10 +5,12 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisclaimerInformationFacade;
+import com.diagbot.vo.DisclaimerInformationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,8 +34,8 @@ public class DisclaimerInformationController {
     @ApiOperation(value = "知识库标准化-获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
-        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO) {
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationVO);
         return RespDTO.onSuc(data);
     }
 }

data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -13,6 +13,7 @@ import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleIndexDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptIntroduceVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.GetStaticKnowledgeVO;
 import com.diagbot.vo.ScaleIndexVO;
 import com.diagbot.vo.VersionVO;
@@ -43,7 +44,7 @@ public interface AiptServiceClient {
 
 
     @PostMapping("/disclaimerInformation/getDisclaimerInformations")
-    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO);
 
     /**
      * 计算接口-量表/公式

data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -13,6 +13,7 @@ import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleIndexDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptIntroduceVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.GetStaticKnowledgeVO;
 import com.diagbot.vo.ScaleIndexVO;
 import com.diagbot.vo.VersionVO;
@@ -46,7 +47,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
 
 
     @Override
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(DisclaimerInformationVO disclaimerInformationVO) {
         log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
         return null;
     }

data-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -4,6 +4,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.DisclaimerInformationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,7 +25,9 @@ public class DisclaimerInformationFacade {
      * @return
      */
     public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations();
+        DisclaimerInformationVO disclaimerInformationVO = new DisclaimerInformationVO();
+        disclaimerInformationVO.setType(2);
+        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations(disclaimerInformationVO);
         RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
         return res.data;
     }

data-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/1/2 18:11
+ */
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+    /*产品类型
+    1：ICSS
+    2：页面推送模式
+    3：预问诊
+     */
+    private Integer type;
+}

docs/028.20200102智能分诊主页显示可配置/init_med.sql

@@ -0,0 +1,3 @@
+use `med`;
+
+INSERT INTO `med`.`kl_disclaimer_information` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `version_id`, `title`, `description`, `order_no`, `status`, `disclaimer_code`, `remark`) VALUES ('N', '2020-01-07 15:41:48', '2020-01-07 15:41:48', '0', '90', '0', '说明', '尊敬的患者：<br/>\n提前填写症状，可实现快速就诊。症状会马上传达您的预约医生。<br/><br/>\n祝您早日康复！', NULL, '1', '4', NULL);

docs/028.20200102智能分诊主页显示可配置/init_tran.sql

@@ -0,0 +1,5 @@
+use `sys-tran`;
+
+INSERT INTO `sys-tran`.`tran_sys_set` (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `hospital_code`, `plan`, `sys_type`, `name`, `code`, `value`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', NULL, NULL, 'A001', '0', '17', '是否显示主页', 'homepage_show', '1', '是否显示（1是，0否）');
+
+

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -32,6 +32,7 @@ import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.ExistListByConceptIdsVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetLisMappingVO;
@@ -226,7 +227,7 @@ public interface AiptServiceClient {
     RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
 
     @PostMapping("/disclaimerInformation/getDisclaimerInformations")
-    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO);
 
     /**
      * 验证是否存在静态知识

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -32,6 +32,7 @@ import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.ExistListByConceptIdsVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetLisMappingVO;
@@ -281,7 +282,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(DisclaimerInformationVO disclaimerInformationVO) {
         log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
         return null;
     }

icss-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -4,6 +4,7 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.DisclaimerInformationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,7 +25,9 @@ public class DisclaimerInformationFacade {
      * @return
      */
     public List<DisclaimerInformationDTO> getDisclaimerInformation() {
-        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations();
+        DisclaimerInformationVO disclaimerInformationVO = new DisclaimerInformationVO();
+        disclaimerInformationVO.setType(2);
+        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations(disclaimerInformationVO);
         RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
         return res.data;
     }

icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -47,7 +47,7 @@ public class PatientInfoFacade {
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = aiptServiceClient.getTopPatientInfo(getTopPatientInfoVO);
-        RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
+        RespDTOUtil.respNGDealCover(respDTO, respDTO.msg);
         return respDTO.data;
     }
 

icss-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/1/2 18:11
+ */
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+    /*产品类型
+    1：ICSS
+    2：页面推送模式
+    3：预问诊
+     */
+    private Integer type;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -1,142 +1,63 @@
 package com.diagbot.dto;
 
-import com.diagbot.enums.DisclaimerCodeEnum;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 下午4:23:48
  */
 
+@Getter
+@Setter
 public class DisclaimerInformationDTO {
-	private Long id;
-
-	/**
-	 * 记录创建时间
-	 */
-	private Date gmtCreate;
-
-	/**
-	 * 创建人，0表示无创建人值
-	 */
-	private String modifier;
-
-	/**
-	 * 主表id
-	 */
-	// private Long versionId;
-
-	/**
-	 * 标题
-	 */
-	private String title;
-
-	/**
-	 * 描述
-	 */
-	private String description;
-
-	/**
-	 * 排序号
-	 */
-	private String orderNo;
-
-	/**
-	 * 1：启动，0：不启用
-	 */
-	private String status;
-
-	/**
-	 * 免责申明位置
-	 */
-	private String disclaimerCode;
-
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Date getGmtCreate() {
-		return gmtCreate;
-	}
-
-	public void setGmtCreate(Date gmtCreate) {
-		this.gmtCreate = gmtCreate;
-	}
-
-	public String getModifier() {
-		return modifier;
-	}
-
-	public void setModifier(String modifier) {
-		this.modifier = modifier;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getDisclaimerCode() {
-		if (disclaimerCode.equals("1")) {
-			return DisclaimerCodeEnum.getName(1);
-		} else if (disclaimerCode.equals("2")) {
-			return DisclaimerCodeEnum.getName(2);
-		} else if (disclaimerCode.equals("3")) {
-			return DisclaimerCodeEnum.getName(3);
-		} else {
-			return disclaimerCode;
-		}
-	}
-
-	public void setDisclaimerCode(String disclaimerCode) {
-		this.disclaimerCode = disclaimerCode;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String modifier;
+
+    /**
+     * 主表id
+     */
+    // private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明位置
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

knowledgeman-service/src/main/java/com/diagbot/enums/DisclaimerCodeEnum.java

@@ -7,7 +7,8 @@ public enum DisclaimerCodeEnum implements KeyedNamed {
 
     DiagnoseDisclaimer(1, "诊断免责信息"),
     PushLiability(2, "推送免责信息"),
-    Disclaimer(3, "免责声明");
+    Disclaimer(3, "免责声明"),
+    PrecTips(4, "预问诊通告");
 
     @Setter
     private int key;

knowledgeman-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.enums.DisclaimerCodeEnum;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -74,6 +76,7 @@ public class DisclaimerInformationFacade extends DisclaimerInformationServiceImp
             DisclaimerInformationDTO dis = new DisclaimerInformationDTO();
             BeanUtil.copyProperties(disclaimerInformationDTO, dis);
             dis.setModifier(userNames.get(disclaimerInformationDTO.getModifier()));
+            dis.setDisclaimerCode(DisclaimerCodeEnum.getName(Integer.valueOf(dis.getDisclaimerCode())));
 
             dataNew.add(dis);
         }

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -35,7 +35,8 @@ public class EnumsDataServiceImpl implements EnumsDataService {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("disclaimerCodeAllEnum", DisclaimerCodeEnum.values())
                 .addEnums("disclaimerCodeEnum",
-                        DisclaimerCodeEnum.PushLiability, DisclaimerCodeEnum.Disclaimer)
+                        DisclaimerCodeEnum.PushLiability, DisclaimerCodeEnum.Disclaimer,
+                        DisclaimerCodeEnum.PrecTips)
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
                 .addEnums("lexiconRSTypeEnum",
                         LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)

pom.xml

@@ -55,7 +55,7 @@
         <druid.version>1.1.21</druid.version>
         <swagger.version>2.9.2</swagger.version>
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
-        <logstash.version>6.2</logstash.version>
+        <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
         <aggregator.version>1.1.0</aggregator.version>
         <okhttp.version>4.2.2</okhttp.version>

prec-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -4,12 +4,14 @@ import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.VersionVO;
@@ -79,4 +81,7 @@ public interface AiptServiceClient {
      */
     @PostMapping("/versionInfo/getVersionInfoAlls")
     RespDTO<VersionWrapperDTO> getVersionInfoAlls(@RequestBody VersionVO versionVO);
+
+    @PostMapping("/disclaimerInformation/getDisclaimerInformations")
+    RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationVO disclaimerInformationVO);
 }

prec-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -4,12 +4,14 @@ import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
 import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
+import com.diagbot.vo.DisclaimerInformationVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.VersionVO;
@@ -73,4 +75,10 @@ public class AiptServiceHystrix implements AiptServiceClient {
         log.error("【hystrix】调用{}异常", "getVersionInfoAlls");
         return null;
     }
+
+    @Override
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(DisclaimerInformationVO disclaimerInformationVO) {
+        log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
+        return null;
+    }
 }

prec-service/src/main/java/com/diagbot/dto/DisclaimerInformationDTO.java

@@ -0,0 +1,64 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+    private Long id;
+
+    //    /**
+    //     * 记录创建时间
+    //     */
+    //    private Date gmtCreate;
+    //
+    //
+    //
+    //    /**
+    //     * 创建人，0表示无创建人值
+    //     */
+    //    private String creator;
+    //
+    //    /**
+    //     * 主表id
+    //     */
+    //    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    //    /**
+    //     * 1：启动，0：不启用
+    //     */
+    //    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    //    /**
+    //     * 备注
+    //     */
+    //    private String remark;
+
+}

prec-service/src/main/java/com/diagbot/facade/DisclaimerInformationFacade.java

@@ -0,0 +1,35 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.AiptServiceClient;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.DisclaimerInformationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月27日 下午3:36:14
+ */
+@Component
+public class DisclaimerInformationFacade {
+
+    @Autowired
+    private AiptServiceClient aiptServiceClient;
+
+    /**
+     * @return
+     */
+    public List<DisclaimerInformationDTO> getDisclaimerInformation() {
+        DisclaimerInformationVO disclaimerInformationVO = new DisclaimerInformationVO();
+        disclaimerInformationVO.setType(3);
+        RespDTO<List<DisclaimerInformationDTO>> res = aiptServiceClient.getDisclaimerInformations(disclaimerInformationVO);
+        RespDTOUtil.respNGDealCover(res, "获取免责声明失败");
+        return res.data;
+    }
+
+}

prec-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/1/2 18:11
+ */
+@Getter
+@Setter
+public class DisclaimerInformationVO {
+    /*产品类型
+    1：ICSS
+    2：页面推送模式
+    3：预问诊
+     */
+    private Integer type;
+}

prec-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DisclaimerInformationFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * @author wangfeng
+ * @Description: 智能预问诊提示 前端控制器
+ * @date 2018年11月27日 下午3:35:57
+ */
+@RestController
+@RequestMapping("/disclaimerInformation")
+@Api(value = "智能预问诊-提示文案API[by:wangfeng]", tags = { "智能预问诊-提示文案API" })
+@SuppressWarnings("unchecked")
+public class DisclaimerInformationController {
+
+    @Autowired
+    DisclaimerInformationFacade disclaimerInformationFacade;
+
+    @ApiOperation(value = "提示文案详情[by:wangfeng]", notes = "提示文案详情")
+    @PostMapping("/getDisclaimerInformations")
+    @SysLogger("getDisclaimerInformations")
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
+        List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
+        return RespDTO.onSuc(data);
+    }
+}

tran-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -3,8 +3,11 @@ package com.diagbot.facade;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import org.springframework.stereotype.Component;
@@ -42,6 +45,18 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         GetTopPatientInfoDTO getTopPatientInfoDTO = baseMapper.getTopPatientInfo(getTopPatientInfoVO);
+        if (getTopPatientInfoDTO == null) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取医院信息失败");
+        }
+        if (StringUtil.isBlank(getTopPatientInfoDTO.getHospitalDeptCode())) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取科室信息失败");
+        }
+        if (StringUtil.isBlank(getTopPatientInfoDTO.getDoctorCode())) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取医生信息失败");
+        }
+        if (StringUtil.isBlank(getTopPatientInfoDTO.getPatientCode())) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取患者信息失败");
+        }
         getTopPatientInfoDTO.setSystemTime(DateUtil.now());
         getTopPatientInfoDTO.setRecordId(getTopPatientInfoVO.getRecordId());
         getTopPatientInfoDTO.setPatientAge(DateUtil.yearCompare(getTopPatientInfoDTO.getBirthday(), DateUtil.now()));