icss页面顶部信息接口修改

aipt-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -127,6 +127,12 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value = "患者身份证号")
 	private String patientIdentityNum;
 
+	/**
+	 * 患者联系电话
+	 */
+	@ApiModelProperty(value = "患者联系电话")
+	private String patientPhone;
+
 	/**
 	 * 系统时间
 	 */

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

@@ -6,7 +6,25 @@ import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
-import com.diagbot.dto.*;
+import com.diagbot.dto.ConceptBaseDTO;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.ConceptRetrievalDTO;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.DictionaryInfoDTO;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.EvaluationDTO;
+import com.diagbot.dto.FeatureConceptDTO;
+import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.ScaleIndexDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -18,7 +36,6 @@ import com.diagbot.vo.ExistListByConceptIdsVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetLisMappingVO;
 import com.diagbot.vo.GetStaticKnowledgeVO;
-import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
 import com.diagbot.vo.IndexDataFindVO;
@@ -120,15 +137,6 @@ public interface AiptServiceClient {
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
 
-    /**
-     * 对接-获取页面顶部病人医生科室信息
-     *
-     * @param getTopPatientInfoDjVO
-     * @return
-     */
-    @PostMapping("/patientInfo/getTopPatientInfoDj")
-    RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfoDj(@RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO);
-
     /**
      * 获取管理评估模板
      *

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

@@ -6,7 +6,25 @@ import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
-import com.diagbot.dto.*;
+import com.diagbot.dto.ConceptBaseDTO;
+import com.diagbot.dto.ConceptIntroduceDTO;
+import com.diagbot.dto.ConceptRetrievalDTO;
+import com.diagbot.dto.DeptInfoDTO;
+import com.diagbot.dto.DictionaryInfoDTO;
+import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.dto.DiseaseIcdDTO;
+import com.diagbot.dto.EvaluationDTO;
+import com.diagbot.dto.FeatureConceptDTO;
+import com.diagbot.dto.GetTopPatientInfoDTO;
+import com.diagbot.dto.IndexConfigAndDataDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.ScaleIndexDTO;
+import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -18,7 +36,6 @@ import com.diagbot.vo.ExistListByConceptIdsVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetLisMappingVO;
 import com.diagbot.vo.GetStaticKnowledgeVO;
-import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
 import com.diagbot.vo.IndexDataFindVO;
@@ -154,12 +171,6 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
 
-    @Override
-    public RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfoDj(GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
-        log.error("【hystrix】调用{}异常", "getTopPatientInfoDj");
-        return null;
-    }
-
     @Override
     public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid SearchVO searchVO) {
         log.error("【hystrix】调用{}异常", "getEvaluationModules");

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -127,6 +127,12 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value = "患者身份证号")
 	private String patientIdentityNum;
 
+	/**
+	 * 患者联系电话
+	 */
+	@ApiModelProperty(value = "患者联系电话")
+	private String patientPhone;
+
 	/**
 	 * 系统时间
 	 */

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDjDTO.java

@@ -1,167 +0,0 @@
-package com.diagbot.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @author rgb
- * @Description
- * @time 2018年11月19日下午4:57:43
- */
-@ApiModel(value = "页面顶部病人医生科室信息查询接口出参")
-@Getter
-@Setter
-public class GetTopPatientInfoDjDTO {
-
-    /**
-     * 医院id
-     */
-    @ApiModelProperty(value = "医院id")
-    private Long hospitalId;
-
-    /**
-     * 医院编码
-     */
-    @ApiModelProperty(value = "医院编码")
-    private String hospitalCode;
-
-    /**
-     * 医院名称
-     */
-    @ApiModelProperty(value = "医院名称")
-    private String hospitalName;
-
-    /**
-     * 子医院id
-     */
-    @ApiModelProperty(value = "子医院id")
-    private Long sonHospitalId;
-
-    /**
-     * 子医院编码
-     */
-    @ApiModelProperty(value = "子医院编码")
-    private String sonHospitalCode;
-
-    /**
-     * 子医院名称
-     */
-    @ApiModelProperty(value = "子医院名称")
-    private String sonHospitalName;
-
-    /**
-     * 医院科室id
-     */
-    @ApiModelProperty(value = "医院科室id")
-    private Long hospitalDeptId;
-
-    /**
-     * 自己科室id
-     */
-    @ApiModelProperty(value = "自己科室id")
-    private Long selfDeptId;
-
-    /**
-     * 自己科室名称
-     */
-    @ApiModelProperty(value = "自己科室名称")
-    private String selfDeptName;
-
-    /**
-     * 医院科室编码
-     */
-    @ApiModelProperty(value = "医院科室编码")
-    private String hospitalDeptCode;
-
-    /**
-     * 医院科室名称
-     */
-    @ApiModelProperty(value = "医院科室名称")
-    private String hospitalDeptName;
-
-    /**
-     * 医生id
-     */
-    @ApiModelProperty(value = "医生id")
-    private Long doctorId;
-
-    /**
-     * 医生编码
-     */
-    @ApiModelProperty(value = "医生编码")
-    private String doctorCode;
-
-    /**
-     * 医生姓名
-     */
-    @ApiModelProperty(value = "医生姓名")
-    private String doctorName;
-
-    /**
-     * 病人id
-     */
-    @ApiModelProperty(value = "病人id")
-    private Long patientId;
-
-    /**
-     * 病人编号
-     */
-    @ApiModelProperty(value = "病人编号")
-    private String patientCode;
-
-    /**
-     * 病人姓名
-     */
-    @ApiModelProperty(value = "病人姓名")
-    private String patientName;
-
-    /**
-     * 病人性别
-     */
-    @ApiModelProperty(value = "病人性别")
-    private String patientSex;
-
-    /**
-     * 病人年龄
-     */
-    @ApiModelProperty(value = "病人年龄")
-    private Integer patientAge;
-
-    /**
-     * 病人证件号码
-     */
-    @ApiModelProperty(value = "病人证件号码")
-    private String patientIdNo;
-
-    /**
-     * 患者联系电话
-     */
-    @ApiModelProperty(value = "患者联系电话")
-    private String patientPhone;
-
-    /**
-     * 系统时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "系统时间")
-    private Date systemTime;
-
-    /**
-     * 出生日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    @ApiModelProperty(value = "出生日期")
-    private Date birthday;
-
-    /**
-     * 门诊号
-     */
-    @ApiModelProperty(value = "门诊号")
-    private String recordId;
-
-}

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

@@ -1,16 +1,11 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetTopPatientInfoDTO;
-import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.DoctorPageMode;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.util.RespDTOUtil;
-import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,11 +42,11 @@ public class PatientInfoFacade {
     /**
      * 页面顶部病人医生科室信息查询
      *
-     * @param getTopPatientInfoDjVO
+     * @param getTopPatientInfoVO
      * @return
      */
-    public GetTopPatientInfoDjDTO getTopPatientInfo(@RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
-        RespDTO<GetTopPatientInfoDjDTO> respDTO = aiptServiceClient.getTopPatientInfoDj(getTopPatientInfoDjVO);
+    public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+        RespDTO<GetTopPatientInfoDTO> respDTO = aiptServiceClient.getTopPatientInfo(getTopPatientInfoVO);
         RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
         return respDTO.data;
     }

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

@@ -1,60 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author rgb
- * @Description
- * @time 2018年11月19日下午4:58:37
- */
-@ApiModel(value = "页面顶部病人医生科室信息查询接口传参")
-@Getter
-@Setter
-public class GetTopPatientInfoDjVO {
-
-    /**
-     * 医院编号
-     */
-    @ApiModelProperty(value = "医院编号", required = true)
-    @NotBlank(message = "医院编号必填")
-    private String hospitalCode;
-
-    /**
-     * 子医院编号
-     */
-    @ApiModelProperty(value = "子医院编号")
-    private String sonHospitalCode;
-
-    /**
-     * 医院科室编号
-     */
-    @ApiModelProperty(value = "医院科室编号", required = true)
-    @NotBlank(message = "医院科室编号必填")
-    private String hospitalDeptCode;
-
-    /**
-     * 医院医生编号
-     */
-    @ApiModelProperty(value = "医院医生编号")
-    private String doctorCode;
-
-    /**
-     * 医院患者编号
-     */
-    @ApiModelProperty(value = "医院患者编号", required = true)
-    @NotBlank(message = "医院患者编号必填")
-    private String patientCode;
-
-    /**
-     * 门诊号
-     */
-    @ApiModelProperty(value = "门诊号")
-    private String recordId;
-
-
-}

icss-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -1,11 +1,11 @@
 package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetTopPatientInfoDjDTO;
+import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PatientInfoFacade;
-import com.diagbot.vo.GetTopPatientInfoDjVO;
+import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,8 +53,8 @@ public class PatientInfoController {
                     "patientCode:医院患者编号，必填<br>")
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
-    public RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
-        return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoDjVO));
+    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+        return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
 
 }

tran-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -1,152 +1,130 @@
-/**
- * 
- */
 package com.diagbot.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
 
 /**
- * @Description
  * @author rgb
+ * @Description
  * @time 2018年11月19日下午4:57:43
  */
-@ApiModel(value="页面顶部病人医生科室信息查询接口出参")
 @Getter
 @Setter
 public class GetTopPatientInfoDTO {
-	
-	/**
-	 * 医院id
-	 */
-	@ApiModelProperty(value="医院id")
-	private Long hospitalId;
-	
-	/**
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
      * 医院编码
      */
-	@ApiModelProperty(value="医院编码")
     private String hospitalCode;
 
     /**
      * 医院名称
      */
-	@ApiModelProperty(value="医院名称")
     private String hospitalName;
-    
-    /**
-	 * 医院科室id
-	 */
-	@ApiModelProperty(value="医院科室id")
-	private Long hospitalDeptId;
-	
-    /**
-	 * 自己科室id
-	 */
-	@ApiModelProperty(value="自己科室id")
-	private Long selfDeptId;
-	
-	/**
-	 * 自己科室名称
-	 */
-	@ApiModelProperty(value="自己科室名称")
-	private String selfDeptName;
-    
+
+    /**
+     * 医院科室id
+     */
+    private Long hospitalDeptId;
+
+    /**
+     * 自己科室id
+     */
+    private Long selfDeptId;
+
+    /**
+     * 自己科室名称
+     */
+    private String selfDeptName;
+
     /**
      * 医院科室编码
      */
-	@ApiModelProperty(value="医院科室编码")
     private String hospitalDeptCode;
 
     /**
      * 医院科室名称
      */
-	@ApiModelProperty(value="医院科室名称")
     private String hospitalDeptName;
-    
-    /**
-	 * 医生id
-	 */
-	@ApiModelProperty(value="医生id")
-	private Long doctorId;
-	
-	/**
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
      * 医生编码
      */
-	@ApiModelProperty(value="医生编码")
     private String doctorCode;
 
     /**
      * 医生姓名
      */
-	@ApiModelProperty(value="医生姓名")
     private String doctorName;
-    
-    /**
-   	 * 病人id
-   	 */
-	@ApiModelProperty(value="病人id")
-   	private Long patientId;
-   	
-   	/**
+
+    /**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
      * 病人编号
      */
-	@ApiModelProperty(value="病人编号")
     private String patientCode;
 
     /**
      * 病人姓名
      */
-	@ApiModelProperty(value="病人姓名")
     private String patientName;
 
     /**
      * 病人性别
      */
-	@ApiModelProperty(value="病人性别")
     private String patientSex;
-    
+
     /**
      * 病人年龄
      */
-	@ApiModelProperty(value="病人年龄")
     private Integer patientAge;
-    
+
     /**
      * 病人证件号码
      */
-	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
-	/**
-	 * 患者身份证号
-	 */
-	@ApiModelProperty(value = "患者身份证号")
-	private String patientIdentityNum;
-
-	/**
-	 * 系统时间
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	@ApiModelProperty(value="系统时间")
-	private Date systemTime;
-	
-	/**
+    /**
+     * 患者身份证号
+     */
+    private String patientIdentityNum;
+
+    /**
+     * 患者联系电话
+     */
+    private String patientPhone;
+
+    /**
+     * 系统时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date systemTime;
+
+    /**
      * 出生日期
      */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	@ApiModelProperty(value="出生日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date birthday;
-	
-	/**
+
+    /**
      * 门诊号
      */
-	@ApiModelProperty(value="门诊号")
-	private String recordId;
-	
+    private String recordId;
+
 }

tran-service/src/main/java/com/diagbot/vo/GetTopPatientInfoVO.java

@@ -1,59 +1,41 @@
-/**
- * 
- */
 package com.diagbot.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-
 /**
- * @Description
  * @author rgb
+ * @Description
  * @time 2018年11月19日下午4:58:37
  */
-@ApiModel(value="页面顶部病人医生科室信息查询接口传参")
 @Getter
 @Setter
 public class GetTopPatientInfoVO {
-	
-	/**
-	 * 医院编号
-	 */
-	@ApiModelProperty(value="医院编号",required=true)
-	@NotBlank(message="医院编号必填")
-	private String hospitalCode;
-	
-	/**
-	 * 医院科室编号
-	 */
-	@ApiModelProperty(value="医院科室编号",required=true)
-	@NotBlank(message="医院科室编号必填")
-	private String hospitalDeptCode;
-	
-	/**
-	 * 医院医生编号
-	 */
-	@ApiModelProperty(value="医院医生编号",required=true)
-	@NotBlank(message="医院医生编号必填")
-	private String doctorCode;
-	
-	/**
-	 * 医院患者编号
-	 */
-	@ApiModelProperty(value="医院患者编号",required=true)
-	@NotBlank(message="医院患者编号必填")
-	private String patientCode;
-	
-	/**
-	 * 门诊号
-	 */
-	@ApiModelProperty(value="门诊号",required=true)
-	@NotBlank(message="门诊号必填")
-	private String recordId;
-	
+
+    /**
+     * 医院编号
+     */
+    private String hospitalCode;
+
+    /**
+     * 医院科室编号
+     */
+    private String hospitalDeptCode;
+
+    /**
+     * 医院医生编号
+     */
+    private String doctorCode;
+
+    /**
+     * 医院患者编号
+     */
+    private String patientCode;
+
+    /**
+     * 门诊号
+     */
+    private String recordId;
+
 
 }

tran-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -65,7 +65,7 @@ public class PatientInfoController {
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
     @ApiIgnore
-    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
+    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
     }
 

tran-service/src/main/resources/mapper/PatientInfoMapper.xml

@@ -56,6 +56,7 @@
 		case when d.sex=1 then '男' when d.sex=2 then '女' else '未知' end as patientSex,
 		d.id_no as patientIdNo,
         d.identity_num as patientIdentityNum,
+        d.phone as patientPhone,
 		d.birthday as birthday
 		FROM tran_hospital_info a LEFT JOIN tran_hospital_dept b 
 		ON a.`code`=b.hospital_code and b.`status`=1 and b.is_deleted='N' and b.`code`=#{hospitalDeptCode}