Explorar o código

预问诊病历详情接口修改

rengb %!s(int64=5) %!d(string=hai) anos
pai
achega
2cebea421a

+ 14 - 0
prec-service/src/main/java/com/diagbot/dto/GetInquiryDetailDTO.java

@@ -39,6 +39,20 @@ public class GetInquiryDetailDTO {
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	@ApiModelProperty(value="就诊时间")
 	private Date inquiryTime;
+
+    /**
+     * 病历创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value="病历创建时间")
+    private Date gmtCreate;
+
+    /**
+     * 病历更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value="病历更新时间")
+    private Date gmtModified;
 	
 	/**
      * 医院id

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

@@ -260,9 +260,13 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()),
                 "patient_id_no", getInquiryDetailVO.getPatientIdNo());
         inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
+        inquiryInfoQe.orderByDesc("gmt_modified");
 
         InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe, false);
-        if (inquiryInfo == null) {
+        if (inquiryInfo == null
+                ||DateUtil.before(inquiryInfo.getGmtModified(),
+                DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(),
+                        -getInquiryDetailVO.getDayLimit())))) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该病历不存在!");
         }
 
@@ -320,7 +324,6 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             getInquiryDetailDTO.setImageList(BeanUtil.listCopyTo(inquiryReportList, GetInquiryDetailImgDTO.class));
         }
 
-
         return getInquiryDetailDTO;
     }
 

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

@@ -77,5 +77,11 @@ public class GetInquiryDetailVO {
 	@ApiModelProperty(value="就诊序列号",required=true)
 	@NotBlank(message="就诊序列号必传")
     private String inquiryCode;
-	
+
+    /**
+     * 有效天数限制
+     */
+    @ApiModelProperty(value="有效天数限制")
+	private int dayLimit = 15;
+
 }