瀏覽代碼

页面顶部信息接口修改

rengb 5 年之前
父節點
當前提交
63ee96619b

+ 1 - 13
aipt-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDjDTO.java

@@ -158,16 +158,4 @@ public class GetTopPatientInfoDjDTO {
     @ApiModelProperty(value = "门诊号")
     private String recordId;
 
-    /**
-     * 模式分类
-     */
-    @ApiModelProperty(value = "模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-    @ApiModelProperty(value = "模式值")
-    private Integer modeValue;
-
-}
+}

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

@@ -6,25 +6,7 @@ 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.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.dto.*;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -36,6 +18,7 @@ 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;
@@ -137,6 +120,15 @@ public interface AiptServiceClient {
     @PostMapping("/patientInfo/getTopPatientInfo")
     RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
 
+    /**
+     * 对接-获取页面顶部病人医生科室信息
+     *
+     * @param getTopPatientInfoDjVO
+     * @return
+     */
+    @PostMapping("/patientInfo/getTopPatientInfoDj")
+    RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfoDj(@RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO);
+
     /**
      * 获取管理评估模板
      *

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

@@ -6,25 +6,7 @@ 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.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.dto.*;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.ConceptFindVO;
 import com.diagbot.vo.ConceptIntroduceVO;
@@ -36,6 +18,7 @@ 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;
@@ -171,6 +154,12 @@ 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");

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

@@ -0,0 +1,161 @@
+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;
+
+    /**
+     * 系统时间
+     */
+    @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;
+
+}

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

@@ -4,11 +4,13 @@ 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;
@@ -45,11 +47,11 @@ public class PatientInfoFacade {
     /**
      * 页面顶部病人医生科室信息查询
      *
-     * @param getTopPatientInfoVO
+     * @param getTopPatientInfoDjVO
      * @return
      */
-    public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-        RespDTO<GetTopPatientInfoDTO> respDTO = aiptServiceClient.getTopPatientInfo(getTopPatientInfoVO);
+    public GetTopPatientInfoDjDTO getTopPatientInfo(@RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
+        RespDTO<GetTopPatientInfoDjDTO> respDTO = aiptServiceClient.getTopPatientInfoDj(getTopPatientInfoDjVO);
         RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
         return respDTO.data;
     }

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

@@ -0,0 +1,60 @@
+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;
+
+
+}

+ 4 - 5
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.GetTopPatientInfoDTO;
+import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PatientInfoFacade;
-import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.PatientInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,7 +46,6 @@ public class PatientInfoController {
         return RespDTO.onSuc(data);
     }
 
-
     @ApiOperation(value = "知识库标准化-页面顶部病人医生科室信息——查询[by:rengb]",
             notes = "hospitalCode:医院编号,必填<br>" +
                     "hospitalDeptCode:医院科室编号,必填<br>" +
@@ -54,8 +53,8 @@ public class PatientInfoController {
                     "patientCode:医院患者编号,必填<br>")
     @PostMapping("/getTopPatientInfo")
     @SysLogger("getTopPatientInfo")
-    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
-        return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoVO));
+    public RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfo(@Valid @RequestBody GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
+        return RespDTO.onSuc(patientInfoFacade.getTopPatientInfo(getTopPatientInfoDjVO));
     }
 
 }

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

@@ -4,7 +4,6 @@ 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.GetTopPatientInfoDTO;
 import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -12,7 +11,6 @@ import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
-import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.VersionVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -38,15 +36,6 @@ public interface AiptServiceClient {
      */
     @PostMapping("/push/pushInner")
     RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO);
-    
-    /**
-     * 获取页面顶部病人医生科室信息
-     *
-     * @param getTopPatientInfoVO
-     * @return
-     */
-    @PostMapping("/patientInfo/getTopPatientInfo")
-    RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO);
 
     /**
      * 对接-获取页面顶部病人医生科室信息

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

@@ -4,7 +4,6 @@ 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.GetTopPatientInfoDTO;
 import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.RespDTO;
@@ -12,7 +11,6 @@ import com.diagbot.dto.VersionWrapperDTO;
 import com.diagbot.vo.ConceptSearchVO;
 import com.diagbot.vo.ConceptUsualVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
-import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.RetrievalVO;
 import com.diagbot.vo.VersionVO;
 import lombok.extern.slf4j.Slf4j;
@@ -43,12 +41,6 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
     
-    @Override
-    public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(GetTopPatientInfoVO getTopPatientInfoVO) {
-        log.error("【hystrix】调用{}异常", "getTopPatientInfo");
-        return null;
-    }
-
     @Override
     public RespDTO<GetTopPatientInfoDjDTO> getTopPatientInfoDj(GetTopPatientInfoDjVO getTopPatientInfoDjVO) {
         log.error("【hystrix】调用{}异常", "getTopPatientInfoDj");

+ 0 - 144
prec-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -1,144 +0,0 @@
-package com.diagbot.dto;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @time 2018年11月19日下午4:57:43
- */
-@ApiModel(value="页面顶部病人医生科室信息查询接口出参")
-@Getter
-@Setter
-public class GetTopPatientInfoDTO {
-	
-	/**
-	 * 医院id
-	 */
-	@ApiModelProperty(value="医院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;
-    
-    /**
-     * 医院科室编码
-     */
-	@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;
-
-	/**
-	 * 系统时间
-	 */
-	@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;
-
-}

+ 1 - 13
prec-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDjDTO.java

@@ -158,16 +158,4 @@ public class GetTopPatientInfoDjDTO {
     @ApiModelProperty(value = "门诊号")
     private String recordId;
 
-    //    /**
-    //     * 模式分类
-    //     */
-    //	@ApiModelProperty(value="模式分类")
-    //    private Integer modeClassify;
-    //
-    //    /**
-    //     * 模式值
-    //     */
-    //	@ApiModelProperty(value="模式值")
-    //    private Integer modeValue;
-
-}
+}

+ 0 - 2
prec-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -9,11 +9,9 @@ import org.springframework.stereotype.Component;
 
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SignInDTO;
 import com.diagbot.util.RespDTOUtil;
-import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.SignInVO;
 
 /**

+ 0 - 56
prec-service/src/main/java/com/diagbot/vo/GetTopPatientInfoVO.java

@@ -1,56 +0,0 @@
-package com.diagbot.vo;
-
-import javax.validation.constraints.NotBlank;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description
- * @author rgb
- * @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;
-	
-
-}

+ 0 - 2
prec-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -14,11 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SignInDTO;
 import com.diagbot.facade.PatientInfoFacade;
-import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.SignInVO;
 
 import io.swagger.annotations.Api;

+ 1 - 11
tran-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDjDTO.java

@@ -132,14 +132,4 @@ public class GetTopPatientInfoDjDTO {
      */
     private String recordId;
 
-    /**
-     * 模式分类
-     */
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-    private Integer modeValue;
-
-}
+}