历史病历列表修改

icss-service/src/main/java/com/diagbot/dto/HisInquiryDTO.java

@@ -1,5 +1,9 @@
 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;
@@ -58,4 +62,11 @@ public class HisInquiryDTO{
     private String dataJson;
 	
 	
+	/**
+	 * 病历时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value="病历时间")
+	private Date gmtCreate;
+	
 }

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

@@ -131,7 +131,31 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	 * @return
 	 */
 	public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO){
-		return null;
+		List<HisInquiryDTO> hisInquiryDTOList = new ArrayList<>();
+		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
+		queryWrapper.eq("hospital_id", hisInquirysVO.getHospitalId());
+		queryWrapper.eq("hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+		queryWrapper.eq("doctor_id", hisInquirysVO.getDoctorId());
+		queryWrapper.eq("patient_id", hisInquirysVO.getPatientId());
+		queryWrapper.eq("type", hisInquirysVO.getType());
+		queryWrapper.eq("sign", hisInquirysVO.getSign());
+		queryWrapper.between("gmt_create", hisInquirysVO.getStartDate(), hisInquirysVO.getEndDate());
+		queryWrapper.orderByDesc("gmt_create");
+		List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
+		for(InquiryInfo i : inquiryInfoList){
+			HisInquiryDTO hisInquiryDTO = new HisInquiryDTO();
+			hisInquiryDTO.setId(i.getId());
+			hisInquiryDTO.setInquiryCode(i.getInquiryCode());
+			hisInquiryDTO.setRegVisitedState(i.getRegVisitedState());
+			hisInquiryDTO.setType(i.getType());
+			hisInquiryDTO.setSign(i.getSign());
+			hisInquiryDTO.setDiagnose(i.getDiagnose());
+			hisInquiryDTO.setDataJson(i.getDataJson());
+			hisInquiryDTO.setGmtCreate(i.getGmtCreate());
+			hisInquiryDTOList.add(hisInquiryDTO);
+		}
+		
+		return hisInquiryDTOList;
 	}
 
 }

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

@@ -1,6 +1,13 @@
 package com.diagbot.vo;
 
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,5 +21,55 @@ import lombok.Setter;
 @Setter
 public class HisInquirysVO {
 	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id",required=true)
+	@NotNull(message="医院id必传")
+    private Long hospitalId;
+
+    /**
+     * 科室id
+     */
+	@ApiModelProperty(value="科室id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id")
+    private Long doctorId;
+
+    /**
+     * 患者id
+     */
+	@ApiModelProperty(value="患者id")
+    private Long patientId;
+    
+    /**
+     * 病历分类(1:门诊,2:住院)
+     */
+	@ApiModelProperty(value="病历分类(1:门诊,2:住院)")
+    private Integer type=1;
+    
+    /**
+     * 内容输入类型：1：结构化 2：文本模式
+     */
+	@ApiModelProperty(value="内容输入类型：1：结构化 2：文本模式")
+    private Integer sign=1;
+    
+	/**
+	 * 开始时间
+	 */
+	@ApiModelProperty(value="开始时间，格式为：2018-11-28 17:25:30")
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	private Date startDate;
+	
+	/**
+	 * 结束时间
+	 */
+	@ApiModelProperty(value="结束时间，格式为：2018-11-28 17:25:30")
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	private Date endDate;
 	   
 }