Merge remote-tracking branch 'origin/develop' into dev/20200731_1.4.0

src/main/java/com/diagbot/entity/MedLisInfo.java

@@ -0,0 +1,258 @@
+package com.diagbot.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public class MedLisInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告类型代码
+     */
+    private String repType;
+
+    /**
+     * 报告名称
+     */
+    private String repName;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 标本名称
+     */
+    private String slideType;
+
+    /**
+     * 发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getRepType() {
+        return repType;
+    }
+
+    public void setRepType(String repType) {
+        this.repType = repType;
+    }
+    public String getRepName() {
+        return repName;
+    }
+
+    public void setRepName(String repName) {
+        this.repName = repName;
+    }
+    public String getRepTypeName() {
+        return repTypeName;
+    }
+
+    public void setRepTypeName(String repTypeName) {
+        this.repTypeName = repTypeName;
+    }
+    public String getSlideType() {
+        return slideType;
+    }
+
+    public void setSlideType(String slideType) {
+        this.slideType = slideType;
+    }
+    public String getRepDate() {
+        return repDate;
+    }
+
+    public void setRepDate(String repDate) {
+        this.repDate = repDate;
+    }
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getRegisterFlag() {
+        return registerFlag;
+    }
+
+    public void setRegisterFlag(String registerFlag) {
+        this.registerFlag = registerFlag;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedLisInfo{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", repType=" + repType +
+            ", repName=" + repName +
+            ", repTypeName=" + repTypeName +
+            ", slideType=" + slideType +
+            ", repDate=" + repDate +
+            ", checkDate=" + checkDate +
+            ", applyDoctor=" + applyDoctor +
+            ", deptId=" + deptId +
+            ", deptName=" + deptName +
+            ", registerFlag=" + registerFlag +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedLisResult.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import lombok.Data;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
-@Data
 public class MedLisResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -21,7 +18,7 @@ public class MedLisResult implements Serializable {
     /**
      * 报告单号
      */
-    private Integer reptNo;
+    private String reptNo;
 
     /**
      * 医院ID
@@ -48,6 +45,11 @@ public class MedLisResult implements Serializable {
      */
     private String result;
 
+    /**
+     * 参考值
+     */
+    private String reference;
+
     /**
      * 最小参考值
      */
@@ -81,12 +83,12 @@ public class MedLisResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -97,4 +99,147 @@ public class MedLisResult implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
+
+    public String getReptNo() {
+        return reptNo;
+    }
+
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
+    }
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+    public String getReferenceMin() {
+        return referenceMin;
+    }
+
+    public void setReferenceMin(String referenceMin) {
+        this.referenceMin = referenceMin;
+    }
+    public String getReferenceMax() {
+        return referenceMax;
+    }
+
+    public void setReferenceMax(String referenceMax) {
+        this.referenceMax = referenceMax;
+    }
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+    public String getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(String abnormal) {
+        this.abnormal = abnormal;
+    }
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedLisResult{" +
+            "reptNo=" + reptNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", itemCode=" + itemCode +
+            ", itemName=" + itemName +
+            ", result=" + result +
+            ", reference=" + reference +
+            ", referenceMin=" + referenceMin +
+            ", referenceMax=" + referenceMax +
+            ", unit=" + unit +
+            ", abnormal=" + abnormal +
+            ", color=" + color +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
 }

src/main/java/com/diagbot/entity/MedPacsInfo.java

@@ -0,0 +1,297 @@
+package com.diagbot.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public class MedPacsInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告名称
+     */
+    private String repName;
+
+    /**
+     * 报告类型代码
+     */
+    private String repType;
+
+    /**
+     * 检查类型名称
+     */
+    private String repTypeName;
+
+    /**
+     * 检查部位
+     */
+    private String part;
+
+    /**
+     * 发布时间
+     */
+    private String repDate;
+
+    /**
+     * 报告检查时间
+     */
+    private String checkDate;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 开单科室代码
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 报告单状态
+     */
+    private String registerFlag;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 报告审核医生
+     */
+    private String checker;
+
+    /**
+     * 云胶片地址
+     */
+    private String yjpdz;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getRepName() {
+        return repName;
+    }
+
+    public void setRepName(String repName) {
+        this.repName = repName;
+    }
+    public String getRepType() {
+        return repType;
+    }
+
+    public void setRepType(String repType) {
+        this.repType = repType;
+    }
+    public String getRepTypeName() {
+        return repTypeName;
+    }
+
+    public void setRepTypeName(String repTypeName) {
+        this.repTypeName = repTypeName;
+    }
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+    public String getRepDate() {
+        return repDate;
+    }
+
+    public void setRepDate(String repDate) {
+        this.repDate = repDate;
+    }
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getRegisterFlag() {
+        return registerFlag;
+    }
+
+    public void setRegisterFlag(String registerFlag) {
+        this.registerFlag = registerFlag;
+    }
+    public String getReportDoctor() {
+        return reportDoctor;
+    }
+
+    public void setReportDoctor(String reportDoctor) {
+        this.reportDoctor = reportDoctor;
+    }
+    public String getChecker() {
+        return checker;
+    }
+
+    public void setChecker(String checker) {
+        this.checker = checker;
+    }
+    public String getYjpdz() {
+        return yjpdz;
+    }
+
+    public void setYjpdz(String yjpdz) {
+        this.yjpdz = yjpdz;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedPacsInfo{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", repName=" + repName +
+            ", repType=" + repType +
+            ", repTypeName=" + repTypeName +
+            ", part=" + part +
+            ", repDate=" + repDate +
+            ", checkDate=" + checkDate +
+            ", applyDoctor=" + applyDoctor +
+            ", deptId=" + deptId +
+            ", deptName=" + deptName +
+            ", registerFlag=" + registerFlag +
+            ", reportDoctor=" + reportDoctor +
+            ", checker=" + checker +
+            ", yjpdz=" + yjpdz +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedPacsResult.java

@@ -1,9 +1,7 @@
 package com.diagbot.entity;
 
-import lombok.Data;
-
+import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -11,9 +9,8 @@ import java.util.Date;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
-@Data
 public class MedPacsResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -91,12 +88,12 @@ public class MedPacsResult implements Serializable {
     /**
      * 记录创建时间
      */
-    private Date gmtCreate;
+    private LocalDateTime gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private Date gmtModified;
+    private LocalDateTime gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -107,4 +104,155 @@ public class MedPacsResult implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
+
+    public String getReptNo() {
+        return reptNo;
+    }
+
+    public void setReptNo(String reptNo) {
+        this.reptNo = reptNo;
+    }
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getReptName() {
+        return reptName;
+    }
+
+    public void setReptName(String reptName) {
+        this.reptName = reptName;
+    }
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+    public String getClinicSight() {
+        return clinicSight;
+    }
+
+    public void setClinicSight(String clinicSight) {
+        this.clinicSight = clinicSight;
+    }
+    public String getReptDiag() {
+        return reptDiag;
+    }
+
+    public void setReptDiag(String reptDiag) {
+        this.reptDiag = reptDiag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getClinicDiag() {
+        return clinicDiag;
+    }
+
+    public void setClinicDiag(String clinicDiag) {
+        this.clinicDiag = clinicDiag;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getCheckerDoctor() {
+        return checkerDoctor;
+    }
+
+    public void setCheckerDoctor(String checkerDoctor) {
+        this.checkerDoctor = checkerDoctor;
+    }
+    public String getReportDoctor() {
+        return reportDoctor;
+    }
+
+    public void setReportDoctor(String reportDoctor) {
+        this.reportDoctor = reportDoctor;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "MedPacsResult{" +
+            "reptNo=" + reptNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", reptName=" + reptName +
+            ", part=" + part +
+            ", clinicSight=" + clinicSight +
+            ", reptDiag=" + reptDiag +
+            ", remark=" + remark +
+            ", clinicDiag=" + clinicDiag +
+            ", applyDoctor=" + applyDoctor +
+            ", checkerDoctor=" + checkerDoctor +
+            ", reportDoctor=" + reportDoctor +
+            ", deptName=" + deptName +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
 }

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -28,7 +28,9 @@ import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.entity.HomePage;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.entity.MedCrisisInfo;
+import com.diagbot.entity.MedLisInfo;
 import com.diagbot.entity.MedLisResult;
+import com.diagbot.entity.MedPacsInfo;
 import com.diagbot.entity.MedPacsResult;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.enums.IsDeleteEnum;
@@ -118,8 +120,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     private FilterFacade filterFacade;
     @Autowired
+    MedLisInfoFacade medLisInfoFacade;
+    @Autowired
     MedLisResultFacade medLisResultFacade;
     @Autowired
+    MedPacsInfoFacade medPacsInfoFacade;
+    @Autowired
     MedPacsResultFacade medPacsResultFacade;
     @Autowired
     MedCrisisInfoFacade medCrisisInfoFacade;
@@ -290,20 +296,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
         );
 
-        // 化验
-        List<MedLisResult> medLisResultList = medLisResultFacade.list(new QueryWrapper<MedLisResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .eq("behospital_code", analyzeVO.getBehospitalCode())
-        );
-
-        // 辅检
-        List<MedPacsResult> medPacsResultList = medPacsResultFacade.list(new QueryWrapper<MedPacsResult>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_id", hospitalId)
-                .eq("behospital_code", analyzeVO.getBehospitalCode())
-        );
-
         // 获取病案首页
         HomePage homePage = homePageFacade.getOne(new QueryWrapper<HomePage>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -359,6 +351,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             queryVo.setBehospitalInfo(behospitalInfoList.get(0));
         }
 
+        // 化验
+        List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
+        // 辅检
+        List<MedPacsResult> medPacsResultList = getMedPacsResultList(behospitalInfoList.get(0));
+
         // 会诊记录
         addDataWithKey("会诊", recMap, medrecVoList,
                 Arrays.asList("会诊记录", "会诊结果单", "会诊申请单"));
@@ -426,6 +423,101 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return queryVo;
     }
 
+    private List<MedLisResult> getMedLisResultList(BehospitalInfo behospitalInfo) {
+        String behospitalDate = null, leaveHospitalDate = null;
+        try {
+            behospitalDate = DateUtil.format(behospitalInfo.getBehospitalDate(), DateUtil.DATE_TIME_FORMAT);
+            leaveHospitalDate = DateUtil.format(behospitalInfo.getLeaveHospitalDate(), DateUtil.DATE_TIME_FORMAT);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        if (StringUtil.isBlank(behospitalDate)) {
+            return null;
+        }
+        List<MedLisResult> medLisResultList = null;
+        QueryWrapper<MedLisInfo> medLisInfoQe = new QueryWrapper<>();
+        medLisInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        medLisInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
+        medLisInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medLisInfoQe.isNotNull("rep_name");
+        medLisInfoQe.isNotNull("check_date");
+        medLisInfoQe.apply("check_date!=''");
+        medLisInfoQe.apply(
+                "date_format (check_date,'%Y-%m-%d %H:%i:%s') >= date_format('"
+                        + behospitalDate
+                        + "','%Y-%m-%d %H:%i:%s')"
+        );
+        if (StringUtil.isNotBlank(behospitalInfo.getIsPlacefile())
+                && behospitalInfo.getIsPlacefile().equals("1")
+                && StringUtil.isNotBlank(leaveHospitalDate)) {
+            medLisInfoQe.apply(
+                    "date_format (check_date,'%Y-%m-%d %H:%i:%s') <= date_format('"
+                            + leaveHospitalDate
+                            + "','%Y-%m-%d %H:%i:%s')"
+            );
+        }
+        medLisInfoQe.select("rep_no", "rep_name");
+        List<MedLisInfo> medLisInfoList = medLisInfoFacade.list(medLisInfoQe);
+        if (ListUtil.isNotEmpty(medLisInfoList)) {
+            Map<String, String> repNoRepNameMap = medLisInfoList.stream().collect(Collectors.toMap(i -> i.getRepNo(), i -> i.getRepName()));
+            medLisResultList = medLisResultFacade.list(new QueryWrapper<MedLisResult>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", behospitalInfo.getHospitalId())
+                    .eq("behospital_code", behospitalInfo.getFileCode())
+                    .isNotNull("item_name")
+                    .in("rept_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
+            );
+            medLisResultList.forEach(medLisResult -> {
+                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getReptNo()) + "=" + medLisResult.getItemName());
+            });
+        }
+        return medLisResultList;
+    }
+
+    private List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo) {
+        String behospitalDate = null, leaveHospitalDate = null;
+        try {
+            behospitalDate = DateUtil.format(behospitalInfo.getBehospitalDate(), DateUtil.DATE_TIME_FORMAT);
+            leaveHospitalDate = DateUtil.format(behospitalInfo.getLeaveHospitalDate(), DateUtil.DATE_TIME_FORMAT);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        if (StringUtil.isBlank(behospitalDate)) {
+            return null;
+        }
+        List<MedPacsResult> medPacsResultList = null;
+        QueryWrapper<MedPacsInfo> medPacsInfoQe = new QueryWrapper<>();
+        medPacsInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        medPacsInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
+        medPacsInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medPacsInfoQe.isNotNull("check_date");
+        medPacsInfoQe.apply("check_date!=''");
+        medPacsInfoQe.apply(
+                "date_format (check_date,'%Y-%m-%d %H:%i:%s') >= date_format('"
+                        + behospitalDate
+                        + "','%Y-%m-%d %H:%i:%s')"
+        );
+        if (StringUtil.isNotBlank(behospitalInfo.getIsPlacefile())
+                && behospitalInfo.getIsPlacefile().equals("1")
+                && StringUtil.isNotBlank(leaveHospitalDate)) {
+            medPacsInfoQe.apply(
+                    "date_format (check_date,'%Y-%m-%d %H:%i:%s') <= date_format('"
+                            + leaveHospitalDate
+                            + "','%Y-%m-%d %H:%i:%s')"
+            );
+        }
+        List<MedPacsInfo> medPacsInfoList = medPacsInfoFacade.list(medPacsInfoQe);
+        if (ListUtil.isNotEmpty(medPacsInfoList)) {
+            medPacsResultList = medPacsResultFacade.list(new QueryWrapper<MedPacsResult>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", behospitalInfo.getHospitalId())
+                    .eq("behospital_code", behospitalInfo.getFileCode())
+                    .in("rept_no", medPacsInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
+            );
+        }
+        return medPacsResultList;
+    }
+
     /**
      * 评分-终末质控
      *

src/main/java/com/diagbot/facade/MedLisInfoFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedLisInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/7/28 15:48
+ */
+@Component
+public class MedLisInfoFacade extends MedLisInfoServiceImpl {
+}

src/main/java/com/diagbot/facade/MedPacsInfoFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.MedPacsInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/7/28 15:49
+ */
+@Component
+public class MedPacsInfoFacade extends MedPacsInfoServiceImpl {
+}

src/main/java/com/diagbot/mapper/MedLisInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedLisInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
+
+}

src/main/java/com/diagbot/mapper/MedLisResultMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
 

src/main/java/com/diagbot/mapper/MedPacsInfoMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedPacsInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public interface MedPacsInfoMapper extends BaseMapper<MedPacsInfo> {
+
+}

src/main/java/com/diagbot/mapper/MedPacsResultMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
 

src/main/java/com/diagbot/service/MedLisInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedLisInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public interface MedLisInfoService extends IService<MedLisInfo> {
+
+}

src/main/java/com/diagbot/service/MedLisResultService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 public interface MedLisResultService extends IService<MedLisResult> {
 

src/main/java/com/diagbot/service/MedPacsInfoService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedPacsInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public interface MedPacsInfoService extends IService<MedPacsInfo> {
+
+}

src/main/java/com/diagbot/service/MedPacsResultService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 public interface MedPacsResultService extends IService<MedPacsResult> {
 

src/main/java/com/diagbot/service/impl/MedLisInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedLisInfo;
+import com.diagbot.mapper.MedLisInfoMapper;
+import com.diagbot.service.MedLisInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+@Service
+public class MedLisInfoServiceImpl extends ServiceImpl<MedLisInfoMapper, MedLisInfo> implements MedLisInfoService {
+
+}

src/main/java/com/diagbot/service/impl/MedLisResultServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 @Service
 public class MedLisResultServiceImpl extends ServiceImpl<MedLisResultMapper, MedLisResult> implements MedLisResultService {

src/main/java/com/diagbot/service/impl/MedPacsInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedPacsInfo;
+import com.diagbot.mapper.MedPacsInfoMapper;
+import com.diagbot.service.MedPacsInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+@Service
+public class MedPacsInfoServiceImpl extends ServiceImpl<MedPacsInfoMapper, MedPacsInfo> implements MedPacsInfoService {
+
+}

src/main/java/com/diagbot/service/impl/MedPacsResultServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author zhoutg
- * @since 2020-06-28
+ * @since 2020-07-28
  */
 @Service
 public class MedPacsResultServiceImpl extends ServiceImpl<MedPacsResultMapper, MedPacsResult> implements MedPacsResultService {

src/main/resources/mapper/MedLisInfoMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.MedLisInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisInfo">
+        <id column="rep_no" property="repNo" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="rep_type" property="repType" />
+        <result column="rep_name" property="repName" />
+        <result column="rep_type_name" property="repTypeName" />
+        <result column="slide_type" property="slideType" />
+        <result column="rep_date" property="repDate" />
+        <result column="check_date" property="checkDate" />
+        <result column="apply_doctor" property="applyDoctor" />
+        <result column="dept_id" property="deptId" />
+        <result column="dept_name" property="deptName" />
+        <result column="register_flag" property="registerFlag" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+    </resultMap>
+
+</mapper>

src/main/resources/mapper/MedLisResultMapper.xml

@@ -4,12 +4,13 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedLisResult">
-        <id column="rept_no" property="reptNo" />
+        <result column="rept_no" property="reptNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="item_code" property="itemCode" />
         <result column="item_name" property="itemName" />
         <result column="result" property="result" />
+        <result column="reference" property="reference" />
         <result column="reference_min" property="referenceMin" />
         <result column="reference_max" property="referenceMax" />
         <result column="unit" property="unit" />

src/main/resources/mapper/MedPacsInfoMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.MedPacsInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsInfo">
+        <id column="rep_no" property="repNo" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="rep_name" property="repName" />
+        <result column="rep_type" property="repType" />
+        <result column="rep_type_name" property="repTypeName" />
+        <result column="part" property="part" />
+        <result column="rep_date" property="repDate" />
+        <result column="check_date" property="checkDate" />
+        <result column="apply_doctor" property="applyDoctor" />
+        <result column="dept_id" property="deptId" />
+        <result column="dept_name" property="deptName" />
+        <result column="register_flag" property="registerFlag" />
+        <result column="report_doctor" property="reportDoctor" />
+        <result column="checker" property="checker" />
+        <result column="yjpdz" property="yjpdz" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+    </resultMap>
+
+</mapper>

src/main/resources/mapper/MedPacsResultMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.MedPacsResult">
-        <id column="rept_no" property="reptNo" />
+        <result column="rept_no" property="reptNo" />
         <result column="hospital_id" property="hospitalId" />
         <result column="behospital_code" property="behospitalCode" />
         <result column="rept_name" property="reptName" />