病历列表详情接口修改

prec-service/src/main/java/com/diagbot/enums/InquiryQuotedTypeEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author gaodm
+ * @Description: TODO
+ * @date 2018年12月11日 下午2:31:42
+ */
+public enum InquiryQuotedTypeEnum implements KeyedNamed {
+    Disable(0, "未引用"),
+    Enable(1, "已引用");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    InquiryQuotedTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static InquiryQuotedTypeEnum getEnum(int key) {
+        for (InquiryQuotedTypeEnum item : InquiryQuotedTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        InquiryQuotedTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

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

@@ -14,6 +14,7 @@ import com.diagbot.entity.InquiryEvaluator;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.InquiryQuote;
 import com.diagbot.entity.InquiryReport;
+import com.diagbot.enums.InquiryQuotedTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.SexEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -184,6 +185,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
         inquiryInfoQe.eq(hisInquirysVO.getHospitalId() != null,
                 "hospital_id", hisInquirysVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()),
@@ -204,6 +206,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 "patient_id_no", hisInquirysVO.getPatientIdNo());
         inquiryInfoQe.eq(hisInquirysVO.getType() != null,
                 "type", hisInquirysVO.getType());
+        String day = DateUtil.formatDateTime(DateUtil.getFirstTimeOfDay(DateUtil.addDay(DateUtil.now(),
+                -hisInquirysVO.getDayLimit())));
+        inquiryInfoQe.ge("gmt_modified", day);
 
         inquiryInfoQe.ge(hisInquirysVO.getStartDate() != null,
                 "gmt_create", hisInquirysVO.getStartDate());
@@ -258,7 +263,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
 
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
+        inquiryInfoQe.eq(getInquiryDetailVO.getInquiryId() != null,
+                "id", getInquiryDetailVO.getInquiryId());
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("is_quoted", InquiryQuotedTypeEnum.Disable.getKey());
         inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId() != null,
                 "hospital_id", getInquiryDetailVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()),

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

@@ -17,6 +17,12 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class GetInquiryDetailVO {
 
+    /**
+     * 病历id
+     */
+    @ApiModelProperty(value = "病历id")
+    private Long inquiryId;
+
     /**
      * 医院id
      */

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

@@ -98,7 +98,11 @@ public class HisInquirysVO {
 	 */
 	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；3、就诊号降序；4、就诊号升序；")
 	private Integer orderType=1;
-	
-	
+
+	/**
+	 * 有效天数限制
+	 */
+	@ApiModelProperty(value = "有效天数限制")
+	private int dayLimit = 15;
 	   
 }

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

@@ -180,6 +180,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         PatientInfo patientInfo = getOne(patientInfoQe, false);
         if (patientInfo == null) {
             patientInfo = new PatientInfo();
+            patientInfo.setHospitalCode(signInVO.getHospitalCode());
             patientInfo.setName(signInVO.getPatientName());
             patientInfo.setSex(IdCard.getGenderByIdCard(signInVO.getPatientInfo()));
             patientInfo.setBirthday(DateUtil.parseDate(IdCard.getBirthByIdCard(signInVO.getPatientInfo()), "yyyyMMdd"));