ICSS二期复诊历史病历修改

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

@@ -8,17 +8,15 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.diagbot.vo.IndexDataSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.EMRIntroduceDetailDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -51,6 +49,7 @@ import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.HisInquirysVO;
+import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
@@ -307,6 +306,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         } else if (hisInquirysVO.getOrderType() == 2) {
             queryWrapper.orderByAsc("gmt_modified");
         }
+        
+        if(hisInquirysVO.getDisType()==1){
+        	Date nowDate = DateUtil.now();
+        	Date lastDate = DateUtil.addMonth(nowDate,-6);
+        	queryWrapper.ge("gmt_create", lastDate);
+        	queryWrapper.le("gmt_create", nowDate);
+        	queryWrapper.likeRight("diagnose", hisInquirysVO.getDisName());
+        }
+        
+        
         List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
         if (inquiryInfoList.size() == 0) {
             return null;
@@ -345,7 +354,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         return hisInquiryDTOList;
     }
-
+    
     /**
      * 对接-历史病历列表
      *

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

@@ -2,8 +2,10 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.Range;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModel;
@@ -80,5 +82,20 @@ public class HisInquirysVO {
 	 */
 	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；")
 	private Integer orderType=1;
+	
+	/**
+	 * 诊断类型：1：慢病，2：急诊
+	 */
+	@NotNull(message="诊断类型必填")
+	@ApiModelProperty(value="诊断类型：0：通用，1：慢病，2：急诊")
+	@Range(min=0,max=2,message="诊断类型必须是0-2")
+	private Integer disType;
+	
+	/**
+	 * 诊断名称
+	 */
+	@NotBlank(message="诊断名称必填")
+	@ApiModelProperty(value="诊断名称",required=true)
+	private String disName;
 	   
 }