Browse Source

Merge remote-tracking branch 'origin/master'

wangfeng 5 năm trước cách đây
mục cha
commit
2e7a9bba76
56 tập tin đã thay đổi với 2033 bổ sung8 xóa
  1. 2 2
      src/main/java/com/diagbot/config/SwaggerConfigurer.java
  2. 101 0
      src/main/java/com/diagbot/dto/BehospitalInfoDTO.java
  3. 28 0
      src/main/java/com/diagbot/dto/OutputInfo.java
  4. 147 0
      src/main/java/com/diagbot/entity/BehospitalInfo.java
  5. 111 0
      src/main/java/com/diagbot/entity/MedRecordType.java
  6. 1 1
      src/main/java/com/diagbot/entity/QcCases.java
  7. 139 0
      src/main/java/com/diagbot/entity/QcType.java
  8. 153 0
      src/main/java/com/diagbot/entity/QcTypeCasesEntry.java
  9. 167 0
      src/main/java/com/diagbot/entity/QcTypeDoc.java
  10. 79 0
      src/main/java/com/diagbot/entity/QcresultDetail.java
  11. 84 0
      src/main/java/com/diagbot/entity/QcresultInfo.java
  12. 9 0
      src/main/java/com/diagbot/facade/BasHospitalInfoFaccade.java
  13. 69 0
      src/main/java/com/diagbot/facade/BehospitalInfoFacade.java
  14. 118 0
      src/main/java/com/diagbot/facade/ConsoleFacade.java
  15. 1 1
      src/main/java/com/diagbot/facade/QcCasesFacade.java
  16. 13 0
      src/main/java/com/diagbot/facade/QcresultInfoFacade.java
  17. 20 0
      src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java
  18. 16 0
      src/main/java/com/diagbot/mapper/MedRecordTypeMapper.java
  19. 1 1
      src/main/java/com/diagbot/mapper/QcCasesMapper.java
  20. 16 0
      src/main/java/com/diagbot/mapper/QcTypeCasesEntryMapper.java
  21. 16 0
      src/main/java/com/diagbot/mapper/QcTypeDocMapper.java
  22. 16 0
      src/main/java/com/diagbot/mapper/QcTypeMapper.java
  23. 17 0
      src/main/java/com/diagbot/mapper/QcresultDetailMapper.java
  24. 17 0
      src/main/java/com/diagbot/mapper/QcresultInfoMapper.java
  25. 20 0
      src/main/java/com/diagbot/service/BehospitalInfoService.java
  26. 16 0
      src/main/java/com/diagbot/service/MedRecordTypeService.java
  27. 1 1
      src/main/java/com/diagbot/service/QcCasesService.java
  28. 16 0
      src/main/java/com/diagbot/service/QcTypeCasesEntryService.java
  29. 16 0
      src/main/java/com/diagbot/service/QcTypeDocService.java
  30. 16 0
      src/main/java/com/diagbot/service/QcTypeService.java
  31. 17 0
      src/main/java/com/diagbot/service/QcresultDetailService.java
  32. 17 0
      src/main/java/com/diagbot/service/QcresultInfoService.java
  33. 27 0
      src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java
  34. 20 0
      src/main/java/com/diagbot/service/impl/MedRecordTypeServiceImpl.java
  35. 1 1
      src/main/java/com/diagbot/service/impl/QcCasesServiceImpl.java
  36. 20 0
      src/main/java/com/diagbot/service/impl/QcTypeCasesEntryServiceImpl.java
  37. 20 0
      src/main/java/com/diagbot/service/impl/QcTypeDocServiceImpl.java
  38. 20 0
      src/main/java/com/diagbot/service/impl/QcTypeServiceImpl.java
  39. 21 0
      src/main/java/com/diagbot/service/impl/QcresultDetailServiceImpl.java
  40. 21 0
      src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java
  41. 65 0
      src/main/java/com/diagbot/vo/BehospitalPageVO.java
  42. 21 0
      src/main/java/com/diagbot/vo/MedrecVo.java
  43. 26 0
      src/main/java/com/diagbot/vo/QueryVo.java
  44. 17 0
      src/main/java/com/diagbot/vo/TokenVO.java
  45. 42 0
      src/main/java/com/diagbot/web/BehospitalInfoController.java
  46. 36 0
      src/main/java/com/diagbot/web/ConsoleController.java
  47. 20 0
      src/main/java/com/diagbot/web/QcresultDetailController.java
  48. 20 0
      src/main/java/com/diagbot/web/QcresultInfoController.java
  49. 64 0
      src/main/resources/mapper/BehospitalInfoMapper.xml
  50. 16 0
      src/main/resources/mapper/MedRecordTypeMapper.xml
  51. 18 0
      src/main/resources/mapper/QcTypeCasesEntryMapper.xml
  52. 19 0
      src/main/resources/mapper/QcTypeDocMapper.xml
  53. 17 0
      src/main/resources/mapper/QcTypeMapper.xml
  54. 20 0
      src/main/resources/mapper/QcresultDetailMapper.xml
  55. 21 0
      src/main/resources/mapper/QcresultInfoMapper.xml
  56. 1 1
      src/test/java/com/diagbot/CodeGeneration.java

+ 2 - 2
src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -59,8 +59,8 @@ public class SwaggerConfigurer {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title(" feedback-service api ")
-                .description("feedback-service 微服务")
+                .title("病历质控系统 api ")
+                .description("病历质控系统服务")
                 .termsOfServiceUrl("")
                 .contact(new Contact("diagbot","",""))
                 .version("1.0")

+ 101 - 0
src/main/java/com/diagbot/dto/BehospitalInfoDTO.java

@@ -0,0 +1,101 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class BehospitalInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 床位号
+     */
+    private String bedCode;
+
+    /**
+     * 入院时间
+     */
+    private Date behospitalDate;
+
+    /**
+     * 出院时间
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 疾病名称
+     */
+    private String diagnose;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 病历等级
+     */
+    private String level;
+
+    /**
+     * 最后得分
+     */
+    private String scoreRes;
+
+    /**
+     * 评分类型(1:机器,2:人工)
+     */
+    private String gradeType;
+
+}

+ 28 - 0
src/main/java/com/diagbot/dto/OutputInfo.java

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName : OutputInfo
+ * @Description : 返回对象
+ * @Author : 楼辉荣
+ * @Date: 2020-03-04 15:50
+ */
+@Setter
+@Getter
+public class OutputInfo {
+    /**
+     * 如
+     * {
+     * "BEH001":{"status":"-1", "info": "发热"}
+     * }
+     */
+    private Map<String, Map<String, String>> result = new HashMap<>();
+    //后结构化数据
+    private Map<String, Object> pageData = new HashMap<>();
+
+}

+ 147 - 0
src/main/java/com/diagbot/entity/BehospitalInfo.java

@@ -0,0 +1,147 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_behospital_info")
+@Data
+public class BehospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 病区编码
+     */
+    private String wardCode;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /**
+     * 住院科室ID
+     */
+    private String behDeptId;
+
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 床位号
+     */
+    private String bedCode;
+
+    /**
+     * 床位名称
+     */
+    private String bedName;
+
+    /**
+     * 医保类别
+     */
+    private String insuranceName;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 入院时间
+     */
+    private Date behospitalDate;
+
+    /**
+     * 出院时间
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 疾病ICD编码
+     */
+    private String diagnoseIcd;
+
+    /**
+     * 疾病名称
+     */
+    private String diagnose;
+
+    /**
+     * 医生ID
+     */
+    private String doctorId;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

+ 111 - 0
src/main/java/com/diagbot/entity/MedRecordType.java

@@ -0,0 +1,111 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public class MedRecordType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别ID
+     */
+    private String typeId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 类别名称
+     */
+    private String typeName;
+
+    /**
+     * 上级类别
+     */
+    private String parentTypeId;
+
+    /**
+     * 服务对象(全院、科室、个人)
+     */
+    private String objName;
+
+    /**
+     * 拼音
+     */
+    private String spell;
+
+    private String remark;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MedRecordType{" +
+            "typeId=" + typeId +
+            ", hospitalId=" + hospitalId +
+            ", typeName=" + typeName +
+            ", parentTypeId=" + parentTypeId +
+            ", objName=" + objName +
+            ", spell=" + spell +
+            ", remark=" + remark +
+        "}";
+    }
+}

+ 1 - 1
src/main/java/com/diagbot/entity/QcCases.java

@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 病历
+ * 模块数据标准
  * </p>
  *
  * @author gaodm

+ 139 - 0
src/main/java/com/diagbot/entity/QcType.java

@@ -0,0 +1,139 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 质控类型标准
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public class QcType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 质控类型名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 "QcType{" +
+                "id=" + id +
+                ", name=" + name +
+                ", remark=" + remark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

+ 153 - 0
src/main/java/com/diagbot/entity/QcTypeCasesEntry.java

@@ -0,0 +1,153 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 质控类型和质控条目关联表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public class QcTypeCasesEntry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 质控类型ID
+     */
+    private Long typeId;
+
+    /**
+     * 条目数据ID
+     */
+    private Long caseEntryId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public Long getCaseEntryId() {
+        return caseEntryId;
+    }
+
+    public void setCaseEntryId(Long caseEntryId) {
+        this.caseEntryId = caseEntryId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 "QcTypeCasesEntry{" +
+                "id=" + id +
+                ", typeId=" + typeId +
+                ", caseEntryId=" + caseEntryId +
+                ", remark=" + remark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

+ 167 - 0
src/main/java/com/diagbot/entity/QcTypeDoc.java

@@ -0,0 +1,167 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 质控类型和医院文书类型关联表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public class QcTypeDoc implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 质控类型ID(qc_type.id)
+     */
+    private Long typeId;
+
+    /**
+     * 医院文书类型的类型id(med_record_type.type_id)
+     */
+    private Long hospitalTypeId;
+
+    /**
+     * 医院文书类型的医院ID(med_record_type.hospital_id)
+     */
+    private Long hospitalId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Long typeId) {
+        this.typeId = typeId;
+    }
+
+    public Long getHospitalTypeId() {
+        return hospitalTypeId;
+    }
+
+    public void setHospitalTypeId(Long hospitalTypeId) {
+        this.hospitalTypeId = hospitalTypeId;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 "QcTypeDoc{" +
+                "id=" + id +
+                ", typeId=" + typeId +
+                ", hospitalTypeId=" + hospitalTypeId +
+                ", hospitalId=" + hospitalId +
+                ", remark=" + remark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

+ 79 - 0
src/main/java/com/diagbot/entity/QcresultDetail.java

@@ -0,0 +1,79 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_qcresult_detail")
+@Data
+public class QcresultDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 人工修改分值
+     */
+    private String score;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 84 - 0
src/main/java/com/diagbot/entity/QcresultInfo.java

@@ -0,0 +1,84 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 质控评分结果信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_qcresult_info")
+@Data
+public class QcresultInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 等级
+     */
+    private String level;
+
+    /**
+     * 评分类型
+     */
+    private Integer gradeType;
+
+    /**
+     * 最后得分
+     */
+    private String scoreRes;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 9 - 0
src/main/java/com/diagbot/facade/BasHospitalInfoFaccade.java

@@ -0,0 +1,9 @@
+package com.diagbot.facade;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/12 11:39
+ */
+public class BasHospitalInfoFaccade {
+}

+ 69 - 0
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -0,0 +1,69 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.BehospitalInfoDTO;
+import com.diagbot.service.impl.BehospitalInfoServiceImpl;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.BehospitalPageVO;
+import org.springframework.stereotype.Component;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/12 11:39
+ */
+@Component
+public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
+
+    public IPage<BehospitalInfoDTO> pageFac(BehospitalPageVO behospitalPageVO) {
+
+        behospitalPageVO.setHospitalId(SysUserUtils.getCurrentHospitalID());
+        IPage<BehospitalInfoDTO> res = getPage(behospitalPageVO);
+        List<BehospitalInfoDTO> behospitalInfoDTOList =  res.getRecords();
+        for (BehospitalInfoDTO behospitalInfo : behospitalInfoDTOList) {
+            if (behospitalInfo != null && behospitalInfo.getBirthday() != null) {
+                behospitalInfo.setAge(getAge(behospitalInfo.getBirthday()));
+            }
+        }
+        return res;
+    }
+
+
+    /**
+     * 通过日期计算年龄
+     *
+     * @param birthDay
+     * @return
+     */
+    public int getAge(Date birthDay){
+        Calendar cal = Calendar.getInstance();
+        if (cal.before(birthDay)) { //出生日期晚于当前时间,无法计算
+            return 0;
+//            throw new IllegalArgumentException(
+//                    "The birthDay is before Now.It's unbelievable!");
+        }
+        int yearNow = cal.get(Calendar.YEAR);  //当前年份
+        int monthNow = cal.get(Calendar.MONTH);  //当前月份
+        int dayOfMonthNow = cal.get(Calendar.DAY_OF_MONTH); //当前日期
+        cal.setTime(birthDay);
+        int yearBirth = cal.get(Calendar.YEAR);
+        int monthBirth = cal.get(Calendar.MONTH);
+        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+        int age = yearNow - yearBirth;   //计算整岁数
+        if (monthNow <= monthBirth) {
+            if (monthNow == monthBirth) {
+                if (dayOfMonthNow < dayOfMonthBirth) age--;//当前日期在生日之前,年龄减一
+            }else{
+                age--;//当前月份在生日之前,年龄减一
+            }
+        }
+        if (age < 0) {
+            return 0;
+        }
+        return age;
+    }
+}

+ 118 - 0
src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -0,0 +1,118 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.QcresultInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.SysUserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/4/13 16:45
+ */
+@Component
+public class ConsoleFacade {
+
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+
+
+    /**
+     * 病历相关统计
+     *
+     * @return
+     */
+    public Map<String, Object> mrStatistics() {
+        Map<String, Object> retMap = new HashMap<>();
+        retMap.put("本月病历数", 0);
+        retMap.put("本月质控数-人工", 0);
+        retMap.put("本月质控数-机器", 0);
+        retMap.put("本月甲级病历-人工", 0);
+        retMap.put("本月甲级病历-机器", 0);
+        retMap.put("本月乙级病历-人工", 0);
+        retMap.put("本月乙级病历-机器", 0);
+        retMap.put("本月不合格病历-人工", 0);
+        retMap.put("本月不合格病历-机器", 0);
+
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+
+        Date date = new Date();
+        String year = DateUtil.getYear(date);
+        int month = DateUtil.getMonth(date);
+        String startDate = year + "-" + month + "-01";
+        QueryWrapper<BehospitalInfo> behospitalInfoQueryWrapper = new QueryWrapper<>();
+        behospitalInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .gt("leave_hospital_date", startDate);
+        List<BehospitalInfo> behospitalInfoList = behospitalInfoFacade.list(behospitalInfoQueryWrapper);
+        if (ListUtil.isNotEmpty(behospitalInfoList)) {
+            //本月病历数
+            retMap.put("本月病历数", behospitalInfoList.size());
+        }
+
+        QueryWrapper<QcresultInfo> qcresultInfoQueryWrapper = new QueryWrapper<>();
+        qcresultInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", hospitalId)
+                .gt("gmt_create", startDate);
+        List<QcresultInfo> qcresultInfoList = qcresultInfoFacade.list(qcresultInfoQueryWrapper);
+        if (ListUtil.isNotEmpty(qcresultInfoList)) {
+            retMap.put("本月质控数-人工", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(2))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月质控数-机器", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(1))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月甲级病历-人工", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(2) && i.getLevel().equals("甲级"))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月甲级病历-机器", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(1) && i.getLevel().equals("甲级"))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月乙级病历-人工", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(2) && i.getLevel().equals("乙级"))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月乙级病历-机器", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(1) && i.getLevel().equals("乙级"))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月不合格病历-人工", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(2) && i.getLevel().equals("丙级"))
+                    .collect(Collectors.toList())
+                    .size());
+            retMap.put("本月不合格病历-机器", qcresultInfoList
+                    .stream()
+                    .filter(i -> i.getGradeType().equals(1) && i.getLevel().equals("丙级"))
+                    .collect(Collectors.toList())
+                    .size());
+        }
+
+        return retMap;
+
+    }
+
+}

+ 1 - 1
src/main/java/com/diagbot/facade/QcCasesFacade.java

@@ -16,7 +16,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description:
+ * @Description: 模块数据标准装饰类
  * @author: gaodm
  * @time: 2020/4/12 14:07
  */

+ 13 - 0
src/main/java/com/diagbot/facade/QcresultInfoFacade.java

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.QcresultInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/4/13 17:22
+ */
+@Component
+public class QcresultInfoFacade extends QcresultInfoServiceImpl {
+}

+ 20 - 0
src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -0,0 +1,20 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.BehospitalInfoDTO;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.vo.BehospitalPageVO;
+
+/**
+ * <p>
+ * 住院病历信息 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
+
+    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/MedRecordTypeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedRecordType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface MedRecordTypeMapper extends BaseMapper<MedRecordType> {
+
+}

+ 1 - 1
src/main/java/com/diagbot/mapper/QcCasesMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- * 病历 Mapper 接口
+ * 模块数据标准 Mapper 接口
  * </p>
  *
  * @author gaodm

+ 16 - 0
src/main/java/com/diagbot/mapper/QcTypeCasesEntryMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcTypeCasesEntry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控类型和质控条目关联表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeCasesEntryMapper extends BaseMapper<QcTypeCasesEntry> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/QcTypeDocMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcTypeDoc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控类型和医院文书类型关联表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeDocMapper extends BaseMapper<QcTypeDoc> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/mapper/QcTypeMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控类型标准 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeMapper extends BaseMapper<QcType> {
+
+}

+ 17 - 0
src/main/java/com/diagbot/mapper/QcresultDetailMapper.java

@@ -0,0 +1,17 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcresultDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface QcresultDetailMapper extends BaseMapper<QcresultDetail> {
+
+}

+ 17 - 0
src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -0,0 +1,17 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcresultInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控评分结果信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.BehospitalInfoDTO;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.vo.BehospitalPageVO;
+
+/**
+ * <p>
+ * 住院病历信息 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface BehospitalInfoService extends IService<BehospitalInfo> {
+
+    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
+}

+ 16 - 0
src/main/java/com/diagbot/service/MedRecordTypeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedRecordType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface MedRecordTypeService extends IService<MedRecordType> {
+
+}

+ 1 - 1
src/main/java/com/diagbot/service/QcCasesService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- * 病历 服务类
+ * 模块数据标准 服务类
  * </p>
  *
  * @author gaodm

+ 16 - 0
src/main/java/com/diagbot/service/QcTypeCasesEntryService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcTypeCasesEntry;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控类型和质控条目关联表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeCasesEntryService extends IService<QcTypeCasesEntry> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/QcTypeDocService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcTypeDoc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控类型和医院文书类型关联表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeDocService extends IService<QcTypeDoc> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/QcTypeService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控类型标准 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+public interface QcTypeService extends IService<QcType> {
+
+}

+ 17 - 0
src/main/java/com/diagbot/service/QcresultDetailService.java

@@ -0,0 +1,17 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcresultDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface QcresultDetailService extends IService<QcresultDetail> {
+
+}

+ 17 - 0
src/main/java/com/diagbot/service/QcresultInfoService.java

@@ -0,0 +1,17 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcresultInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控评分结果信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface QcresultInfoService extends IService<QcresultInfo> {
+
+}

+ 27 - 0
src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -0,0 +1,27 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.BehospitalInfoDTO;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.mapper.BehospitalInfoMapper;
+import com.diagbot.service.BehospitalInfoService;
+import com.diagbot.vo.BehospitalPageVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 住院病历信息 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Service
+public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper, BehospitalInfo> implements BehospitalInfoService {
+
+    @Override
+    public IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO) {
+        return baseMapper.getPage(behospitalPageVO);
+    }
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/MedRecordTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedRecordType;
+import com.diagbot.mapper.MedRecordTypeMapper;
+import com.diagbot.service.MedRecordTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+@Service
+public class MedRecordTypeServiceImpl extends ServiceImpl<MedRecordTypeMapper, MedRecordType> implements MedRecordTypeService {
+
+}

+ 1 - 1
src/main/java/com/diagbot/service/impl/QcCasesServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 病历 服务实现类
+ * 模块数据标准 服务实现类
  * </p>
  *
  * @author gaodm

+ 20 - 0
src/main/java/com/diagbot/service/impl/QcTypeCasesEntryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcTypeCasesEntry;
+import com.diagbot.mapper.QcTypeCasesEntryMapper;
+import com.diagbot.service.QcTypeCasesEntryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控类型和质控条目关联表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+@Service
+public class QcTypeCasesEntryServiceImpl extends ServiceImpl<QcTypeCasesEntryMapper, QcTypeCasesEntry> implements QcTypeCasesEntryService {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/QcTypeDocServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcTypeDoc;
+import com.diagbot.mapper.QcTypeDocMapper;
+import com.diagbot.service.QcTypeDocService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控类型和医院文书类型关联表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+@Service
+public class QcTypeDocServiceImpl extends ServiceImpl<QcTypeDocMapper, QcTypeDoc> implements QcTypeDocService {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/QcTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcType;
+import com.diagbot.mapper.QcTypeMapper;
+import com.diagbot.service.QcTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控类型标准 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-13
+ */
+@Service
+public class QcTypeServiceImpl extends ServiceImpl<QcTypeMapper, QcType> implements QcTypeService {
+
+}

+ 21 - 0
src/main/java/com/diagbot/service/impl/QcresultDetailServiceImpl.java

@@ -0,0 +1,21 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcresultDetail;
+import com.diagbot.mapper.QcresultDetailMapper;
+import com.diagbot.service.QcresultDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Service
+public class QcresultDetailServiceImpl extends ServiceImpl<QcresultDetailMapper, QcresultDetail> implements QcresultDetailService {
+
+}

+ 21 - 0
src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -0,0 +1,21 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcresultInfo;
+import com.diagbot.mapper.QcresultInfoMapper;
+import com.diagbot.service.QcresultInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控评分结果信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Service
+public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, QcresultInfo> implements QcresultInfoService {
+
+}

+ 65 - 0
src/main/java/com/diagbot/vo/BehospitalPageVO.java

@@ -0,0 +1,65 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class BehospitalPageVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 医院ID
+     */
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 入院时间开始时间
+     */
+    private String behosDateStart;
+
+
+    /**
+     * 入院时间结束时间
+     */
+    private String behosDateEnd;
+
+    /**
+     * 出院时间开始时间
+     */
+    private String leaveHosDateStart;
+
+    /**
+     * 出院时间结束时间
+     */
+    private String leaveHosDateEnd;
+
+
+}

+ 21 - 0
src/main/java/com/diagbot/vo/MedrecVo.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 病历查询结构
+ * @author: Mark Huang
+ * @Time: 2019/04/04 :15:14
+ *
+ */
+@Getter
+@Setter
+public class MedrecVo {
+    private String title;
+    private Map<String, Object> content;
+    private List<String> label;
+}

+ 26 - 0
src/main/java/com/diagbot/vo/QueryVo.java

@@ -0,0 +1,26 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 业务查询
+ * @author: Mark Huang
+ * @Time: 2019/04/04 :15:14
+ *
+ */
+@Getter
+@Setter
+public class QueryVo extends TokenVO {
+
+    private List<MedrecVo> medrec;
+
+    private Map<String, Map<String, String>> inputCatalogueMap = new HashMap<>();
+
+    private String cid;
+
+}

+ 17 - 0
src/main/java/com/diagbot/vo/TokenVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2019/12/24 19:17
+ */
+@Getter
+@Setter
+public class TokenVO implements Serializable {
+    private String token; //token信息
+}

+ 42 - 0
src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -0,0 +1,42 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.BehospitalInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.vo.BehospitalPageVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * <p>
+ * 住院病历信息 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@RestController
+@RequestMapping("/qc/behospitalInfo")
+@Api(value = "病历API", tags = { "病历API" })
+public class BehospitalInfoController {
+    @Autowired
+    BehospitalInfoFacade behospitalInfoFacade;
+
+    @ApiOperation(value = "病历分页列表[by:zhoutg]",
+            notes = "")
+    @PostMapping("/page")
+    @SysLogger("page")
+    public RespDTO<IPage<BehospitalInfoDTO>> page(@RequestBody BehospitalPageVO behospitalPageVO) {
+        IPage<BehospitalInfoDTO> data = behospitalInfoFacade.pageFac(behospitalPageVO);
+        return RespDTO.onSuc(data);
+    }
+
+}

+ 36 - 0
src/main/java/com/diagbot/web/ConsoleController.java

@@ -0,0 +1,36 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.ConsoleFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/4/13 16:45
+ */
+@RequestMapping("/console")
+@RestController
+@Api(value = "控制台统计相关API", tags = { "控制台统计相关API" })
+public class ConsoleController {
+
+    @Autowired
+    private ConsoleFacade consoleFacade;
+
+    @ApiOperation(value = "病历相关统计[by:zhaops]",
+            notes = "")
+    @PostMapping("/mrStatistics")
+    @SysLogger("mrStatistics")
+    public RespDTO<Map<String, Object>> mrStatistics() {
+        Map<String, Object> data = consoleFacade.mrStatistics();
+        return RespDTO.onSuc(data);
+    }
+}

+ 20 - 0
src/main/java/com/diagbot/web/QcresultDetailController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@RestController
+@RequestMapping("/qcresultDetail")
+public class QcresultDetailController {
+
+}

+ 20 - 0
src/main/java/com/diagbot/web/QcresultInfoController.java

@@ -0,0 +1,20 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 质控评分结果信息
+每次评分增加一条信息,前面所有评分is_deleted全部设置为Y 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@RestController
+@RequestMapping("/qcresultInfo")
+public class QcresultInfoController {
+
+}

+ 64 - 0
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -0,0 +1,64 @@
+<?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.BehospitalInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.BehospitalInfo">
+        <id column="behospital_code" property="behospitalCode" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="name" property="name" />
+        <result column="sex" property="sex" />
+        <result column="birthday" property="birthday" />
+        <result column="file_code" property="fileCode" />
+        <result column="ward_code" property="wardCode" />
+        <result column="ward_name" property="wardName" />
+        <result column="beh_dept_id" property="behDeptId" />
+        <result column="beh_dept_name" property="behDeptName" />
+        <result column="bed_code" property="bedCode" />
+        <result column="bed_name" property="bedName" />
+        <result column="insurance_name" property="insuranceName" />
+        <result column="job_type" property="jobType" />
+        <result column="behospital_date" property="behospitalDate" />
+        <result column="leave_hospital_date" property="leaveHospitalDate" />
+        <result column="diagnose_icd" property="diagnoseIcd" />
+        <result column="diagnose" property="diagnose" />
+        <result column="doctor_id" property="doctorId" />
+        <result column="doctor_name" property="doctorName" />
+        <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>
+
+    <select id="getPage" resultType="com.diagbot.dto.BehospitalInfoDTO">
+        select * from med_behospital_info a LEFT JOIN med_qcresult_info b
+        on a.behospital_code = b.behospital_code and b.is_deleted = 'N'
+        where a.is_deleted = 'N'
+        <if test="name != null and name != ''">
+            and a.name like CONCAT('%',#{name},'%')
+        </if>
+        <if test="fileCode != null and fileCode != ''">
+            and a.file_code like CONCAT('%',#{fileCode},'%')
+        </if>
+        <if test="hospitalId != null">
+            and a.hospital_id = #{hospitalId}
+        </if>
+        <if test="behospitalCode != null and behospitalCode != ''">
+            and a.behospitalCode like CONCAT('%',#{behospitalCode},'%')
+        </if>
+        <if test="behosDateStart != null and behosDateStart != ''">
+            <![CDATA[ and a.behospital_date >= #{behosDateStart}]]>
+        </if>
+        <if test="behosDateEnd != null and behosDateEnd != ''">
+            <![CDATA[ and a.behospital_date <= #{behosDateEnd}]]>
+        </if>
+        <if test="leaveHosDateStart != null and leaveHosDateStart != ''">
+            <![CDATA[ and a.leave_hospital_date >= #{leaveHosDateStart}]]>
+        </if>
+        <if test="leaveHosDateEnd != null and leaveHosDateEnd != ''">
+            <![CDATA[ and a.leave_hospital_date <= #{leaveHosDateEnd}]]>
+        </if>
+    </select>
+
+</mapper>

+ 16 - 0
src/main/resources/mapper/MedRecordTypeMapper.xml

@@ -0,0 +1,16 @@
+<?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.MedRecordTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.MedRecordType">
+        <id column="type_id" property="typeId" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="type_name" property="typeName" />
+        <result column="parent_type_id" property="parentTypeId" />
+        <result column="obj_name" property="objName" />
+        <result column="spell" property="spell" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 18 - 0
src/main/resources/mapper/QcTypeCasesEntryMapper.xml

@@ -0,0 +1,18 @@
+<?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.QcTypeCasesEntryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcTypeCasesEntry">
+        <id column="id" property="id" />
+        <result column="type_id" property="typeId" />
+        <result column="case_entry_id" property="caseEntryId" />
+        <result column="remark" property="remark" />
+        <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>

+ 19 - 0
src/main/resources/mapper/QcTypeDocMapper.xml

@@ -0,0 +1,19 @@
+<?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.QcTypeDocMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcTypeDoc">
+        <id column="id" property="id" />
+        <result column="type_id" property="typeId" />
+        <result column="hospital_type_id" property="hospitalTypeId" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="remark" property="remark" />
+        <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>

+ 17 - 0
src/main/resources/mapper/QcTypeMapper.xml

@@ -0,0 +1,17 @@
+<?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.QcTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcType">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+        <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>

+ 20 - 0
src/main/resources/mapper/QcresultDetailMapper.xml

@@ -0,0 +1,20 @@
+<?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.QcresultDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcresultDetail">
+        <id column="id" property="id" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="cases_entry_id" property="casesEntryId" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="score" property="score" />
+        <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" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 21 - 0
src/main/resources/mapper/QcresultInfoMapper.xml

@@ -0,0 +1,21 @@
+<?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.QcresultInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.QcresultInfo">
+        <id column="id" property="id" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="hospital_id" property="hospitalId" />
+        <result column="level" property="level" />
+        <result column="score_res" property="scoreRes" />
+        <result column="grade_type" property="gradeType" />
+        <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" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

+ 1 - 1
src/test/java/com/diagbot/CodeGeneration.java

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