病历详情修改

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

@@ -0,0 +1,212 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="病历详情接口出参")
+@Getter
+@Setter
+public class GetInquiryDetailDTO {
+	
+	/**
+	 * 病历id
+	 */
+	@ApiModelProperty(value="病历id")
+	private Long id;
+	
+	/**
+	 * 就诊日期
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊日期")
+	private Date inquiryDate;
+	
+	/**
+	 * 就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊时间")
+	private Date inquiryTime;
+	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id")
+    private Long hospitalId;
+
+    /**
+     * 医院编码
+     */
+    @ApiModelProperty(value="医院编码")
+    private String hospitalCode;
+
+    /**
+     * 医院名称
+     */
+    @ApiModelProperty(value="医院名称")
+    private String hospitalName;
+
+    /**
+     * 医院科室id
+     */
+    @ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医院科室编码
+     */
+    @ApiModelProperty(value="医院科室编码")
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+    @ApiModelProperty(value="医院科室名称")
+    private String hospitalDeptName;
+
+    /**
+     * 医生id
+     */
+    @ApiModelProperty(value="医生id")
+    private Long doctorId;
+
+    /**
+     * 医生编码
+     */
+    @ApiModelProperty(value="医生编码")
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+    @ApiModelProperty(value="医生姓名")
+    private String doctorName;
+
+    /**
+     * 患者id
+     */
+    @ApiModelProperty(value="患者id")
+    private Long patientId;
+
+    /**
+     * 患者编号
+     */
+    @ApiModelProperty(value="患者编号")
+    private String patientCode;
+
+    /**
+     * 患者姓名
+     */
+    @ApiModelProperty(value="患者姓名")
+    private String patientName;
+
+    /**
+     * 患者性别：1男2女
+     */
+    @ApiModelProperty(value="患者性别：1男2女")
+    private Integer patientSex;
+    
+    /**
+     * 患者性别信息
+     */
+    @ApiModelProperty(value="患者性别信息")
+    private String patientSexMsg;
+
+    /**
+     * 患者联系电话
+     */
+    @ApiModelProperty(value="患者联系电话")
+    private String patientPhone;
+
+    /**
+     * 患者出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value="患者出生日期")
+    private Date patientBirthday;
+    
+    /**
+     * 患者年龄
+     */
+	@ApiModelProperty(value="患者年龄")
+    private Integer patientAge;
+
+    /**
+     * 患者病历号
+     */
+    @ApiModelProperty(value="患者病历号")
+    private String patientIdNo;
+
+    /**
+     * 就诊序列号
+     */
+    @ApiModelProperty(value="就诊序列号")
+    private String inquiryCode;
+
+    /**
+     * 就诊状态（0待接诊，1接诊中，2完成接诊）
+     */
+    @ApiModelProperty(value="就诊状态（0待接诊，1接诊中，2完成接诊）")
+    private Integer regVisitedState;
+
+    /**
+     * 分类(1:门诊,2:住院)
+     */
+    @ApiModelProperty(value="分类(1:门诊,2:住院)")
+    private Integer type;
+
+    /**
+     * 内容JSON字符串
+     */
+    @ApiModelProperty(value="内容JSON字符串")
+    private String dataJson;
+    
+    /**
+     * 主诉
+     */
+    @ApiModelProperty(value="主诉")
+    private String chiefComplaint;
+    
+    /**
+     * 现病史
+     */
+    @ApiModelProperty(value="现病史")
+    private String xbs;
+    
+    /**
+     * 其他史
+     */
+    @ApiModelProperty(value="其他史")
+    private String qts;
+    
+    /**
+     * 补充内容
+     */
+    @ApiModelProperty(value="补充内容")
+    private String supplement;
+	
+    /**
+     * 儿童体质辨识测试
+     */
+    @ApiModelProperty(value="儿童体质辨识测试")
+    private String physicalRes;
+	
+    /**
+     * 最近一次报告图
+     */
+    @ApiModelProperty(value="最近一次报告图")
+	private List<GetInquiryDetailImgDTO> imageList;
+	
+}

prec-service/src/main/java/com/diagbot/dto/GetInquiryDetailImgDTO.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@Getter
+@Setter
+public class GetInquiryDetailImgDTO {
+	
+	/**
+	 * 原图
+	 */
+	@ApiModelProperty(value="原图")
+    private String originalImage;
+
+    /**
+     * 缩略图
+     */
+	@ApiModelProperty(value="缩略图")
+    private String narrowImage;
+	
+}

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

@@ -0,0 +1,188 @@
+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;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="历史病历列表接口出参")
+@Getter
+@Setter
+public class HisInquiryDTO{
+	
+	/**
+	 * 病历id
+	 */
+	@ApiModelProperty(value="病历id")
+	private Long id;
+	
+	/**
+	 * 创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 修改时间
+	 */
+	private Date gmtModified;
+	
+	/**
+	 * 就诊日期
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊日期")
+	private Date inquiryDate;
+	
+	/**
+	 * 就诊时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+	@ApiModelProperty(value="就诊时间")
+	private Date inquiryTime;
+	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id")
+    private Long hospitalId;
+
+    /**
+     * 医院编码
+     */
+    @ApiModelProperty(value="医院编码")
+    private String hospitalCode;
+
+    /**
+     * 医院名称
+     */
+    @ApiModelProperty(value="医院名称")
+    private String hospitalName;
+
+    /**
+     * 医院科室id
+     */
+    @ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医院科室编码
+     */
+    @ApiModelProperty(value="医院科室编码")
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+    @ApiModelProperty(value="医院科室名称")
+    private String hospitalDeptName;
+
+    /**
+     * 医生id
+     */
+    @ApiModelProperty(value="医生id")
+    private Long doctorId;
+
+    /**
+     * 医生编码
+     */
+    @ApiModelProperty(value="医生编码")
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+    @ApiModelProperty(value="医生姓名")
+    private String doctorName;
+
+    /**
+     * 患者id
+     */
+    @ApiModelProperty(value="患者id")
+    private Long patientId;
+
+    /**
+     * 患者编号
+     */
+    @ApiModelProperty(value="患者编号")
+    private String patientCode;
+
+    /**
+     * 患者姓名
+     */
+    @ApiModelProperty(value="患者姓名")
+    private String patientName;
+
+    /**
+     * 患者性别：1男2女
+     */
+    @ApiModelProperty(value="患者性别：1男2女")
+    private Integer patientSex;
+    
+    /**
+     * 患者性别信息
+     */
+    @ApiModelProperty(value="患者性别信息")
+    private String patientSexMsg;
+
+    /**
+     * 患者联系电话
+     */
+    @ApiModelProperty(value="患者联系电话")
+    private String patientPhone;
+
+    /**
+     * 患者出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value="患者出生日期")
+    private Date patientBirthday;
+    
+    /**
+     * 患者年龄
+     */
+	@ApiModelProperty(value="患者年龄")
+    private Integer patientAge;
+
+    /**
+     * 患者病历号
+     */
+    @ApiModelProperty(value="患者病历号")
+    private String patientIdNo;
+
+    /**
+     * 就诊序列号
+     */
+    @ApiModelProperty(value="就诊序列号")
+    private String inquiryCode;
+
+    /**
+     * 就诊状态（0待接诊，1接诊中，2完成接诊）
+     */
+    @ApiModelProperty(value="就诊状态（0待接诊，1接诊中，2完成接诊）")
+    private Integer regVisitedState;
+
+    /**
+     * 分类(1:门诊,2:住院)
+     */
+    @ApiModelProperty(value="分类(1:门诊,2:住院)")
+    private Integer type;
+
+    /**
+     * 内容JSON字符串
+     */
+    @ApiModelProperty(value="内容JSON字符串")
+    private String dataJson;
+	
+	
+	
+	
+}

prec-service/src/main/java/com/diagbot/entity/InquiryEvaluator.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-20
+ * @since 2019-06-21
  */
 @TableName("prec_inquiry_evaluator")
 public class InquiryEvaluator implements Serializable {
@@ -57,11 +57,6 @@ public class InquiryEvaluator implements Serializable {
      */
     private Long inquiryId;
 
-    /**
-     * 医院编码
-     */
-    private String hospitalCode;
-
     /**
      * 平和体质转化分
      */
@@ -151,13 +146,6 @@ public class InquiryEvaluator implements Serializable {
     public void setInquiryId(Long inquiryId) {
         this.inquiryId = inquiryId;
     }
-    public String getHospitalCode() {
-        return hospitalCode;
-    }
-
-    public void setHospitalCode(String hospitalCode) {
-        this.hospitalCode = hospitalCode;
-    }
     public BigDecimal getMildValue() {
         return mildValue;
     }
@@ -225,7 +213,6 @@ public class InquiryEvaluator implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", inquiryId=" + inquiryId +
-        ", hospitalCode=" + hospitalCode +
         ", mildValue=" + mildValue +
         ", faintValue=" + faintValue +
         ", wetValue=" + wetValue +

prec-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-20
+ * @since 2019-06-21
  */
 @TableName("prec_inquiry_info")
 public class InquiryInfo implements Serializable {
@@ -57,20 +57,80 @@ public class InquiryInfo implements Serializable {
     private Long hospitalId;
 
     /**
-     * 科室id
+     * 医院编码
+     */
+    private String hospitalCode;
+
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
+
+    /**
+     * 医院科室id
      */
     private Long hospitalDeptId;
 
+    /**
+     * 医院科室编码
+     */
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+    private String hospitalDeptName;
+
     /**
      * 医生id
      */
     private Long doctorId;
 
+    /**
+     * 医生编码
+     */
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
     /**
      * 患者id
      */
     private Long patientId;
 
+    /**
+     * 患者编号
+     */
+    private String patientCode;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
+
+    /**
+     * 患者性别：1男2女
+     */
+    private Integer patientSex;
+
+    /**
+     * 患者联系电话
+     */
+    private String patientPhone;
+
+    /**
+     * 患者出生日期
+     */
+    private Date patientBirthday;
+
+    /**
+     * 患者证件号码(病历号)
+     */
+    private String patientIdNo;
+
     /**
      * 就诊序列号
      */
@@ -145,6 +205,20 @@ public class InquiryInfo implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
+    public String getHospitalCode() {
+        return hospitalCode;
+    }
+
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
+    }
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
     public Long getHospitalDeptId() {
         return hospitalDeptId;
     }
@@ -152,6 +226,20 @@ public class InquiryInfo implements Serializable {
     public void setHospitalDeptId(Long hospitalDeptId) {
         this.hospitalDeptId = hospitalDeptId;
     }
+    public String getHospitalDeptCode() {
+        return hospitalDeptCode;
+    }
+
+    public void setHospitalDeptCode(String hospitalDeptCode) {
+        this.hospitalDeptCode = hospitalDeptCode;
+    }
+    public String getHospitalDeptName() {
+        return hospitalDeptName;
+    }
+
+    public void setHospitalDeptName(String hospitalDeptName) {
+        this.hospitalDeptName = hospitalDeptName;
+    }
     public Long getDoctorId() {
         return doctorId;
     }
@@ -159,6 +247,20 @@ public class InquiryInfo implements Serializable {
     public void setDoctorId(Long doctorId) {
         this.doctorId = doctorId;
     }
+    public String getDoctorCode() {
+        return doctorCode;
+    }
+
+    public void setDoctorCode(String doctorCode) {
+        this.doctorCode = doctorCode;
+    }
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
     public Long getPatientId() {
         return patientId;
     }
@@ -166,6 +268,48 @@ public class InquiryInfo implements Serializable {
     public void setPatientId(Long patientId) {
         this.patientId = patientId;
     }
+    public String getPatientCode() {
+        return patientCode;
+    }
+
+    public void setPatientCode(String patientCode) {
+        this.patientCode = patientCode;
+    }
+    public String getPatientName() {
+        return patientName;
+    }
+
+    public void setPatientName(String patientName) {
+        this.patientName = patientName;
+    }
+    public Integer getPatientSex() {
+        return patientSex;
+    }
+
+    public void setPatientSex(Integer patientSex) {
+        this.patientSex = patientSex;
+    }
+    public String getPatientPhone() {
+        return patientPhone;
+    }
+
+    public void setPatientPhone(String patientPhone) {
+        this.patientPhone = patientPhone;
+    }
+    public Date getPatientBirthday() {
+        return patientBirthday;
+    }
+
+    public void setPatientBirthday(Date patientBirthday) {
+        this.patientBirthday = patientBirthday;
+    }
+    public String getPatientIdNo() {
+        return patientIdNo;
+    }
+
+    public void setPatientIdNo(String patientIdNo) {
+        this.patientIdNo = patientIdNo;
+    }
     public String getInquiryCode() {
         return inquiryCode;
     }
@@ -212,9 +356,21 @@ public class InquiryInfo implements Serializable {
         ", creator=" + creator +
         ", modifier=" + modifier +
         ", hospitalId=" + hospitalId +
+        ", hospitalCode=" + hospitalCode +
+        ", hospitalName=" + hospitalName +
         ", hospitalDeptId=" + hospitalDeptId +
+        ", hospitalDeptCode=" + hospitalDeptCode +
+        ", hospitalDeptName=" + hospitalDeptName +
         ", doctorId=" + doctorId +
+        ", doctorCode=" + doctorCode +
+        ", doctorName=" + doctorName +
         ", patientId=" + patientId +
+        ", patientCode=" + patientCode +
+        ", patientName=" + patientName +
+        ", patientSex=" + patientSex +
+        ", patientPhone=" + patientPhone +
+        ", patientBirthday=" + patientBirthday +
+        ", patientIdNo=" + patientIdNo +
         ", inquiryCode=" + inquiryCode +
         ", regVisitedState=" + regVisitedState +
         ", type=" + type +

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

@@ -42,14 +42,14 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
 	 * @param addDeptInfoVO
 	 * @return
 	 */
-    public Boolean addEvaluator(AddEvaluatorVO addDeptInfoVO) {
+    public Boolean addEvaluator(AddEvaluatorVO addEvaluatorVO) {
         QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
         inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        inquiryInfoQe.eq("hospital_id", addDeptInfoVO.getHospitalId());
-        inquiryInfoQe.eq("hospital_dept_id", addDeptInfoVO.getHospitalDeptId());
-        inquiryInfoQe.eq("doctor_id", addDeptInfoVO.getDoctorId());
-        inquiryInfoQe.eq("patient_id", addDeptInfoVO.getPatientId());
-        inquiryInfoQe.eq("inquiry_code", addDeptInfoVO.getInquiryCode());
+        inquiryInfoQe.eq("hospital_id", addEvaluatorVO.getHospitalId());
+        inquiryInfoQe.eq("hospital_dept_id", addEvaluatorVO.getHospitalDeptId());
+        inquiryInfoQe.eq("doctor_id", addEvaluatorVO.getDoctorId());
+        inquiryInfoQe.eq("patient_id", addEvaluatorVO.getPatientId());
+        inquiryInfoQe.eq("inquiry_code", addEvaluatorVO.getInquiryCode());
         InquiryInfo inquiryInfo = inquiryInfoFacade.getOne(inquiryInfoQe);
         
         Date now = DateUtil.now();
@@ -59,12 +59,12 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         	inquiryInfo.setGmtCreate(now);
         }
         
-        BeanUtil.copyProperties(addDeptInfoVO, inquiryInfo);
+        BeanUtil.copyProperties(addEvaluatorVO, inquiryInfo);
         inquiryInfo.setGmtModified(now);
         inquiryInfoFacade.saveOrUpdate(inquiryInfo);
         
         EvaluatorCalVO evaluatorCalVO = new EvaluatorCalVO();
-        BeanUtil.copyProperties(addDeptInfoVO, evaluatorCalVO);
+        BeanUtil.copyProperties(addEvaluatorVO, evaluatorCalVO);
         EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
 
         InquiryEvaluator inquiryEvaluator = new InquiryEvaluator();

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

@@ -8,16 +8,27 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.GetInquiryDetailImgDTO;
+import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.InquiryDetail;
+import com.diagbot.entity.InquiryEvaluator;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.InquiryReport;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.SexEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.service.impl.InquiryReportServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.GetInquiryDetailVO;
+import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.SaveInquiryVO;
 
 /**
@@ -32,6 +43,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	@Autowired
     private InquiryReportFacade inquiryReportFacade;
 	@Autowired
+    private InquiryEvaluatorFacade inquiryEvaluatorFacade;
+	@Autowired
     @Qualifier("inquiryDetailServiceImpl")
     private InquiryDetailServiceImpl inquiryDetailServiceImpl;
 	@Autowired
@@ -95,5 +108,119 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         
 		return saveInquiryDTO;
 	}
+	
+	/**
+     * 历史病历列表
+     * @param hisInquirysVO
+     * @return
+     */
+    public List<HisInquiryDTO> hisInquirys(HisInquirysVO hisInquirysVO) {
+    	if(hisInquirysVO.getHospitalId()==null&&StringUtil.isBlank(hisInquirysVO.getHospitalCode())){
+    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医院信息(医院id或者医院编码)必传！");
+    	}
+    	
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalId()!=null, "hospital_id", hisInquirysVO.getHospitalId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalCode()), "hospital_code", hisInquirysVO.getHospitalCode());
+        inquiryInfoQe.eq(hisInquirysVO.getHospitalDeptId()!=null, "hospital_dept_id", hisInquirysVO.getHospitalDeptId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getHospitalDeptCode()), "hospital_dept_code", hisInquirysVO.getHospitalDeptCode());
+        inquiryInfoQe.eq(hisInquirysVO.getDoctorId()!=null, "doctor_id", hisInquirysVO.getDoctorId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getDoctorCode()), "doctor_code", hisInquirysVO.getDoctorCode());
+        inquiryInfoQe.eq(hisInquirysVO.getPatientId()!=null, "patient_id", hisInquirysVO.getPatientId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientCode()), "patient_code", hisInquirysVO.getPatientCode());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(hisInquirysVO.getPatientIdNo()), "patient_id_no", hisInquirysVO.getPatientIdNo());
+        inquiryInfoQe.eq(hisInquirysVO.getType()!=null, "type", hisInquirysVO.getType());
+        
+        inquiryInfoQe.ge(hisInquirysVO.getStartDate()!=null, "gmt_create", hisInquirysVO.getStartDate());
+        inquiryInfoQe.le(hisInquirysVO.getEndDate()!=null, "gmt_create", hisInquirysVO.getEndDate());
+        
+        if(hisInquirysVO.getOrderType()==null||hisInquirysVO.getOrderType()==1) {
+        	inquiryInfoQe.orderByDesc("gmt_modified");
+        }else if(hisInquirysVO.getOrderType()==2){
+        	inquiryInfoQe.orderByAsc("gmt_modified");
+        }else if(hisInquirysVO.getOrderType()==3){
+        	inquiryInfoQe.orderByDesc("inquiry_code");
+        }else if(hisInquirysVO.getOrderType()==4){
+        	inquiryInfoQe.orderByAsc("inquiry_code");
+        }
+
+        List<HisInquiryDTO> hisInquiryDTOList = BeanUtil.listCopyTo(list(inquiryInfoQe), HisInquiryDTO.class);
+        hisInquiryDTOList.forEach(i->{
+        	i.setPatientSexMsg(SexEnum.getName(i.getPatientSex()));
+        	i.setInquiryDate(i.getGmtModified());
+        	i.setInquiryTime(i.getGmtModified());
+        	i.setPatientAge(DateUtil.yearCompare(i.getPatientBirthday(), DateUtil.now()));
+        });
+
+        return hisInquiryDTOList;
+    }
+	
+    /**
+     * 病历详情
+     * @param getInquiryDetailVO
+     * @return
+     */
+    public GetInquiryDetailDTO getInquiryDetail(GetInquiryDetailVO getInquiryDetailVO) {
+    	if(getInquiryDetailVO.getHospitalId()==null&&StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())){
+    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医院信息(医院id或者医院编码)必传！");
+    	}
+    	if(getInquiryDetailVO.getHospitalDeptId()==null&&StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())){
+    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"科室信息(科室id或者科室编码)必传！");
+    	}
+    	if(getInquiryDetailVO.getDoctorId()==null&&StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())){
+    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"医生信息(医生id或者医生编码)必传！");
+    	}
+    	if(getInquiryDetailVO.getPatientId()==null&&StringUtil.isBlank(getInquiryDetailVO.getPatientCode())&&StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())){
+    		throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"患者信息(患者id或者患者编码或者患者病历号)必传！");
+    	}
+    	
+    	QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<InquiryInfo>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalId()!=null, "hospital_id", getInquiryDetailVO.getHospitalId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()), "hospital_code", getInquiryDetailVO.getHospitalCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId()!=null, "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalDeptCode()), "hospital_dept_code", getInquiryDetailVO.getHospitalDeptCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getDoctorId()!=null, "doctor_id", getInquiryDetailVO.getDoctorId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getDoctorCode()), "doctor_code", getInquiryDetailVO.getDoctorCode());
+        inquiryInfoQe.eq(getInquiryDetailVO.getPatientId()!=null, "patient_id", getInquiryDetailVO.getPatientId());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientCode()), "patient_code", getInquiryDetailVO.getPatientCode());
+        inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getPatientIdNo()), "patient_id_no", getInquiryDetailVO.getPatientIdNo());
+        inquiryInfoQe.eq("inquiry_code", getInquiryDetailVO.getInquiryCode());
+        
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        
+        QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+    	inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
+    	inquiryDetailQe.orderByAsc("type");
+    	List<InquiryDetail> inquiryDetailList = inquiryDetailFacade.list(inquiryDetailQe);
+    	
+    	QueryWrapper<InquiryReport> inquiryReportQe = new QueryWrapper<>();
+    	inquiryReportQe.eq("inquiry_id", inquiryInfo.getId());
+    	inquiryReportQe.orderByAsc("order_num");
+    	List<InquiryReport> inquiryReportList = inquiryReportFacade.list(inquiryReportQe);
+    	
+    	QueryWrapper<InquiryEvaluator> inquiryEvaluatorQe = new QueryWrapper<>();
+    	inquiryEvaluatorQe.eq("inquiry_id", inquiryInfo.getId());
+    	inquiryEvaluatorQe.orderByDesc("gmt_modified");
+    	inquiryEvaluatorQe.last("limit 0,1");
+    	List<InquiryEvaluator> inquiryEvaluatorList = inquiryEvaluatorFacade.list(inquiryEvaluatorQe);
+    	
+        GetInquiryDetailDTO getInquiryDetailDTO = new GetInquiryDetailDTO();
+        BeanUtil.copyProperties(inquiryInfo, getInquiryDetailDTO);
+        getInquiryDetailDTO.setPatientSexMsg(SexEnum.getName(inquiryInfo.getPatientSex()));
+        getInquiryDetailDTO.setInquiryDate(inquiryInfo.getGmtModified());
+        getInquiryDetailDTO.setInquiryTime(inquiryInfo.getGmtModified());
+        getInquiryDetailDTO.setPatientAge(DateUtil.yearCompare(inquiryInfo.getPatientBirthday(), DateUtil.now()));
+        
+        getInquiryDetailDTO.setChiefComplaint(inquiryDetailList.get(0).getContentValue());
+        getInquiryDetailDTO.setXbs(inquiryDetailList.get(1).getContentValue());
+        getInquiryDetailDTO.setQts(inquiryDetailList.get(2).getContentValue());
+        getInquiryDetailDTO.setSupplement(inquiryDetailList.get(3).getContentValue());
+        getInquiryDetailDTO.setPhysicalRes(ListUtil.isNotEmpty(inquiryEvaluatorList)?inquiryEvaluatorList.get(0).getPhysicalRes():null);
+        getInquiryDetailDTO.setImageList(BeanUtil.listCopyTo(inquiryReportList, GetInquiryDetailImgDTO.class));
+
+        return getInquiryDetailDTO;
+    }
 
 }

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

@@ -1,11 +1,13 @@
 package com.diagbot.vo;
 
 import java.math.BigDecimal;
+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;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,7 +31,7 @@ public class AddEvaluatorVO {
 	@NotNull(message="医院id必传")
     private Long hospitalId;
 	
-    /**
+	/**
      * 医院编码
      */
 	@ApiModelProperty(value="医院编码",required=true)
@@ -37,11 +39,32 @@ public class AddEvaluatorVO {
     private String hospitalCode;
 
     /**
-     * 科室id
+     * 医院名称
+     */
+	@ApiModelProperty(value="医院名称",required=true)
+	@NotBlank(message="医院名称必传")
+    private String hospitalName;
+
+    /**
+     * 医院科室id
      */
 	@ApiModelProperty(value="科室id",required=true)
 	@NotNull(message="科室id必传")
     private Long hospitalDeptId;
+	
+	/**
+     * 医院科室编码
+     */
+	@ApiModelProperty(value="医院科室编码",required=true)
+	@NotBlank(message="医院科室编码必传")
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+	@ApiModelProperty(value="医院科室名称",required=true)
+	@NotBlank(message="医院科室名称必传")
+    private String hospitalDeptName;
 
     /**
      * 医生id
@@ -49,6 +72,20 @@ public class AddEvaluatorVO {
 	@ApiModelProperty(value="医生id",required=true)
 	@NotNull(message="医生id必传")
     private Long doctorId;
+	
+	/**
+     * 医生编码
+     */
+	@ApiModelProperty(value="医生编码",required=true)
+	@NotBlank(message="医生编码必传")
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+	@ApiModelProperty(value="医生姓名",required=true)
+	@NotBlank(message="医生姓名必传")
+    private String doctorName;
 
     /**
      * 患者id
@@ -56,6 +93,47 @@ public class AddEvaluatorVO {
 	@ApiModelProperty(value="患者id",required=true)
 	@NotNull(message="患者id必传")
     private Long patientId;
+	
+	/**
+     * 患者编号
+     */
+	@ApiModelProperty(value="患者编号",required=true)
+	@NotBlank(message="患者编号必传")
+    private String patientCode;
+
+    /**
+     * 患者姓名
+     */
+	@ApiModelProperty(value="患者姓名",required=true)
+	@NotBlank(message="患者姓名必传")
+    private String patientName;
+
+    /**
+     * 患者性别：1男2女
+     */
+	@ApiModelProperty(value="患者性别：1男2女")
+    private Integer patientSex;
+
+    /**
+     * 患者联系电话
+     */
+	@ApiModelProperty(value="患者联系电话")
+    private String patientPhone;
+
+    /**
+     * 患者出生日期
+     */
+	@ApiModelProperty(value="患者出生日期，格式为：2018-11-28 17:25:30",required=true)
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	@NotNull(message="患者出生日期必传")
+    private Date patientBirthday;
+    
+    /**
+     * 患者证件号码(病历号)
+     */
+	@ApiModelProperty(value="患者证件号码(病历号)",required=true)
+	@NotBlank(message="患者证件号码(病历号)必传")
+    private String patientIdNo;
 
     /**
      * 就诊序列号

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

@@ -0,0 +1,81 @@
+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;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="病历详情接口传参")
+@Getter
+@Setter
+public class GetInquiryDetailVO {
+
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id")
+    private Long hospitalId;
+	
+	 /**
+     * 医院编码
+     */
+	@ApiModelProperty(value="医院编码")
+    private String hospitalCode;
+
+    /**
+     * 医院科室id
+     */
+	@ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医院科室编码
+     */
+	@ApiModelProperty(value="医院科室编码")
+    private String hospitalDeptCode;
+
+    /**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id")
+    private Long doctorId;
+	
+    /**
+     * 医生编码
+     */
+	@ApiModelProperty(value="医生编码")
+    private String doctorCode;
+
+    /**
+     * 患者id
+     */
+	@ApiModelProperty(value="患者id")
+    private Long patientId;
+	
+    /**
+     * 患者编号
+     */
+	@ApiModelProperty(value="患者编号")
+    private String patientCode;
+	
+    /**
+     * 患者病历号
+     */
+	@ApiModelProperty(value="患者病历号")
+    private String patientIdNo;
+	
+    /**
+     * 就诊序列号
+     */
+	@ApiModelProperty(value="就诊序列号",required=true)
+	@NotBlank(message="就诊序列号必传")
+    private String inquiryCode;
+	
+}

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

@@ -0,0 +1,104 @@
+package com.diagbot.vo;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="历史病历列表接口传参")
+@Getter
+@Setter
+public class HisInquirysVO {
+	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id")
+    private Long hospitalId;
+	
+	 /**
+     * 医院编码
+     */
+	@ApiModelProperty(value="医院编码")
+    private String hospitalCode;
+
+    /**
+     * 医院科室id
+     */
+	@ApiModelProperty(value="医院科室id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医院科室编码
+     */
+	@ApiModelProperty(value="医院科室编码")
+    private String hospitalDeptCode;
+
+    /**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id")
+    private Long doctorId;
+	
+    /**
+     * 医生编码
+     */
+	@ApiModelProperty(value="医生编码")
+    private String doctorCode;
+
+    /**
+     * 患者id
+     */
+	@ApiModelProperty(value="患者id")
+    private Long patientId;
+	
+    /**
+     * 患者编号
+     */
+	@ApiModelProperty(value="患者编号")
+    private String patientCode;
+	
+    /**
+     * 患者病历号
+     */
+	@ApiModelProperty(value="患者病历号")
+    private String patientIdNo;
+    
+    /**
+     * 病历分类(1:门诊,2:住院)
+     */
+	@ApiModelProperty(value="病历分类(1:门诊,2:住院)")
+    private Integer type;
+    
+	/**
+	 * 开始时间
+	 */
+	@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;
+	
+	/**
+	 * 排序类型：1、时间降序；2、时间升序；3、就诊号降序；4、就诊号升序； 
+	 */
+	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；3、就诊号降序；4、就诊号升序；")
+	private Integer orderType=1;
+	
+	
+	   
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.validation.Valid;
@@ -8,6 +9,7 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 import org.hibernate.validator.constraints.Range;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,13 +32,41 @@ public class SaveInquiryVO {
 	@ApiModelProperty(value="医院id",required=true)
 	@NotNull(message="医院id必传")
     private Long hospitalId;
+	
+	/**
+     * 医院编码
+     */
+	@ApiModelProperty(value="医院编码",required=true)
+	@NotBlank(message="医院编码必传")
+    private String hospitalCode;
 
     /**
-     * 科室id
+     * 医院名称
+     */
+	@ApiModelProperty(value="医院名称",required=true)
+	@NotBlank(message="医院名称必传")
+    private String hospitalName;
+
+    /**
+     * 医院科室id
      */
 	@ApiModelProperty(value="科室id",required=true)
 	@NotNull(message="科室id必传")
     private Long hospitalDeptId;
+	
+	/**
+     * 医院科室编码
+     */
+	@ApiModelProperty(value="医院科室编码",required=true)
+	@NotBlank(message="医院科室编码必传")
+    private String hospitalDeptCode;
+
+    /**
+     * 医院科室名称
+     */
+	@ApiModelProperty(value="医院科室名称",required=true)
+	@NotBlank(message="医院科室名称必传")
+    private String hospitalDeptName;
 
     /**
      * 医生id
@@ -44,6 +74,20 @@ public class SaveInquiryVO {
 	@ApiModelProperty(value="医生id",required=true)
 	@NotNull(message="医生id必传")
     private Long doctorId;
+	
+	/**
+     * 医生编码
+     */
+	@ApiModelProperty(value="医生编码",required=true)
+	@NotBlank(message="医生编码必传")
+    private String doctorCode;
+
+    /**
+     * 医生姓名
+     */
+	@ApiModelProperty(value="医生姓名",required=true)
+	@NotBlank(message="医生姓名必传")
+    private String doctorName;
 
     /**
      * 患者id
@@ -51,6 +95,47 @@ public class SaveInquiryVO {
 	@ApiModelProperty(value="患者id",required=true)
 	@NotNull(message="患者id必传")
     private Long patientId;
+	
+	/**
+     * 患者编号
+     */
+	@ApiModelProperty(value="患者编号",required=true)
+	@NotBlank(message="患者编号必传")
+    private String patientCode;
+
+    /**
+     * 患者姓名
+     */
+	@ApiModelProperty(value="患者姓名",required=true)
+	@NotBlank(message="患者姓名必传")
+    private String patientName;
+
+    /**
+     * 患者性别：1男2女
+     */
+	@ApiModelProperty(value="患者性别：1男2女")
+    private Integer patientSex;
+
+    /**
+     * 患者联系电话
+     */
+	@ApiModelProperty(value="患者联系电话")
+    private String patientPhone;
+
+    /**
+     * 患者出生日期
+     */
+	@ApiModelProperty(value="患者出生日期，格式为：2018-11-28 17:25:30",required=true)
+	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	@NotNull(message="患者出生日期必传")
+    private Date patientBirthday;
+    
+    /**
+     * 患者证件号码(病历号)
+     */
+	@ApiModelProperty(value="患者证件号码(病历号)",required=true)
+	@NotBlank(message="患者证件号码(病历号)必传")
+    private String patientIdNo;
 
     /**
      * 就诊序列号

prec-service/src/main/java/com/diagbot/web/InquiryEvaluatorController.java

@@ -32,8 +32,8 @@ public class InquiryEvaluatorController {
     @PostMapping("/addEvaluator")
     @SysLogger("addEvaluator")
     @Transactional
-    public RespDTO<Boolean> addEvaluator(@Valid @RequestBody AddEvaluatorVO addDeptInfoVO){
-        return RespDTO.onSuc(inquiryEvaluatorFacade.addEvaluator(addDeptInfoVO));
+    public RespDTO<Boolean> addEvaluator(@Valid @RequestBody AddEvaluatorVO addEvaluatorVO){
+        return RespDTO.onSuc(inquiryEvaluatorFacade.addEvaluator(addEvaluatorVO));
     }
 
     @ApiOperation(value = "儿童体质辨识--体质计算")

prec-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -1,17 +1,26 @@
 package com.diagbot.web;
 
+import java.util.List;
+
 import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetInquiryDetailDTO;
+import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.GetInquiryDetailVO;
+import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.SaveInquiryVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -35,7 +44,20 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
+    
+    @ApiOperation(value = "历史病历列表[by:rengb]")
+    @PostMapping("/hisInquirys")
+    @SysLogger("hisInquirys")
+    public RespDTO<List<HisInquiryDTO>> hisInquirys(@Valid @RequestBody HisInquirysVO hisInquirysVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.hisInquirys(hisInquirysVO));
+    }
 
+    @ApiOperation(value = "病历详情[by:rengb]")
+    @PostMapping("/getInquiryDetail")
+    @SysLogger("getInquiryDetail")
+    public RespDTO<GetInquiryDetailDTO> getInquiryDetail(@Valid @RequestBody GetInquiryDetailVO getInquiryDetailVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.getInquiryDetail(getInquiryDetailVO));
+    }
 
 
 }

prec-service/src/main/resources/mapper/InquiryEvaluatorMapper.xml

@@ -11,7 +11,6 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="inquiry_id" property="inquiryId" />
-        <result column="hospital_code" property="hospitalCode" />
         <result column="mild_value" property="mildValue" />
         <result column="faint_value" property="faintValue" />
         <result column="wet_value" property="wetValue" />

prec-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -11,9 +11,21 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="hospital_id" property="hospitalId" />
+        <result column="hospital_code" property="hospitalCode" />
+        <result column="hospital_name" property="hospitalName" />
         <result column="hospital_dept_id" property="hospitalDeptId" />
+        <result column="hospital_dept_code" property="hospitalDeptCode" />
+        <result column="hospital_dept_name" property="hospitalDeptName" />
         <result column="doctor_id" property="doctorId" />
+        <result column="doctor_code" property="doctorCode" />
+        <result column="doctor_name" property="doctorName" />
         <result column="patient_id" property="patientId" />
+        <result column="patient_code" property="patientCode" />
+        <result column="patient_name" property="patientName" />
+        <result column="patient_sex" property="patientSex" />
+        <result column="patient_phone" property="patientPhone" />
+        <result column="patient_birthday" property="patientBirthday" />
+        <result column="patient_id_no" property="patientIdNo" />
         <result column="inquiry_code" property="inquiryCode" />
         <result column="reg_visited_state" property="regVisitedState" />
         <result column="type" property="type" />

prec-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "prec_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "prec_inquiry_info","prec_inquiry_detail","prec_inquiry_evaluator","prec_inquiry_report" }); // 需要生成的表
+        strategy.setInclude(new String[] { "prec_inquiry_info","prec_inquiry_evaluator" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);