病历详情接口修改

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

@@ -236,7 +236,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }*/
         if (getInquiryDetailVO.getPatientId() == null
                 && StringUtil.isBlank(getInquiryDetailVO.getPatientCode())
-                && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
+                && (StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())
+                || StringUtil.isBlank(getInquiryDetailVO.getPatientName()))) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "患者信息(患者id或者患者编码或者患者病历号)必传！");
         }
 
@@ -260,6 +261,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 "patient_code", getInquiryDetailVO.getPatientCode());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()),
                 "patient_id_no", getInquiryDetailVO.getPatientIdNo());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientName()),
+                "patient_name", getInquiryDetailVO.getPatientName());
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
         String day = DateUtil.formatDateTime(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(),
                 -getInquiryDetailVO.getDayLimit())));

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

@@ -1,87 +1,93 @@
 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;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Description:
  * @author: rengb
  * @time: 2018/11/19 18:58
  */
-@ApiModel(value="病历详情接口传参")
+@ApiModel(value = "病历详情接口传参")
 @Getter
 @Setter
 public class GetInquiryDetailVO {
 
-	/**
+    /**
      * 医院id
      */
-	@ApiModelProperty(value="医院id")
+    @ApiModelProperty(value = "医院id")
     private Long hospitalId;
-	
-	 /**
+
+    /**
      * 医院编码
      */
-	@ApiModelProperty(value="医院编码")
+    @ApiModelProperty(value = "医院编码")
     private String hospitalCode;
 
     /**
      * 医院科室id
      */
-	@ApiModelProperty(value="医院科室id")
+    @ApiModelProperty(value = "医院科室id")
     private Long hospitalDeptId;
 
     /**
      * 医院科室编码
      */
-	@ApiModelProperty(value="医院科室编码")
+    @ApiModelProperty(value = "医院科室编码")
     private String hospitalDeptCode;
 
     /**
      * 医生id
      */
-	@ApiModelProperty(value="医生id")
+    @ApiModelProperty(value = "医生id")
     private Long doctorId;
-	
+
     /**
      * 医生编码
      */
-	@ApiModelProperty(value="医生编码")
+    @ApiModelProperty(value = "医生编码")
     private String doctorCode;
 
     /**
      * 患者id
      */
-	@ApiModelProperty(value="患者id")
+    @ApiModelProperty(value = "患者id")
     private Long patientId;
-	
+
     /**
      * 患者编号
      */
-	@ApiModelProperty(value="患者编号")
+    @ApiModelProperty(value = "患者编号")
     private String patientCode;
-	
+
     /**
-     * 患者病历号
+     * 患者证件号码
      */
-	@ApiModelProperty(value="患者病历号")
+    @ApiModelProperty(value = "患者证件号码")
     private String patientIdNo;
-	
+
+    /**
+     * 患者姓名
+     */
+    @ApiModelProperty(value = "患者姓名")
+    private String patientName;
+
     /**
      * 就诊序列号
      */
-	@ApiModelProperty(value="就诊序列号",required=true)
-	@NotBlank(message="就诊序列号必传")
+    @ApiModelProperty(value = "就诊序列号", required = true)
+    @NotBlank(message = "就诊序列号必传")
     private String inquiryCode;
 
     /**
      * 有效天数限制
      */
-    @ApiModelProperty(value="有效天数限制")
-	private int dayLimit = 15;
+    @ApiModelProperty(value = "有效天数限制")
+    private int dayLimit = 15;
 
 }