report-service项目数据库访问独立 第四批

common/src/main/java/com/lantone/common/util/ExcelUtils.java

@@ -1,196 +0,0 @@
-package com.lantone.common.util;
-
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.lantone.common.api.ResultCode;
-import com.lantone.common.exception.ApiException;
-import com.lantone.common.service.impl.ExcelExportStylerUserImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-/**
- * @Description: excel 导入导出工具类
- * @author: gaodm
- * @time: 2020/6/2 19:18
- */
-public class ExcelUtils {
-    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
-                                   boolean isCreateHeader, HttpServletResponse response) {
-        ExportParams exportParams = new ExportParams(title, sheetName);
-        exportParams.setCreateHeadRows(isCreateHeader);
-        defaultExport(list, pojoClass, fileName, response, exportParams);
-    }
-
-    public static void exportExcelUser(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
-                                       HttpServletResponse response) {
-        ExportParams exportParams = new ExportParams(title, sheetName);
-        exportParams.setStyle(ExcelExportStylerUserImpl.class);
-        userExport(list, pojoClass, fileName, response, exportParams);
-    }
-
-    public static void exportXSSFExcelUser(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
-                                       HttpServletResponse response) {
-        ExportParams exportParams = new ExportParams(title, sheetName, ExcelType.XSSF);
-        exportParams.setStyle(ExcelExportStylerUserImpl.class);
-        userExport(list, pojoClass, fileName, response, exportParams);
-    }
-
-    public static void exportExcelDynamicCol(List<ExcelExportEntity> entityList, Collection<?> dataSet, String title, String sheetName, String fileName,
-                                    HttpServletResponse response) {
-        ExportParams exportParams = new ExportParams(title, sheetName);
-        dynamicColExport(entityList, dataSet, fileName, response, exportParams);
-    }
-
-    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
-                                   HttpServletResponse response, float height) {
-        Boolean havTitle = false;
-        if (StringUtil.isNotBlank(title)) {
-            havTitle = true;
-        }
-        userExport2(list, pojoClass, fileName, response, new ExportParams(title, sheetName), height, havTitle);
-    }
-
-    public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName,
-                                   HttpServletResponse response) {
-        defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName));
-    }
-
-    public static void exportExcel(List<Map<String, Object>> list, String fileName, HttpServletResponse response) {
-        defaultExport(list, fileName, response);
-    }
-
-    private static void defaultExport(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
-                                      ExportParams exportParams) {
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
-        if (workbook != null) {
-            ;
-        }
-        downLoadExcel(fileName, response, workbook);
-    }
-
-    private static void dynamicColExport(List<ExcelExportEntity> entityList, Collection<?> dataSet, String fileName, HttpServletResponse response,
-                                         ExportParams exportParams) {
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams,entityList,dataSet);
-        if (workbook != null) {
-            ;
-        }
-        downLoadExcel(fileName, response, workbook);
-    }
-
-    private static void userExport(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
-                                   ExportParams exportParams) {
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
-        if (workbook != null) {
-            Sheet sheet = workbook.getSheetAt(0);
-            //列宽设置
-            sheet.setColumnWidth(8, 256 * 20);
-            sheet.setColumnWidth(9, 256 * 50);
-            int rowNum = sheet.getLastRowNum();
-            Row row = sheet.getRow(0);
-            for (int i = 1; i <= rowNum; i++) {
-                row = sheet.getRow(i);
-                row.setHeightInPoints(12.8f);
-            }
-        }
-        downLoadExcel(fileName, response, workbook);
-    }
-
-    private static void userExport2(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
-                                    ExportParams exportParams, float height, Boolean havTitle) {
-        if(StringUtils.isNotEmpty(exportParams.getTitle()) && exportParams.getTitle().equals("病历质控报表")){
-            exportParams.setTitleHeight(Short.valueOf("20"));
-        };
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
-        if (workbook != null) {
-            Sheet sheet = workbook.getSheetAt(0);
-            int rowNum = sheet.getLastRowNum();
-            Row row = sheet.getRow(0);
-            int startRowNum = 1;
-            if (havTitle) {
-                startRowNum = 2;
-            }
-            for (int i = startRowNum; i <= rowNum; i++) {
-                row = sheet.getRow(i);
-                row.setHeightInPoints(height);
-            }
-        }
-        downLoadExcel(fileName, response, workbook);
-    }
-
-    private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
-        try {
-            response.setCharacterEncoding("UTF-8");
-            response.setHeader("content-Type", "application/vnd.ms-excel");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
-            workbook.write(response.getOutputStream());
-        } catch (IOException e) {
-            // throw new NormalException(e.getMessage());
-            throw new ApiException(ResultCode.SERVER_IS_ERROR.getMessage(), e);
-        }
-    }
-
-    private static void defaultExport(List<Map<String, Object>> list, String fileName, HttpServletResponse response) {
-        Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF);
-        if (workbook != null) {
-            ;
-        }
-        downLoadExcel(fileName, response, workbook);
-    }
-
-    public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass) {
-        if (StringUtils.isBlank(filePath)) {
-            return null;
-        }
-        ImportParams params = new ImportParams();
-        params.setTitleRows(titleRows);
-        params.setHeadRows(headerRows);
-        List<T> list = null;
-        try {
-            list = ExcelImportUtil.importExcel(new File(filePath), pojoClass, params);
-        } catch (NoSuchElementException e) {
-            // throw new NormalException("模板不能为空");
-        } catch (Exception e) {
-            e.printStackTrace();
-            // throw new NormalException(e.getMessage());
-        }
-        return list;
-    }
-
-    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows,
-                                          Class<T> pojoClass) {
-        if (file == null) {
-            return null;
-        }
-        ImportParams params = new ImportParams();
-        params.setTitleRows(titleRows);
-        params.setHeadRows(headerRows);
-        List<T> list = null;
-        try {
-            list = ExcelImportUtil.importExcel(file.getInputStream(), pojoClass, params);
-        } catch (NoSuchElementException e) {
-            // throw new NormalException("excel文件不能为空");
-        } catch (Exception e) {
-            // throw new NormalException(e.getMessage());
-            System.out.println(e.getMessage());
-        }
-        return list;
-    }
-
-}

config-center/src/main/resources/shared/report-service-debug.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.126 # Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: Lat0ne@tesT
 
 swagger.show: true

config-center/src/main/resources/shared/report-service-inner.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: lantone
 
 swagger.show: false

config-center/src/main/resources/shared/report-service-local.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: lantone
 
 swagger.show: true

config-center/src/main/resources/shared/report-service-outer.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: emrais # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: lantone
 
 swagger.show: false

config-center/src/main/resources/shared/report-service-test.yml

@@ -4,12 +4,10 @@ spring:
     host: 192.168.2.126 # Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
+  datasource:
+    druid:
+      url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: Lat0ne@tesT
 
 swagger.show: true

dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java

@@ -1,31 +0,0 @@
-package com.lantone.dblayermbg.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * @Description:
- * @author: rengb
- * @time: 2020/4/8 21:41
- */
-@EnableTransactionManagement
-@Configuration
-public class DruidConfig {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档：http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
-        //paginationInterceptor.setOverflow(false);
-        // 设置最大单页限制数量,默认500条,-1不受限制
-        paginationInterceptor.setLimit(-1L);
-        return paginationInterceptor;
-    }
-
-}

report-service/src/main/java/com/lantone/ReportServiceApplication.java

@@ -1,20 +1,19 @@
 package com.lantone;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-/**
- * @Description:
- * @Author: cy
- * @time: 2021/9/16 14:13
- */
 @EnableEurekaClient
 @EnableFeignClients
 @SpringBootApplication
+@MapperScan(basePackages = "com.lantone.report.mapper")
 public class ReportServiceApplication {
+
     public static void main(String[] args) {
         SpringApplication.run(ReportServiceApplication.class, args);
     }
-}
+
+}

report-service/src/main/java/com/lantone/analyze/client/QcServiceClient.java

@@ -1,30 +0,0 @@
-package com.lantone.analyze.client;
-
-import com.lantone.analyze.client.hystrx.QcServiceHystrix;
-import com.lantone.dto.analyze.OutputInfo;
-import com.lantone.dto.analyze.Response;
-import com.lantone.vo.analyze.QueryVo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.net.URI;
-
-
-/**
- * @description: 病历质控远程调用
- * @author: zhoutg
- * @date: 2020/4/13 18:28
- */
-@FeignClient(name = "qc", url = "url-placehokder", fallback = QcServiceHystrix.class)
-public interface QcServiceClient {
-
-    @PostMapping(value = "/analyse/rec")
-    Response<OutputInfo> extract(URI uri, QueryVo queryVo);
-
-    @PostMapping(value = "/analyse/standardFieldDock")
-    Response<OutputInfo> analyseField(URI uri, QueryVo queryVo);
-
-}
-
-
-

report-service/src/main/java/com/lantone/analyze/client/hystrx/QcServiceHystrix.java

@@ -1,32 +0,0 @@
-package com.lantone.analyze.client.hystrx;
-
-
-import com.lantone.analyze.client.QcServiceClient;
-import com.lantone.dto.analyze.OutputInfo;
-import com.lantone.dto.analyze.Response;
-import com.lantone.vo.analyze.QueryVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.net.URI;
-
-/**
- * @description: 病历质控远程调用熔断器
- * @author: zhoutg
- * @date: 2020/4/13 18:23
- */
-@Component
-@Slf4j
-public class QcServiceHystrix implements QcServiceClient {
-
-    @Override
-    public Response<OutputInfo> extract(URI uri, QueryVo queryVo) {
-        log.error("【hystrix】调用{}异常", "extract");
-        return null;
-    }
-    @Override
-    public Response<OutputInfo> analyseField(URI uri, QueryVo queryVo){
-        log.error("【hystrix】调用{}异常", "analyseField");
-        return null;
-    }
-}

report-service/src/main/java/com/lantone/analyze/entity/MedBehospitalInfo.java

@@ -1,232 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 住院病历信息 实体类
- * </p>
- */
-@Data
-public class MedBehospitalInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    @TableId("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别（男，女）
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @TableField("birthday")
-    private Date birthday;
-
-    /**
-     * 档案号
-     */
-    @TableField("file_code")
-    private String fileCode;
-
-    /**
-     * 质控类型
-     */
-    @TableField("qc_type_id")
-    private Long qcTypeId;
-
-    /**
-     * 病区编码
-     */
-    @TableField("ward_code")
-    private String wardCode;
-
-    /**
-     * 病区名称
-     */
-    @TableField("ward_name")
-    private String wardName;
-
-    /**
-     * 住院科室ID
-     */
-    @TableField("beh_dept_id")
-    private String behDeptId;
-
-    /**
-     * 住院科室名称
-     */
-    @TableField("beh_dept_name")
-    private String behDeptName;
-
-    /**
-     * 床位号
-     */
-    @TableField("bed_code")
-    private String bedCode;
-
-    /**
-     * 床位名称
-     */
-    @TableField("bed_name")
-    private String bedName;
-
-    /**
-     * 医保类别
-     */
-    @TableField("insurance_name")
-    private String insuranceName;
-
-    /**
-     * 职业
-     */
-    @TableField("job_type")
-    private String jobType;
-
-    /**
-     * 入院时间
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @TableField("leave_hospital_date")
-    private Date leaveHospitalDate;
-
-    /**
-     * 转入时间
-     */
-    @TableField("trans_in_time")
-    private Date transInTime;
-
-    /**
-     * 转出时间
-     */
-    @TableField("trans_out_time")
-    private Date transOutTime;
-
-    /**
-     * 疾病ICD编码
-     */
-    @TableField("diagnose_icd")
-    private String diagnoseIcd;
-
-    /**
-     * 疾病名称
-     */
-    @TableField("diagnose")
-    private String diagnose;
-
-    /**
-     * 主治医生ID
-     */
-    @TableField("doctor_id")
-    private String doctorId;
-
-    /**
-     * 主治医生姓名
-     */
-    @TableField("doctor_name")
-    private String doctorName;
-
-    /**
-     * 住院医生ID
-     */
-    @TableField("beh_doctor_id")
-    private String behDoctorId;
-
-    /**
-     * 住院医生姓名
-     */
-    @TableField("beh_doctor_name")
-    private String behDoctorName;
-
-    /**
-     * 主任医生ID
-     */
-    @TableField("director_doctor_id")
-    private String directorDoctorId;
-
-    /**
-     * 主任医生姓名
-     */
-    @TableField("director_doctor_name")
-    private String directorDoctorName;
-
-    /**
-     * 是否归档（0：未归档，1：已归档）
-     */
-    @TableField("is_placefile")
-    private String isPlacefile;
-
-    /**
-     * 归档时间
-     */
-    @TableField("placefile_date")
-    private Date placefileDate;
-
-    /**
-     * R-住院登记I-病房接诊B-出院登记O-出院结算P-预约出院N-无费退院
-     */
-    @TableField("in_state")
-    private String inState;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedBehospitalType.java

@@ -1,62 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 患者类型表 实体类
- * </p>
- */
-@Data
-public class MedBehospitalType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Integer hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 患者类型
-     */
-    @TableField("behospital_type")
-    private String behospitalType;
-
-    /**
-     * 类型分值
-     */
-    @TableField("value")
-    private Integer value;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedCheckInfo.java

@@ -1,143 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 核查表 实体类
- * </p>
- */
-@Data
-public class MedCheckInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 核查人id
-     */
-    @TableField("check_id")
-    private Long checkId;
-
-    /**
-     * 核查人
-     */
-    @TableField("check_name")
-    private String checkName;
-
-    /**
-     * 核查时间
-     */
-    @TableField("check_time")
-    private Date checkTime;
-
-    /**
-     * 核查状态（0未核查，1已核查）
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 核查类型（0病历，1病案首页，2全部）
-     */
-    @TableField("check_type")
-    private Integer checkType;
-
-    /**
-     * 核查任务创建人编号
-     */
-    @TableField("job_creator")
-    private Long jobCreator;
-
-    /**
-     * 核查任务创建人
-     */
-    @TableField("job_creator_name")
-    private String jobCreatorName;
-
-    /**
-     * 核查任务生成时间
-     */
-    @TableField("job_create_time")
-    private Date jobCreateTime;
-
-    /**
-     * 核查任务类型（0-科室任务 1-质控科 2-院级）
-     */
-    @TableField("job_type")
-    private Integer jobType;
-
-    /**
-     * 核查任务分配人编号
-     */
-    @TableField("job_distributor")
-    private Long jobDistributor;
-
-    /**
-     * 核查任务分配人姓名
-     */
-    @TableField("job_distribution_name")
-    private String jobDistributionName;
-
-    /**
-     * 核查任务分配时间
-     */
-    @TableField("job_distribution_time")
-    private Date jobDistributionTime;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedCrisisInfo.java

@@ -1,151 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 危急值信息 实体类
- * </p>
- */
-@Data
-public class MedCrisisInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 记录类型
-     */
-    @TableField("rec_type")
-    private String recType;
-
-    /**
-     * 危急值ID
-     */
-    @TableField("crisis_id")
-    private String crisisId;
-
-    /**
-     * 危急值名称
-     */
-    @TableField("crisis_name")
-    private String crisisName;
-
-    /**
-     * 开单科室ID
-     */
-    @TableField("dept_id")
-    private String deptId;
-
-    /**
-     * 开单科室名称
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 开单医生ID
-     */
-    @TableField("doctor_id")
-    private String doctorId;
-
-    /**
-     * 开单医生姓名
-     */
-    @TableField("doctor_name")
-    private String doctorName;
-
-    /**
-     * 危急结果值
-     */
-    @TableField("crisis_value")
-    private String crisisValue;
-
-    /**
-     * 危急值描述
-     */
-    @TableField("crisis_desc")
-    private String crisisDesc;
-
-    /**
-     * 危急值状态
-     */
-    @TableField("crisis_status")
-    private String crisisStatus;
-
-    /**
-     * 参考上限
-     */
-    @TableField("crisis_top_value")
-    private String crisisTopValue;
-
-    /**
-     * 参考下限
-     */
-    @TableField("crisis_lower_value")
-    private String crisisLowerValue;
-
-    /**
-     * 送检时间
-     */
-    @TableField("send_date")
-    private Date sendDate;
-
-    /**
-     * 报告时间
-     */
-    @TableField("rep_date")
-    private Date repDate;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedDoctorAdvice.java

@@ -1,202 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病人医嘱 实体类
- * </p>
- */
-@Data
-public class MedDoctorAdvice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人医嘱ID
-     */
-    @TableId("doctor_advice_id")
-    private String doctorAdviceId;
-
-    /**
-     * 医院id
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 医生开单判别
-     */
-    @TableField("order_doctor_name")
-    private String orderDoctorName;
-
-    /**
-     * 医嘱频率判别
-     */
-    @TableField("frequency")
-    private String frequency;
-
-    /**
-     * 父类医嘱ID
-     */
-    @TableField("parent_type_id")
-    private String parentTypeId;
-
-    /**
-     * 医嘱类型判别(嘱托长嘱、长期医嘱、出院带药等)
-     */
-    @TableField("doctor_advice_type")
-    private String doctorAdviceType;
-
-    /**
-     * 一次使用数量
-     */
-    @TableField("usage_num")
-    private String usageNum;
-
-    /**
-     * 一次用量单位
-     */
-    @TableField("usage_unit")
-    private String usageUnit;
-
-    /**
-     * 医嘱单次剂量
-     */
-    @TableField("dose")
-    private String dose;
-
-    /**
-     * 单次剂量单位
-     */
-    @TableField("dose_unit")
-    private String doseUnit;
-
-    /**
-     * 给药方式
-     */
-    @TableField("med_mode_type")
-    private String medModeType;
-
-    /**
-     * 医嘱频率
-     */
-    @TableField("da_frequency")
-    private String daFrequency;
-
-    /**
-     * 医嘱处理类型
-     */
-    @TableField("da_deal_type")
-    private String daDealType;
-
-    /**
-     * 医嘱开始时间
-     */
-    @TableField("da_start_date")
-    private Date daStartDate;
-
-    /**
-     * 医嘱项目名称
-     */
-    @TableField("da_item_name")
-    private String daItemName;
-
-    /**
-     * 医嘱状态判别
-     */
-    @TableField("da_status")
-    private String daStatus;
-
-    /**
-     * 医嘱结束时间
-     */
-    @TableField("da_stop_date")
-    private Date daStopDate;
-
-    /**
-     * 医嘱同组序号
-     */
-    @TableField("da_group_no")
-    private String daGroupNo;
-
-    /**
-     * 医嘱处方类型(检验、描述医嘱、膳食、西药、护理等)
-     */
-    @TableField("da_prescription_type")
-    private String daPrescriptionType;
-
-    /**
-     * 药品类型(0.普药 1.抗生素 2.激素)
-     */
-    @TableField("medicine_type")
-    private String medicineType;
-
-    /**
-     * 医嘱领药类型
-     */
-    @TableField("da_med_type")
-    private String daMedType;
-
-    /**
-     * 医生嘱托
-     */
-    @TableField("doctor_notice")
-    private String doctorNotice;
-
-    /**
-     * 开单医生ID
-     */
-    @TableField("doctor_id")
-    private String doctorId;
-
-    /**
-     * 开单医生姓名
-     */
-    @TableField("doctor_name")
-    private String doctorName;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedHomeDiagnoseInfo.java

@@ -1,111 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedHomeDiagnoseInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病案首页ID
-     */
-    @TableField("home_page_id")
-    private String homePageId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 诊断序号
-     */
-    @TableField("diagnose_order_no")
-    private Integer diagnoseOrderNo;
-
-    /**
-     * 诊断类别
-     */
-    @TableField("diagnose_type")
-    private String diagnoseType;
-
-    /**
-     * 诊断判别
-     */
-    @TableField("diagnose_type_short")
-    private String diagnoseTypeShort;
-
-    /**
-     * 诊断名称
-     */
-    @TableField("diagnose_name")
-    private String diagnoseName;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_type")
-    private String behospitalType;
-
-    /**
-     * 出院情况
-     */
-    @TableField("leave_hospital_type")
-    private String leaveHospitalType;
-
-    /**
-     * 病理号
-     */
-    @TableField("pathology_diagnose")
-    private String pathologyDiagnose;
-
-    /**
-     * 诊断编码
-     */
-    @TableField("icd_code")
-    private String icdCode;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedHomeOperationInfo.java

@@ -1,141 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedHomeOperationInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病案首页ID
-     */
-    @TableField("home_page_id")
-    private String homePageId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 手术序号
-     */
-    @TableField("operation_order_no")
-    private Integer operationOrderNo;
-
-    /**
-     * 手术日期
-     */
-    @TableField("operation_date")
-    private Date operationDate;
-
-    /**
-     * 手术编码
-     */
-    @TableField("operation_code")
-    private String operationCode;
-
-    /**
-     * 手术医生
-     */
-    @TableField("operation_doctor_id")
-    private String operationDoctorId;
-
-    /**
-     * 一助医生
-     */
-    @TableField("first_assistant_id")
-    private String firstAssistantId;
-
-    /**
-     * 二助医生
-     */
-    @TableField("second_assistant_id")
-    private String secondAssistantId;
-
-    /**
-     * 切口等级
-     */
-    @TableField("cut_level")
-    private String cutLevel;
-
-    /**
-     * 愈合等级
-     */
-    @TableField("healing_level")
-    private String healingLevel;
-
-    /**
-     * 手术名称
-     */
-    @TableField("operation_name")
-    private String operationName;
-
-    /**
-     * 手术级别
-     */
-    @TableField("operation_level")
-    private String operationLevel;
-
-    /**
-     * 麻醉方式
-     */
-    @TableField("anaesthesia_name")
-    private String anaesthesiaName;
-
-    /**
-     * 麻醉医师
-     */
-    @TableField("anaesthesia_doctor")
-    private String anaesthesiaDoctor;
-
-    /**
-     * 拟手术名称
-     */
-    @TableField("sham_operation_name")
-    private String shamOperationName;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedHomePage.java

@@ -1,892 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedHomePage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病案首页编号
-     */
-    @TableId("home_page_id")
-    private String homePageId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院序号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 组织机构id
-     */
-    @TableField("hospital_code")
-    private String hospitalCode;
-
-    /**
-     * 医疗机构名称
-     */
-    @TableField("hospital_name")
-    private String hospitalName;
-
-    /**
-     * 医疗机构代码
-     */
-    @TableField("org_code")
-    private String orgCode;
-
-    /**
-     * 医疗付费方式
-     */
-    @TableField("pay_type")
-    private String payType;
-
-    /**
-     * 健康卡号
-     */
-    @TableField("health_card")
-    private String healthCard;
-
-    /**
-     * 住院次数
-     */
-    @TableField("behospital_num")
-    private String behospitalNum;
-
-    /**
-     * 病案号
-     */
-    @TableField("file_code")
-    private String fileCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    @TableField("birthday")
-    private Date birthday;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 年龄单位
-     */
-    @TableField("age_unit")
-    private String ageUnit;
-
-    /**
-     * 国籍
-     */
-    @TableField("nationality")
-    private String nationality;
-
-    /**
-     * 新生儿出生月数
-     */
-    @TableField("newborn_month")
-    private String newbornMonth;
-
-    /**
-     * 新生儿出生天数
-     */
-    @TableField("newborn_day")
-    private String newbornDay;
-
-    /**
-     * 新生儿出生体重
-     */
-    @TableField("newborn_weight")
-    private String newbornWeight;
-
-    /**
-     * 新生儿入院体重
-     */
-    @TableField("newborn_behospital_weight")
-    private String newbornBehospitalWeight;
-
-    /**
-     * 出生地
-     */
-    @TableField("born_address")
-    private String bornAddress;
-
-    /**
-     * 籍贯
-     */
-    @TableField("born_place")
-    private String bornPlace;
-
-    /**
-     * 民族
-     */
-    @TableField("nation")
-    private String nation;
-
-    /**
-     * 身份证号
-     */
-    @TableField("identity_card_no")
-    private String identityCardNo;
-
-    /**
-     * 职业
-     */
-    @TableField("job_type")
-    private String jobType;
-
-    /**
-     * 婚姻
-     */
-    @TableField("marriage")
-    private String marriage;
-
-    /**
-     * 现住址
-     */
-    @TableField("cur_address")
-    private String curAddress;
-
-    /**
-     * 现住址电话
-     */
-    @TableField("cur_phone")
-    private String curPhone;
-
-    /**
-     * 现住址邮编
-     */
-    @TableField("cur_post_code")
-    private String curPostCode;
-
-    /**
-     * 户口地址
-     */
-    @TableField("residence_address")
-    private String residenceAddress;
-
-    /**
-     * 户口地址邮编
-     */
-    @TableField("residence_post_code")
-    private String residencePostCode;
-
-    /**
-     * 工作单位
-     */
-    @TableField("work_address")
-    private String workAddress;
-
-    /**
-     * 工作单位电话
-     */
-    @TableField("work_phone")
-    private String workPhone;
-
-    /**
-     * 工作单位邮编
-     */
-    @TableField("work_post_code")
-    private String workPostCode;
-
-    /**
-     * 联系人姓名
-     */
-    @TableField("contact_name")
-    private String contactName;
-
-    /**
-     * 联系人关系
-     */
-    @TableField("contact_relation")
-    private String contactRelation;
-
-    /**
-     * 联系人地址
-     */
-    @TableField("contact_address")
-    private String contactAddress;
-
-    /**
-     * 联系人电话
-     */
-    @TableField("contact_phone")
-    private String contactPhone;
-
-    /**
-     * 入院途径
-     */
-    @TableField("behospital_way")
-    private String behospitalWay;
-
-    /**
-     * 入院时间
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 入院科别
-     */
-    @TableField("behospital_dept")
-    private String behospitalDept;
-
-    /**
-     * 入院病房
-     */
-    @TableField("behospital_ward")
-    private String behospitalWard;
-
-    /**
-     * 入院床位序号
-     */
-    @TableField("behospital_bed_id")
-    private String behospitalBedId;
-
-    /**
-     * 入院床位号码
-     */
-    @TableField("behospital_bed_code")
-    private String behospitalBedCode;
-
-    /**
-     * 转科科别
-     */
-    @TableField("change_dept")
-    private String changeDept;
-
-    /**
-     * 出院时间
-     */
-    @TableField("leave_hospital_date")
-    private Date leaveHospitalDate;
-
-    /**
-     * 出院科别
-     */
-    @TableField("leave_hospital_dept")
-    private String leaveHospitalDept;
-
-    /**
-     * 出院病房
-     */
-    @TableField("leave_hospital_ward")
-    private String leaveHospitalWard;
-
-    /**
-     * 出院床位序号
-     */
-    @TableField("leave_hospital_bed_id")
-    private String leaveHospitalBedId;
-
-    /**
-     * 出院床位号码
-     */
-    @TableField("leave_hospital_bed_code")
-    private String leaveHospitalBedCode;
-
-    /**
-     * 实际住院天数
-     */
-    @TableField("behospital_day_num")
-    private String behospitalDayNum;
-
-    /**
-     * 门急诊诊断
-     */
-    @TableField("outpatient_emr_diagnose")
-    private String outpatientEmrDiagnose;
-
-    /**
-     * 门急诊诊断编码
-     */
-    @TableField("outpatient_emr_diagnose_code")
-    private String outpatientEmrDiagnoseCode;
-
-    /**
-     * 损伤中毒因素
-     */
-    @TableField("poison_factor")
-    private String poisonFactor;
-
-    /**
-     * 损伤中毒因素编码
-     */
-    @TableField("poison_factor_code")
-    private String poisonFactorCode;
-
-    /**
-     * 病理诊断
-     */
-    @TableField("pathology_diagnose")
-    private String pathologyDiagnose;
-
-    /**
-     * 病理诊断编码
-     */
-    @TableField("pathology_diagnose_code")
-    private String pathologyDiagnoseCode;
-
-    /**
-     * 病理诊断编号
-     */
-    @TableField("pathology_diagnose_id")
-    private String pathologyDiagnoseId;
-
-    /**
-     * 药物过敏
-     */
-    @TableField("is_med_allergy")
-    private String isMedAllergy;
-
-    /**
-     * 过敏药物
-     */
-    @TableField("med_allergy_name")
-    private String medAllergyName;
-
-    /**
-     * 死亡患者尸检
-     */
-    @TableField("autopsy")
-    private String autopsy;
-
-    /**
-     * 血型
-     */
-    @TableField("blood_type")
-    private String bloodType;
-
-    /**
-     * Rh
-     */
-    @TableField("rh")
-    private String rh;
-
-    /**
-     * 科主任
-     */
-    @TableField("dept_director")
-    private String deptDirector;
-
-    /**
-     * 主任医师
-     */
-    @TableField("director_doctor")
-    private String directorDoctor;
-
-    /**
-     * 主治医师
-     */
-    @TableField("attending_doctor")
-    private String attendingDoctor;
-
-    /**
-     * 住院医师
-     */
-    @TableField("behospital_doctor")
-    private String behospitalDoctor;
-
-    /**
-     * 责任护士
-     */
-    @TableField("response_nurse")
-    private String responseNurse;
-
-    /**
-     * 进修医师
-     */
-    @TableField("study_doctor")
-    private String studyDoctor;
-
-    /**
-     * 实习医师
-     */
-    @TableField("practice_doctor")
-    private String practiceDoctor;
-
-    /**
-     * 编码员
-     */
-    @TableField("encode_man")
-    private String encodeMan;
-
-    /**
-     * 病案质量
-     */
-    @TableField("home_page_quality")
-    private String homePageQuality;
-
-    /**
-     * 质控医师
-     */
-    @TableField("qc_doctor")
-    private String qcDoctor;
-
-    /**
-     * 质控护士
-     */
-    @TableField("qc_nurse")
-    private String qcNurse;
-
-    /**
-     * 质控日期
-     */
-    @TableField("qc_date")
-    private Date qcDate;
-
-    /**
-     * 离院方式
-     */
-    @TableField("leave_hospital_type")
-    private String leaveHospitalType;
-
-    /**
-     * 接收机构名称
-     */
-    @TableField("accept_org_code")
-    private String acceptOrgCode;
-
-    /**
-     * 31天内再住院计划
-     */
-    @TableField("again_behospital_plan")
-    private String againBehospitalPlan;
-
-    /**
-     * 再住院目的
-     */
-    @TableField("again_behospital_goal")
-    private String againBehospitalGoal;
-
-    /**
-     * 颅脑损伤患者昏迷前天数
-     */
-    @TableField("tbi_before_day")
-    private String tbiBeforeDay;
-
-    /**
-     * 颅脑损伤患者昏迷前小时
-     */
-    @TableField("tbi_before_hour")
-    private String tbiBeforeHour;
-
-    /**
-     * 颅脑损伤患者昏迷前分钟
-     */
-    @TableField("tbi_before_minute")
-    private String tbiBeforeMinute;
-
-    /**
-     * 颅脑损伤患者昏迷后天数
-     */
-    @TableField("tbi_after_day")
-    private String tbiAfterDay;
-
-    /**
-     * 颅脑损伤患者昏迷后小时
-     */
-    @TableField("tbi_after_hour")
-    private String tbiAfterHour;
-
-    /**
-     * 颅脑损伤患者昏迷后分钟
-     */
-    @TableField("tbi_after_minute")
-    private String tbiAfterMinute;
-
-    /**
-     * 总费用
-     */
-    @TableField("total_fee")
-    private String totalFee;
-
-    /**
-     * 自付金额
-     */
-    @TableField("own_fee")
-    private String ownFee;
-
-    /**
-     * 一般医疗服务费
-     */
-    @TableField("general_fee")
-    private String generalFee;
-
-    /**
-     * 一般治疗服务费
-     */
-    @TableField("service_fee")
-    private String serviceFee;
-
-    /**
-     * 护理费
-     */
-    @TableField("nurse_fee")
-    private String nurseFee;
-
-    /**
-     * 其他费用
-     */
-    @TableField("other_fee")
-    private String otherFee;
-
-    /**
-     * 病理诊断费
-     */
-    @TableField("pathology_fee")
-    private String pathologyFee;
-
-    /**
-     * 实验室诊断费
-     */
-    @TableField("lab_fee")
-    private String labFee;
-
-    /**
-     * 影像学诊断费
-     */
-    @TableField("pacs_fee")
-    private String pacsFee;
-
-    /**
-     * 临床诊断项目费
-     */
-    @TableField("clinic_diagnose_fee")
-    private String clinicDiagnoseFee;
-
-    /**
-     * 非手术治疗项目费
-     */
-    @TableField("not_operation_fee")
-    private String notOperationFee;
-
-    /**
-     * 临床物理治疗费
-     */
-    @TableField("clinic_physic_fee")
-    private String clinicPhysicFee;
-
-    /**
-     * 手术治疗费
-     */
-    @TableField("operation_treat_fee")
-    private String operationTreatFee;
-
-    /**
-     * 麻醉费
-     */
-    @TableField("anaesthesia_fee")
-    private String anaesthesiaFee;
-
-    /**
-     * 手术费
-     */
-    @TableField("operation_fee")
-    private String operationFee;
-
-    /**
-     * 康复类
-     */
-    @TableField("health_type_fee")
-    private String healthTypeFee;
-
-    /**
-     * 中医治疗费
-     */
-    @TableField("chn_treat_fee")
-    private String chnTreatFee;
-
-    /**
-     * 西药费
-     */
-    @TableField("western_med_fee")
-    private String westernMedFee;
-
-    /**
-     * 抗菌药物费用
-     */
-    @TableField("antibiosis_fee")
-    private String antibiosisFee;
-
-    /**
-     * 中成药费
-     */
-    @TableField("chn_med_fee")
-    private String chnMedFee;
-
-    /**
-     * 中草药费
-     */
-    @TableField("chn_herb_fee")
-    private String chnHerbFee;
-
-    /**
-     * 血费
-     */
-    @TableField("blood_fee")
-    private String bloodFee;
-
-    /**
-     * 白蛋白类制品费
-     */
-    @TableField("albumen_fee")
-    private String albumenFee;
-
-    /**
-     * 球蛋白类制品费
-     */
-    @TableField("globulin_fee")
-    private String globulinFee;
-
-    /**
-     * 凝血因子类制品费
-     */
-    @TableField("blood_factor_fee")
-    private String bloodFactorFee;
-
-    /**
-     * 细胞因子类制品费
-     */
-    @TableField("cell_factor_fee")
-    private String cellFactorFee;
-
-    /**
-     * 检查用一次性医用材料费
-     */
-    @TableField("check_material_fee")
-    private String checkMaterialFee;
-
-    /**
-     * 治疗用一次性医用材料费
-     */
-    @TableField("treat_material_fee")
-    private String treatMaterialFee;
-
-    /**
-     * 手术用一次性医用材料费
-     */
-    @TableField("operation_material_fee")
-    private String operationMaterialFee;
-
-    /**
-     * 其他类其他费
-     */
-    @TableField("other_type_fee")
-    private String otherTypeFee;
-
-    /**
-     * 单病种管理
-     */
-    @TableField("single_diag_manage")
-    private String singleDiagManage;
-
-    /**
-     * 临床路径管理
-     */
-    @TableField("clinic_pathway_manage")
-    private String clinicPathwayManage;
-
-    /**
-     * 门诊与住院
-     */
-    @TableField("is_outpatient_behospital")
-    private String isOutpatientBehospital;
-
-    /**
-     * 入院与出院
-     */
-    @TableField("is_leave_behospital")
-    private String isLeaveBehospital;
-
-    /**
-     * 术前与术后
-     */
-    @TableField("is_operation_before_after")
-    private String isOperationBeforeAfter;
-
-    /**
-     * 临床与病理
-     */
-    @TableField("is_clinic_pathology")
-    private String isClinicPathology;
-
-    /**
-     * 放射与病理
-     */
-    @TableField("is_radiate_pathology")
-    private String isRadiatePathology;
-
-    /**
-     * 病人抢救次数
-     */
-    @TableField("rescue_num")
-    private String rescueNum;
-
-    /**
-     * 病人抢救成功次数
-     */
-    @TableField("rescue_success_num")
-    private String rescueSuccessNum;
-
-    /**
-     * 是否为自动出院
-     */
-    @TableField("is_auto_leavehospital")
-    private String isAutoLeavehospital;
-
-    /**
-     * 转归情况
-     */
-    @TableField("return_to_type")
-    private String returnToType;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 住院期间身体约束
-     */
-    @TableField("is_physical_restraint")
-    private String isPhysicalRestraint;
-
-    /**
-     * 入院前颅脑损伤患者昏迷时间
-     */
-    @TableField("tbi_behospital_before_time")
-    private String tbiBehospitalBeforeTime;
-
-    /**
-     * 入院后颅脑损伤患者昏迷时间
-     */
-    @TableField("tbi_behospital_after_time")
-    private String tbiBehospitalAfterTime;
-
-    /**
-     * 住院期间是否发生跌倒或坠床
-     */
-    @TableField("is_fall_bed")
-    private String isFallBed;
-
-    /**
-     * 医院感染
-     */
-    @TableField("is_nosocomial_infection")
-    private String isNosocomialInfection;
-
-    /**
-     * 入住ICU情况
-     */
-    @TableField("is_into_icu")
-    private String isIntoIcu;
-
-    /**
-     * 并发症情况
-     */
-    @TableField("is_complications")
-    private String isComplications;
-
-    /**
-     * 是否发生压疮
-     */
-    @TableField("is_pressure_sore")
-    private String isPressureSore;
-
-    /**
-     * 是否住院期间发生压疮
-     */
-    @TableField("is_behospital_pressure_sore")
-    private String isBehospitalPressureSore;
-
-    /**
-     * 非计划再次手术
-     */
-    @TableField("is_unplanned_reoperation")
-    private String isUnplannedReoperation;
-
-    /**
-     * 治疗结果
-     */
-    @TableField("treatment_results")
-    private String treatmentResults;
-
-    /**
-     * 并发症
-     */
-    @TableField("complications_results")
-    private String complicationsResults;
-
-    /**
-     * 感染部位
-     */
-    @TableField("infection_site")
-    private String infectionSite;
-
-    /**
-     * 住院期间有无告病危
-     */
-    @TableField("is_be_in_danger")
-    private String isBeInDanger;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedLisInfo.java

@@ -1,130 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedLisInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    @TableId("rep_no")
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private String hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 报告类型代码
-     */
-    @TableField("rep_type")
-    private String repType;
-
-    /**
-     * 报告名称
-     */
-    @TableField("rep_name")
-    private String repName;
-
-    /**
-     * 检查类型名称
-     */
-    @TableField("rep_type_name")
-    private String repTypeName;
-
-    /**
-     * 标本名称
-     */
-    @TableField("slide_type")
-    private String slideType;
-
-    /**
-     * 发布时间
-     */
-    @TableField("rep_date")
-    private String repDate;
-
-    /**
-     * 报告检查时间
-     */
-    @TableField("check_date")
-    private String checkDate;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 开单科室代码
-     */
-    @TableField("dept_id")
-    private String deptId;
-
-    /**
-     * 开单科室名称
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 报告单状态
-     */
-    @TableField("register_flag")
-    private String registerFlag;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedLisResult.java

@@ -1,123 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedLisResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    @TableField("rep_no")
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Integer hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 报告代码
-     */
-    @TableField("item_code")
-    private String itemCode;
-
-    /**
-     * 报告名称
-     */
-    @TableField("item_name")
-    private String itemName;
-
-    /**
-     * 检验结果
-     */
-    @TableField("result")
-    private String result;
-
-    /**
-     * 参考值
-     */
-    @TableField("reference")
-    private String reference;
-
-    /**
-     * 最小参考值
-     */
-    @TableField("reference_min")
-    private String referenceMin;
-
-    /**
-     * 最大参考值
-     */
-    @TableField("reference_max")
-    private String referenceMax;
-
-    /**
-     * 单位
-     */
-    @TableField("unit")
-    private String unit;
-
-    /**
-     * 异常标志
-     */
-    @TableField("abnormal")
-    private String abnormal;
-
-    /**
-     * 异常颜色
-     */
-    @TableField("color")
-    private String color;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedMedicalRecord.java

@@ -1,103 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedMedicalRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 组织机构代码
-     */
-    @TableField("org_code")
-    private String orgCode;
-
-    /**
-     * 病历类别编号
-     */
-    @TableField("rec_type_id")
-    private String recTypeId;
-
-    /**
-     * 模块id
-     */
-    @TableField("mode_id")
-    private Long modeId;
-
-    /**
-     * 病历日期
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 病历标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 模板处理状态(0:未处理，1：已处理)
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedMedicalRecordContent.java

@@ -1,88 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedMedicalRecordContent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病历ID
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 文书内容（blob）
-     */
-    @TableField("content_blob")
-    private String contentBlob;
-
-    /**
-     * 病历文本（文本）
-     */
-    @TableField("content_text")
-    private String contentText;
-
-    /**
-     * html文本信息
-     */
-    @TableField("html_text")
-    private String htmlText;
-
-    /**
-     * xml文本信息
-     */
-    @TableField("xml_text")
-    private String xmlText;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedNurse.java

@@ -1,99 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedNurse implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 单号
-     */
-    @TableField("rep_no")
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Integer hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 测量时间
-     */
-    @TableField("measure_time")
-    private Date measureTime;
-
-    /**
-     * 生命体征名称
-     */
-    @TableField("item_name")
-    private String itemName;
-
-    /**
-     * 生命体征数值
-     */
-    @TableField("item_value")
-    private String itemValue;
-
-    /**
-     * 生命体征单位
-     */
-    @TableField("item_unit")
-    private String itemUnit;
-
-    /**
-     * 生命体征类型
-     */
-    @TableField("item_type")
-    private String itemType;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedPacsInfo.java

@@ -1,148 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedPacsInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    @TableId("rep_no")
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private String hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 报告名称
-     */
-    @TableField("rep_name")
-    private String repName;
-
-    /**
-     * 报告类型代码
-     */
-    @TableField("rep_type")
-    private String repType;
-
-    /**
-     * 检查类型名称
-     */
-    @TableField("rep_type_name")
-    private String repTypeName;
-
-    /**
-     * 检查部位
-     */
-    @TableField("part")
-    private String part;
-
-    /**
-     * 发布时间
-     */
-    @TableField("rep_date")
-    private String repDate;
-
-    /**
-     * 报告检查时间
-     */
-    @TableField("check_date")
-    private String checkDate;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 开单科室代码
-     */
-    @TableField("dept_id")
-    private String deptId;
-
-    /**
-     * 开单科室名称
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 报告单状态
-     */
-    @TableField("register_flag")
-    private String registerFlag;
-
-    /**
-     * 报告医生
-     */
-    @TableField("report_doctor")
-    private String reportDoctor;
-
-    /**
-     * 报告审核医生
-     */
-    @TableField("checker")
-    private String checker;
-
-    /**
-     * 云胶片地址
-     */
-    @TableField("yjpdz")
-    private String yjpdz;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedPacsResult.java

@@ -1,129 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class MedPacsResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 报告单号
-     */
-    @TableField("rep_no")
-    private String repNo;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Integer hospitalId;
-
-    /**
-     * 住院病人ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 报告名称
-     */
-    @TableField("rept_name")
-    private String reptName;
-
-    /**
-     * 检查部位
-     */
-    @TableField("part")
-    private String part;
-
-    /**
-     * 检查所见
-     */
-    @TableField("clinic_sight")
-    private String clinicSight;
-
-    /**
-     * 检查结果诊断
-     */
-    @TableField("rept_diag")
-    private String reptDiag;
-
-    /**
-     * 观察记录
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 临床诊断
-     */
-    @TableField("clinic_diag")
-    private String clinicDiag;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 审核医生
-     */
-    @TableField("checker_doctor")
-    private String checkerDoctor;
-
-    /**
-     * 报告医生
-     */
-    @TableField("report_doctor")
-    private String reportDoctor;
-
-    /**
-     * 科室名称
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedQcresultCases.java

@@ -1,93 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 质控评分模块评分信息 实体类
- * </p>
- */
-@Data
-public class MedQcresultCases implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 数据模块ID（0:其他模块）
-     */
-    @TableField("cases_id")
-    private Long casesId;
-
-    /**
-     * 最后得分
-     */
-    @TableField("score_res")
-    private BigDecimal scoreRes;
-
-    /**
-     * 等级
-     */
-    @TableField("level")
-    private String level;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedQcresultDetail.java

@@ -1,136 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 质控评分明细信息
-每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 实体类
- * </p>
- */
-@Data
-public class MedQcresultDetail implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 模块id
-     */
-    @TableField("cases_id")
-    private Long casesId;
-
-    /**
-     * 模块总分
-     */
-    @TableField("cases_score")
-    private BigDecimal casesScore;
-
-    /**
-     * 条目ID
-     */
-    @TableField("cases_entry_id")
-    private Long casesEntryId;
-
-    /**
-     * 人工修改分值
-     */
-    @TableField("score")
-    private BigDecimal score;
-
-    /**
-     * 提示信息
-     */
-    @TableField("msg")
-    private String msg;
-
-    /**
-     * 质控返回提示信息
-     */
-    @TableField("info")
-    private String info;
-
-    /**
-     * 单项否决（1-单项否决 0-非）
-     */
-    @TableField("is_reject")
-    private Integer isReject;
-
-    /**
-     * 初始类型(1：机器，2：人工)
-     */
-    @TableField("grade_type")
-    private Integer gradeType;
-
-    /**
-     * 操作类型(1：新增，2：删除，3：修改)
-     */
-    @TableField("opt_type")
-    private Integer optType;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 解释说明
-     */
-    @TableField("explain_info")
-    private String explainInfo;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedQcresultInfo.java

@@ -1,112 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 质控评分主表信息
-每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 实体类
- * </p>
- */
-@Data
-public class MedQcresultInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 等级
-     */
-    @TableField("level")
-    private String level;
-
-    /**
-     * 页面数据
-     */
-    @TableField("page_data")
-    private String pageData;
-
-    /**
-     * 菜单数据
-     */
-    @TableField("menu_data")
-    private String menuData;
-
-    /**
-     * 评分类型(1：机器，2：人工)
-     */
-    @TableField("grade_type")
-    private Integer gradeType;
-
-    /**
-     * 最后得分
-     */
-    @TableField("score_res")
-    private BigDecimal scoreRes;
-
-    /**
-     * 是否有病案首页(0：无，1：有)
-     */
-    @TableField("have_home_page")
-    private Integer haveHomePage;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/MedTransferRecord.java

@@ -1,135 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 转入转出记录（标记时间） 实体类
- * </p>
- */
-@Data
-public class MedTransferRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Integer hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private Integer age;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 转出日期
-     */
-    @TableField("transfer_out_date")
-    private LocalDateTime transferOutDate;
-
-    /**
-     * 转入日期
-     */
-    @TableField("transfer_in_date")
-    private LocalDateTime transferInDate;
-
-    /**
-     * 转出科室
-     */
-    @TableField("transfer_out_dept")
-    private String transferOutDept;
-
-    /**
-     * 转入科室
-     */
-    @TableField("transfer_in_dept")
-    private String transferInDept;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcCases.java

@@ -1,83 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 模块数据标准 实体类
- * </p>
- */
-@Data
-public class QcCases implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 模块名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 模块编码前缀
-     */
-    @TableField("prefix")
-    private String prefix;
-
-    /**
-     * 顺序号
-     */
-    @TableField("order_no")
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcCasesEntry.java

@@ -1,128 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病历条目 实体类
- * </p>
- */
-@Data
-public class QcCasesEntry implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 病历id
-     */
-    @TableField("cases_id")
-    private Long casesId;
-
-    @TableField("cases_name")
-    private String casesName;
-
-    /**
-     * 数据模块ID-对应qc_mode.id
-     */
-    @TableField("mode_id")
-    private Long modeId;
-
-    @TableField("code")
-    private String code;
-
-    /**
-     * 条目
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 是否控费(1：是，2：否)
-     */
-    @TableField("drgs")
-    private Integer drgs;
-
-    /**
-     * 质控形式(1：形式质控，2：内涵质控)
-     */
-    @TableField("type")
-    private Integer type;
-
-    /**
-     * 规则类型(0：无，1：空项，2：错误)
-     */
-    @TableField("rule_type")
-    private Integer ruleType;
-
-    /**
-     * 开发状态标识： 0-未开发  1-已开发
-     */
-    @TableField("dev_type")
-    private Integer devType;
-
-    /**
-     * 准确率类型：0-极高，1-高，2-中，3-低
-     */
-    @TableField("accuracy_type")
-    private Integer accuracyType;
-
-    @TableField("precond")
-    private String precond;
-
-    /**
-     * 顺序号
-     */
-    @TableField("order_no")
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcCasesEntryHospital.java

@@ -1,114 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 病历条目 实体类
- * </p>
- */
-@Data
-public class QcCasesEntryHospital implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 质控条目id
-     */
-    @TableField("cases_entry_id")
-    private Long casesEntryId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 扣分值
-     */
-    @TableField("score")
-    private BigDecimal score;
-
-    /**
-     * 扣分值（运行质控）
-     */
-    @TableField("score_run")
-    private BigDecimal scoreRun;
-
-    /**
-     * 条目提示信息
-     */
-    @TableField("msg")
-    private String msg;
-
-    /**
-     * 0-未启用 1-启用
-     */
-    @TableField("is_used")
-    private Integer isUsed;
-
-    /**
-     * 0-未启用 1-启用（运行质控）
-     */
-    @TableField("is_used_run")
-    private Integer isUsedRun;
-
-    /**
-     * 单项否决（1-单项否决 0-非）
-     */
-    @TableField("is_reject")
-    private Integer isReject;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcCasesHospital.java

@@ -1,75 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 医院模块数据 实体类
- * </p>
- */
-@Data
-public class QcCasesHospital implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 模块ID
-     */
-    @TableField("cases_id")
-    private Long casesId;
-
-    /**
-     * 模块总分
-     */
-    @TableField("score")
-    private BigDecimal score;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcMode.java

@@ -1,83 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 数据模块表 实体类
- * </p>
- */
-@Data
-public class QcMode implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 数据模块名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 排序号
-     */
-    @TableField("order_no")
-    private Integer orderNo;
-
-    /**
-     * 上级模块
-     */
-    @TableField("parent_id")
-    private Long parentId;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcType.java

@@ -1,107 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 质控类型标准 实体类
- * </p>
- */
-@Data
-public class QcType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 质控类型名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 默认模版是否开启(0-否 1-是)
-     */
-    @TableField("default_module")
-    private Integer defaultModule;
-
-    /**
-     * 父类质控id
-     */
-    @TableField("parent_type_id")
-    private String parentTypeId;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 科室ID
-     */
-    @TableField("beh_dept_id")
-    private String behDeptId;
-
-    /**
-     * 科室名称
-     */
-    @TableField("beh_dept_name")
-    private String behDeptName;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/QcTypeCasesEntry.java

@@ -1,77 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 质控类型和质控条目关联表 实体类
- * </p>
- */
-@Data
-public class QcTypeCasesEntry implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 质控类型ID
-     */
-    @TableField("type_id")
-    private Long typeId;
-
-    /**
-     * 条目数据ID
-     */
-    @TableField("case_entry_id")
-    private Long caseEntryId;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrAdmissionNote.java

@@ -1,382 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 入院记录 实体类
- * </p>
- */
-@Data
-public class StrAdmissionNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 出生日期
-     */
-    @TableField("birthday")
-    private Date birthday;
-
-    /**
-     * 婚姻状况
-     */
-    @TableField("marriage")
-    private String marriage;
-
-    /**
-     * 职业
-     */
-    @TableField("job_type")
-    private String jobType;
-
-    /**
-     * 民族
-     */
-    @TableField("nation")
-    private String nation;
-
-    /**
-     * 联系电话
-     */
-    @TableField("phone")
-    private String phone;
-
-    /**
-     * 工作单位
-     */
-    @TableField("workplace")
-    private String workplace;
-
-    /**
-     * 户口地址
-     */
-    @TableField("register_address")
-    private String registerAddress;
-
-    /**
-     * 出生地
-     */
-    @TableField("born_address")
-    private String bornAddress;
-
-    /**
-     * 预产期
-     */
-    @TableField("expect_date")
-    private String expectDate;
-
-    /**
-     * 末次月经
-     */
-    @TableField("last_menstrual")
-    private String lastMenstrual;
-
-    /**
-     * 孕/产次
-     */
-    @TableField("pregnant_num")
-    private String pregnantNum;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 病史陈述者
-     */
-    @TableField("history_teller")
-    private String historyTeller;
-
-    /**
-     * 主诉
-     */
-    @TableField("chief")
-    private String chief;
-
-    /**
-     * 现病史
-     */
-    @TableField("present")
-    private String present;
-
-    /**
-     * 既往史
-     */
-    @TableField("past_history")
-    private String pastHistory;
-
-    /**
-     * 个人史
-     */
-    @TableField("personal_history")
-    private String personalHistory;
-
-    /**
-     * 婚育史
-     */
-    @TableField("marital_history")
-    private String maritalHistory;
-
-    /**
-     * 月经史
-     */
-    @TableField("menstrual_history")
-    private String menstrualHistory;
-
-    /**
-     * 家族史
-     */
-    @TableField("family_history")
-    private String familyHistory;
-
-    /**
-     * 喂养史
-     */
-    @TableField("feeding_history")
-    private String feedingHistory;
-
-    /**
-     * 手术外伤史
-     */
-    @TableField("operation_history")
-    private String operationHistory;
-
-    /**
-     * 输血史
-     */
-    @TableField("blood_history")
-    private String bloodHistory;
-
-    /**
-     * 传染病史
-     */
-    @TableField("infection_history")
-    private String infectionHistory;
-
-    /**
-     * 专科检查
-     */
-    @TableField("special_vital")
-    private String specialVital;
-
-    /**
-     * 辅助检查
-     */
-    @TableField("assistant_exam")
-    private String assistantExam;
-
-    /**
-     * 实验室检查
-     */
-    @TableField("lis_exam")
-    private String lisExam;
-
-    /**
-     * 影像学检查
-     */
-    @TableField("pacs_exam")
-    private String pacsExam;
-
-    /**
-     * 初步诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 补充诊断
-     */
-    @TableField("supply_diagnosis")
-    private String supplyDiagnosis;
-
-    /**
-     * 修正诊断
-     */
-    @TableField("revised_diagnosis")
-    private String revisedDiagnosis;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 体温
-     */
-    @TableField("temperature")
-    private String temperature;
-
-    /**
-     * 脉搏
-     */
-    @TableField("pulse")
-    private String pulse;
-
-    /**
-     * 呼吸
-     */
-    @TableField("breathe")
-    private String breathe;
-
-    /**
-     * 血压
-     */
-    @TableField("blood_pressure")
-    private String bloodPressure;
-
-    /**
-     * 疼痛
-     */
-    @TableField("pain")
-    private String pain;
-
-    /**
-     * 体重
-     */
-    @TableField("weight")
-    private String weight;
-
-    /**
-     * 身高
-     */
-    @TableField("height")
-    private String height;
-
-    /**
-     * BMI
-     */
-    @TableField("bmi")
-    private String bmi;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrBloodResult.java

@@ -1,154 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 输血效果评价 实体类
- * </p>
- */
-@Data
-public class StrBloodResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 效果评价
-     */
-    @TableField("transfusion_evaluate")
-    private String transfusionEvaluate;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrBloodTransfusion.java

@@ -1,178 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 输血记录 实体类
- * </p>
- */
-@Data
-public class StrBloodTransfusion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_time")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_time")
-    private Date endTime;
-
-    /**
-     * 输血原因
-     */
-    @TableField("transfusion_reason")
-    private String transfusionReason;
-
-    /**
-     * 输注种类、血型、数量
-     */
-    @TableField("transfusion_type")
-    private String transfusionType;
-
-    /**
-     * 输注过程
-     */
-    @TableField("transfusion_process")
-    private String transfusionProcess;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrConsultationApply.java

@@ -1,226 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 会诊申请单 实体类
- * </p>
- */
-@Data
-public class StrConsultationApply implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 申请科室
-     */
-    @TableField("apply_dept")
-    private String applyDept;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 申请日期
-     */
-    @TableField("apply_date")
-    private Date applyDate;
-
-    /**
-     * 会诊类别
-     */
-    @TableField("invite_type")
-    private String inviteType;
-
-    /**
-     * 会诊科室
-     */
-    @TableField("invite_dept")
-    private String inviteDept;
-
-    /**
-     * 会诊医生
-     */
-    @TableField("invite_doctor")
-    private String inviteDoctor;
-
-    /**
-     * 简要病情
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("diagnosis")
-    private String diagnosis;
-
-    /**
-     * 诊疗情况
-     */
-    @TableField("treatment_situation")
-    private String treatmentSituation;
-
-    /**
-     * 会诊时间
-     */
-    @TableField("consultation_date")
-    private Date consultationDate;
-
-    /**
-     * 会诊目的
-     */
-    @TableField("consultation_purpose")
-    private String consultationPurpose;
-
-    /**
-     * 会诊意见
-     */
-    @TableField("consultation_opinions")
-    private String consultationOpinions;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrConsultationNote.java

@@ -1,226 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 会诊单（申请和结果） 实体类
- * </p>
- */
-@Data
-public class StrConsultationNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 申请科室
-     */
-    @TableField("apply_dept")
-    private String applyDept;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 申请日期
-     */
-    @TableField("apply_date")
-    private Date applyDate;
-
-    /**
-     * 会诊类别
-     */
-    @TableField("invite_type")
-    private String inviteType;
-
-    /**
-     * 会诊科室
-     */
-    @TableField("invite_dept")
-    private String inviteDept;
-
-    /**
-     * 会诊医生
-     */
-    @TableField("invite_doctor")
-    private String inviteDoctor;
-
-    /**
-     * 简要病情
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 诊疗情况
-     */
-    @TableField("treatment_situation")
-    private String treatmentSituation;
-
-    /**
-     * 会诊时间
-     */
-    @TableField("consultation_date")
-    private Date consultationDate;
-
-    /**
-     * 会诊目的
-     */
-    @TableField("consultation_purpose")
-    private String consultationPurpose;
-
-    /**
-     * 会诊意见
-     */
-    @TableField("consultation_opinions")
-    private String consultationOpinions;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrConsultationRecord.java

@@ -1,226 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 会诊记录 实体类
- * </p>
- */
-@Data
-public class StrConsultationRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 申请科室
-     */
-    @TableField("apply_dept")
-    private String applyDept;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 申请日期
-     */
-    @TableField("apply_date")
-    private Date applyDate;
-
-    /**
-     * 会诊类别
-     */
-    @TableField("invite_type")
-    private String inviteType;
-
-    /**
-     * 会诊科室
-     */
-    @TableField("invite_dept")
-    private String inviteDept;
-
-    /**
-     * 会诊医生
-     */
-    @TableField("invite_doctor")
-    private String inviteDoctor;
-
-    /**
-     * 简要病情
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 诊疗情况
-     */
-    @TableField("treatment_situation")
-    private String treatmentSituation;
-
-    /**
-     * 会诊时间
-     */
-    @TableField("consultation_date")
-    private Date consultationDate;
-
-    /**
-     * 会诊目的
-     */
-    @TableField("consultation_purpose")
-    private String consultationPurpose;
-
-    /**
-     * 会诊意见
-     */
-    @TableField("consultation_opinions")
-    private String consultationOpinions;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrConsultationResult.java

@@ -1,214 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 会诊结果单 实体类
- * </p>
- */
-@Data
-public class StrConsultationResult implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 申请科室
-     */
-    @TableField("apply_dept")
-    private String applyDept;
-
-    /**
-     * 申请医生
-     */
-    @TableField("apply_doctor")
-    private String applyDoctor;
-
-    /**
-     * 申请日期
-     */
-    @TableField("apply_date")
-    private Date applyDate;
-
-    /**
-     * 会诊类别
-     */
-    @TableField("invite_type")
-    private String inviteType;
-
-    /**
-     * 会诊科室
-     */
-    @TableField("invite_dept")
-    private String inviteDept;
-
-    /**
-     * 会诊医生
-     */
-    @TableField("invite_doctor")
-    private String inviteDoctor;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 会诊目的
-     */
-    @TableField("consultation_purpose")
-    private String consultationPurpose;
-
-    /**
-     * 会诊意见
-     */
-    @TableField("consultation_opinions")
-    private String consultationOpinions;
-
-    /**
-     * 会诊到达时间
-     */
-    @TableField("consultation_arrive_date")
-    private Date consultationArriveDate;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrCrisisNote.java

@@ -1,166 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 危急值记录 实体类
- * </p>
- */
-@Data
-public class StrCrisisNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 危急值报告
-     */
-    @TableField("crisis_note")
-    private String crisisNote;
-
-    /**
-     * 病情分析及处理
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 接收时间
-     */
-    @TableField("recieve_date")
-    private Date recieveDate;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrDeathDiscussion.java

@@ -1,214 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 死亡病例讨论记录 实体类
- * </p>
- */
-@Data
-public class StrDeathDiscussion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 死亡诊断
-     */
-    @TableField("death_diagnosis")
-    private String deathDiagnosis;
-
-    /**
-     * 死亡原因
-     */
-    @TableField("death_reason")
-    private String deathReason;
-
-    /**
-     * 死亡时间
-     */
-    @TableField("death_date")
-    private Date deathDate;
-
-    /**
-     * 讨论时间
-     */
-    @TableField("discuss_date")
-    private Date discussDate;
-
-    /**
-     * 讨论地点
-     */
-    @TableField("discuss_place")
-    private String discussPlace;
-
-    /**
-     * 主持人
-     */
-    @TableField("anchor")
-    private String anchor;
-
-    /**
-     * 参加人员
-     */
-    @TableField("participant")
-    private String participant;
-
-    /**
-     * 病史简介
-     */
-    @TableField("brief_history")
-    private String briefHistory;
-
-    /**
-     * 讨论内容
-     */
-    @TableField("discussion_content")
-    private String discussionContent;
-
-    /**
-     * 主持人小结
-     */
-    @TableField("anchor_conclusion")
-    private String anchorConclusion;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrDeathNote.java

@@ -1,190 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 死亡记录 实体类
- * </p>
- */
-@Data
-public class StrDeathNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 死亡日期
-     */
-    @TableField("death_date")
-    private Date deathDate;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_situation")
-    private String behospitalSituation;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 诊疗经过
-     */
-    @TableField("treatment_process")
-    private String treatmentProcess;
-
-    /**
-     * 死亡原因
-     */
-    @TableField("death_reason")
-    private String deathReason;
-
-    /**
-     * 死亡诊断
-     */
-    @TableField("death_diagnosis")
-    private String deathDiagnosis;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrDifficultCase.java

@@ -1,196 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 疑难病例讨论记录 实体类
- * </p>
- */
-@Data
-public class StrDifficultCase implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 讨论日期
-     */
-    @TableField("discuss_date")
-    private Date discussDate;
-
-    /**
-     * 讨论地点
-     */
-    @TableField("discuss_place")
-    private String discussPlace;
-
-    /**
-     * 主持人姓名及专业技术职务
-     */
-    @TableField("anchor_man")
-    private String anchorMan;
-
-    /**
-     * 参加人员的姓名及专业技术职务
-     */
-    @TableField("participant")
-    private String participant;
-
-    /**
-     * 病史简介
-     */
-    @TableField("brief_history")
-    private String briefHistory;
-
-    /**
-     * 讨论目的
-     */
-    @TableField("discuss_aim")
-    private String discussAim;
-
-    /**
-     * 具体讨论意见
-     */
-    @TableField("discussion_opinions")
-    private String discussionOpinions;
-
-    /**
-     * 主持人小结
-     */
-    @TableField("anchor_conclusion")
-    private String anchorConclusion;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrFirstRecord.java

@@ -1,208 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 首次病程录 实体类
- * </p>
- */
-@Data
-public class StrFirstRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 主诉
-     */
-    @TableField("chief")
-    private String chief;
-
-    /**
-     * 现病史
-     */
-    @TableField("present")
-    private String present;
-
-    /**
-     * 既往史
-     */
-    @TableField("past_history")
-    private String pastHistory;
-
-    /**
-     * 查体
-     */
-    @TableField("vital")
-    private String vital;
-
-    /**
-     * 辅检
-     */
-    @TableField("assistant_exam")
-    private String assistantExam;
-
-    /**
-     * 病例特点
-     */
-    @TableField("case_character")
-    private String caseCharacter;
-
-    /**
-     * 初步诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 诊断依据
-     */
-    @TableField("supply_diagnosis")
-    private String supplyDiagnosis;
-
-    /**
-     * 鉴别诊断
-     */
-    @TableField("revised_diagnosis")
-    private String revisedDiagnosis;
-
-    /**
-     * 诊疗计划(方案)
-     */
-    @TableField("treat_plan")
-    private String treatPlan;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrIllCritically.java

@@ -1,160 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病危通知单 实体类
- * </p>
- */
-@Data
-public class StrIllCritically implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 病情危重情况
-     */
-    @TableField("critical_situation")
-    private String criticalSituation;
-
-    /**
-     * 患者签名
-     */
-    @TableField("patient_sign")
-    private String patientSign;
-
-    /**
-     * 患者签名时间
-     */
-    @TableField("patient_sign_date")
-    private Date patientSignDate;
-
-    /**
-     * 医生签名
-     */
-    @TableField("doctor_sign")
-    private String doctorSign;
-
-    /**
-     * 医生签名时间
-     */
-    @TableField("doctor_sign_date")
-    private Date doctorSignDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrIllSeriousl.java

@@ -1,160 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 病重通知单 实体类
- * </p>
- */
-@Data
-public class StrIllSeriousl implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 当前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 病情危重情况
-     */
-    @TableField("critical_situation")
-    private String criticalSituation;
-
-    /**
-     * 患者签名
-     */
-    @TableField("patient_sign")
-    private String patientSign;
-
-    /**
-     * 患者签名时间
-     */
-    @TableField("patient_sign_date")
-    private Date patientSignDate;
-
-    /**
-     * 医生签名
-     */
-    @TableField("doctor_sign")
-    private String doctorSign;
-
-    /**
-     * 医生签名时间
-     */
-    @TableField("doctor_sign_date")
-    private Date doctorSignDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrInformedConsent.java

@@ -1,88 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class StrInformedConsent implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病历ID
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 文书内容（blob）
-     */
-    @TableField("content")
-    private String content;
-
-    /**
-     * 文书类别
-     */
-    @TableField("rec_type")
-    private String recType;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrLeaveHospital.java

@@ -1,208 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 出院小结 实体类
- * </p>
- */
-@Data
-public class StrLeaveHospital implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 入院日期
-     */
-    @TableField("behospital_date")
-    private Date behospitalDate;
-
-    /**
-     * 出院日期
-     */
-    @TableField("leave_hospital_date")
-    private Date leaveHospitalDate;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 出院诊断
-     */
-    @TableField("leave_diagnosis")
-    private String leaveDiagnosis;
-
-    /**
-     * 住院天数
-     */
-    @TableField("behospital_day_num")
-    private String behospitalDayNum;
-
-    /**
-     * 入院原因
-     */
-    @TableField("behospital_reason")
-    private String behospitalReason;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_situation")
-    private String behospitalSituation;
-
-    /**
-     * 诊治经过
-     */
-    @TableField("treatment_process")
-    private String treatmentProcess;
-
-    /**
-     * 出院情况
-     */
-    @TableField("leave_hospital_situation")
-    private String leaveHospitalSituation;
-
-    /**
-     * 出院医嘱
-     */
-    @TableField("leave_hospital_doctoradvice")
-    private String leaveHospitalDoctoradvice;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrOperativeFirstRecord.java

@@ -1,255 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 术后首程 实体类
- * </p>
- */
-@Data
-public class StrOperativeFirstRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableField("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 手术日期
-     */
-    @TableField("operation_date")
-    private Date operationDate;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_time")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_time")
-    private Date endTime;
-
-    /**
-     * 麻醉方式
-     */
-    @TableField("narcosis_type")
-    private String narcosisType;
-
-    /**
-     * 麻醉医师
-     */
-    @TableField("narcosis_doctor")
-    private String narcosisDoctor;
-
-    /**
-     * 术前诊断
-     */
-    @TableField("preoperation_diagnosis")
-    private String preoperationDiagnosis;
-
-    /**
-     * 术（中）后诊断
-     */
-    @TableField("postoperative_diagnosis")
-    private String postoperativeDiagnosis;
-
-    /**
-     * 手术人员
-     */
-    @TableField("operation_man")
-    private String operationMan;
-
-    /**
-     * 手术名称方式
-     */
-    @TableField("operation_name")
-    private String operationName;
-
-    /**
-     * 手术简要经过
-     */
-    @TableField("operation_process")
-    private String operationProcess;
-
-    /**
-     * 患者术后情况
-     */
-    @TableField("postoperative_situation")
-    private String postoperativeSituation;
-
-    /**
-     * 术后处理措施
-     */
-    @TableField("postoperative_treatment")
-    private String postoperativeTreatment;
-
-    /**
-     * 术后注意事项
-     */
-    @TableField("postoperative_notice")
-    private String postoperativeNotice;
-
-    /**
-     * 术后可能出现的并发症及预防措施
-     */
-    @TableField("postoperative_complication")
-    private String postoperativeComplication;
-
-    /**
-     * 手术切除标本
-     */
-    @TableField("operation_specimen")
-    private String operationSpecimen;
-
-    /**
-     * 术中出血量
-     */
-    @TableField("operation_bleed")
-    private String operationBleed;
-
-    /**
-     * 术中输血量
-     */
-    @TableField("operation_blood_transfusion")
-    private String operationBloodTransfusion;
-
-    /**
-     * 术中并发症
-     */
-    @TableField("operation_complication")
-    private String operationComplication;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrOperativeNote.java

@@ -1,262 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 手术记录 实体类
- * </p>
- */
-@Data
-public class StrOperativeNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 手术日期
-     */
-    @TableField("operation_date")
-    private Date operationDate;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_time")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_time")
-    private Date endTime;
-
-    /**
-     * 术前诊断
-     */
-    @TableField("preoperation_diagnosis")
-    private String preoperationDiagnosis;
-
-    /**
-     * 手术名称
-     */
-    @TableField("operation_name")
-    private String operationName;
-
-    /**
-     * 术（中）后诊断
-     */
-    @TableField("postoperative_diagnosis")
-    private String postoperativeDiagnosis;
-
-    /**
-     * 主刀医师
-     */
-    @TableField("operation_surgeon")
-    private String operationSurgeon;
-
-    /**
-     * 一助
-     */
-    @TableField("first_helping")
-    private String firstHelping;
-
-    /**
-     * 二助
-     */
-    @TableField("second_helping")
-    private String secondHelping;
-
-    /**
-     * 麻醉医师
-     */
-    @TableField("narcosis_doctor")
-    private String narcosisDoctor;
-
-    /**
-     * 麻醉方式
-     */
-    @TableField("narcosis_type")
-    private String narcosisType;
-
-    /**
-     * 切口类别
-     */
-    @TableField("cut_type")
-    private String cutType;
-
-    /**
-     * 病理诊断
-     */
-    @TableField("pathological_diagnosis")
-    private String pathologicalDiagnosis;
-
-    /**
-     * 是否术中植入物
-     */
-    @TableField("is_implants")
-    private String isImplants;
-
-    /**
-     * 植入物名称
-     */
-    @TableField("implants_name")
-    private String implantsName;
-
-    /**
-     * 出血
-     */
-    @TableField("blood_loss")
-    private String bloodLoss;
-
-    /**
-     * 术中所见
-     */
-    @TableField("intraoperative_view")
-    private String intraoperativeView;
-
-    /**
-     * 术后注意事项
-     */
-    @TableField("postoperative_notice")
-    private String postoperativeNotice;
-
-    /**
-     * 手术经过及处理
-     */
-    @TableField("operation_process")
-    private String operationProcess;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrPeriodConclusion.java

@@ -1,196 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 阶段小结 实体类
- * </p>
- */
-@Data
-public class StrPeriodConclusion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 参加人员
-     */
-    @TableField("participant")
-    private String participant;
-
-    /**
-     * 主诉
-     */
-    @TableField("chief")
-    private String chief;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_situation")
-    private String behospitalSituation;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 诊治经过
-     */
-    @TableField("treatment_process")
-    private String treatmentProcess;
-
-    /**
-     * 目前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 目前情况
-     */
-    @TableField("present_situation")
-    private String presentSituation;
-
-    /**
-     * 诊疗计划
-     */
-    @TableField("treat_plan")
-    private String treatPlan;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrPreoperativeDiscussion.java

@@ -1,226 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 术前讨论小结 实体类
- * </p>
- */
-@Data
-public class StrPreoperativeDiscussion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 讨论时间
-     */
-    @TableField("discuss_time")
-    private Date discussTime;
-
-    /**
-     * 讨论方式
-     */
-    @TableField("discuss_type")
-    private String discussType;
-
-    /**
-     * 参加人员
-     */
-    @TableField("participant")
-    private String participant;
-
-    /**
-     * 简要病情
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 术前诊断
-     */
-    @TableField("preoperation_diagnosis")
-    private String preoperationDiagnosis;
-
-    /**
-     * 手术指征与禁忌
-     */
-    @TableField("operation_indication")
-    private String operationIndication;
-
-    /**
-     * 可替代的方案
-     */
-    @TableField("replace_plan")
-    private String replacePlan;
-
-    /**
-     * 拟施手术方式、名称及可能的变更与禁忌症
-     */
-    @TableField("operation_name")
-    private String operationName;
-
-    /**
-     * 拟施麻醉方式
-     */
-    @TableField("anesthesia_type")
-    private String anesthesiaType;
-
-    /**
-     * 术前准备
-     */
-    @TableField("preoperation_prepare")
-    private String preoperationPrepare;
-
-    /**
-     * 主要术中、术后风险及防范措施
-     */
-    @TableField("intraoperative_risk")
-    private String intraoperativeRisk;
-
-    /**
-     * 术中注意事项
-     */
-    @TableField("intraoperative_notice")
-    private String intraoperativeNotice;
-
-    /**
-     * 术后注意事项
-     */
-    @TableField("postoperative_notice")
-    private String postoperativeNotice;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrRescueNote.java

@@ -1,178 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 抢救记录 实体类
- * </p>
- */
-@Data
-public class StrRescueNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_time")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_time")
-    private Date endTime;
-
-    /**
-     * 简要病情
-     */
-    @TableField("brief_note")
-    private String briefNote;
-
-    /**
-     * 抢救措施
-     */
-    @TableField("resuscitation")
-    private String resuscitation;
-
-    /**
-     * 参加抢救的医务人员姓名及专业技术职称
-     */
-    @TableField("rescue_man")
-    private String rescueMan;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrTalkInform.java

@@ -1,88 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *  实体类
- * </p>
- */
-@Data
-public class StrTalkInform implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病历ID
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 病人住院ID
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 文书内容（blob）
-     */
-    @TableField("content")
-    private String content;
-
-    /**
-     * 文书类别
-     */
-    @TableField("rec_type")
-    private String recType;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrTransferInNote.java

@@ -1,208 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 转入记录 实体类
- * </p>
- */
-@Data
-public class StrTransferInNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 转入日期
-     */
-    @TableField("transfer_in_date")
-    private Date transferInDate;
-
-    /**
-     * 转出科室
-     */
-    @TableField("transfer_out_dept")
-    private String transferOutDept;
-
-    /**
-     * 转入科室
-     */
-    @TableField("transfer_in_dept")
-    private String transferInDept;
-
-    /**
-     * 主诉
-     */
-    @TableField("chief")
-    private String chief;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_situation")
-    private String behospitalSituation;
-
-    /**
-     * 目前病情
-     */
-    @TableField("current_situation")
-    private String currentSituation;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 诊疗经过
-     */
-    @TableField("treatment_process")
-    private String treatmentProcess;
-
-    /**
-     * 目前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 转入诊疗计划
-     */
-    @TableField("treat_plan")
-    private String treatPlan;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrTransferOutNote.java

@@ -1,208 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 转出记录 实体类
- * </p>
- */
-@Data
-public class StrTransferOutNote implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 标题
-     */
-    @TableField("rec_title")
-    private String recTitle;
-
-    /**
-     * 转入日期
-     */
-    @TableField("transfer_in_date")
-    private Date transferInDate;
-
-    /**
-     * 转出科室
-     */
-    @TableField("transfer_out_dept")
-    private String transferOutDept;
-
-    /**
-     * 转入科室
-     */
-    @TableField("transfer_in_dept")
-    private String transferInDept;
-
-    /**
-     * 主诉
-     */
-    @TableField("chief")
-    private String chief;
-
-    /**
-     * 入院情况
-     */
-    @TableField("behospital_situation")
-    private String behospitalSituation;
-
-    /**
-     * 目前病情
-     */
-    @TableField("current_situation")
-    private String currentSituation;
-
-    /**
-     * 入院诊断
-     */
-    @TableField("tentative_diagnosis")
-    private String tentativeDiagnosis;
-
-    /**
-     * 诊疗经过
-     */
-    @TableField("treatment_process")
-    private String treatmentProcess;
-
-    /**
-     * 目前诊断
-     */
-    @TableField("current_diagnosis")
-    private String currentDiagnosis;
-
-    /**
-     * 转入诊疗计划
-     */
-    @TableField("treat_plan")
-    private String treatPlan;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/StrWardRecord.java

@@ -1,190 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 查房记录 实体类
- * </p>
- */
-@Data
-public class StrWardRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 记录编号
-     */
-    @TableId("rec_id")
-    private String recId;
-
-    /**
-     * 医院ID
-     */
-    @TableField("hospital_id")
-    private Long hospitalId;
-
-    /**
-     * 病历号
-     */
-    @TableField("behospital_code")
-    private String behospitalCode;
-
-    /**
-     * 姓名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 年龄
-     */
-    @TableField("age")
-    private String age;
-
-    /**
-     * 床号
-     */
-    @TableField("bed_no")
-    private String bedNo;
-
-    /**
-     * 科别
-     */
-    @TableField("dept_name")
-    private String deptName;
-
-    /**
-     * 性别
-     */
-    @TableField("sex")
-    private String sex;
-
-    /**
-     * 病历日期
-     */
-    @TableField("record_date")
-    private Date recordDate;
-
-    /**
-     * 查房日期
-     */
-    @TableField("ward_date")
-    private Date wardDate;
-
-    /**
-     * 查房医生
-     */
-    @TableField("ward_doctor")
-    private String wardDoctor;
-
-    /**
-     * 标题
-     */
-    @TableField("ward_title")
-    private String wardTitle;
-
-    /**
-     * 病情记录
-     */
-    @TableField("ward_content")
-    private String wardContent;
-
-    /**
-     * S
-     */
-    @TableField("ward_s")
-    private String wardS;
-
-    /**
-     * O
-     */
-    @TableField("ward_o")
-    private String wardO;
-
-    /**
-     * A
-     */
-    @TableField("ward_a")
-    private String wardA;
-
-    /**
-     * P
-     */
-    @TableField("ward_p")
-    private String wardP;
-
-    /**
-     * 记录医生
-     */
-    @TableField("rec_doctor")
-    private String recDoctor;
-
-    /**
-     * 记录时间
-     */
-    @TableField("rec_date")
-    private Date recDate;
-
-    /**
-     * 审核医生
-     */
-    @TableField("audit_doctor")
-    private String auditDoctor;
-
-    /**
-     * 审核时间
-     */
-    @TableField("audit_date")
-    private Date auditDate;
-
-    /**
-     * 结构化数据
-     */
-    @TableField("whole_data")
-    private String wholeData;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-    /**
-     * 是否删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人
-     */
-    @TableField("modifier")
-    private String modifier;
-
-}

report-service/src/main/java/com/lantone/analyze/entity/UserPageset.java

@@ -1,103 +0,0 @@
-package com.lantone.analyze.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户页面设定表 实体类
- * </p>
- */
-@Data
-@TableName("sys_user_pageset")
-public class UserPageset implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    @TableField("is_deleted")
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    @TableField("gmt_create")
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    @TableField("gmt_modified")
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    @TableField("creator")
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    @TableField("modifier")
-    private String modifier;
-
-    /**
-     * 系统用户表.用户ID
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 页面分组（值自定义）
-     */
-    @TableField("page_type")
-    private Long pageType;
-
-    /**
-     * 列名
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 列名值
-     */
-    @TableField("val")
-    private String val;
-
-    /**
-     * 是否启用(0:停用，1：启用)
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 排序号
-     */
-    @TableField("order_no")
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}

report-service/src/main/java/com/lantone/analyze/facade/analyze/AlgorithmFacade.java

@@ -1,388 +0,0 @@
-package com.lantone.analyze.facade.analyze;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.dto.analyze.AlgorithmDTO;
-import com.lantone.common.enums.IsDeleteEnum;
-import com.lantone.common.exception.Asserts;
-import com.lantone.common.util.BigDecimalUtil;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.StringUtil;
-import com.lantone.vo.analyze.AlgorithmVO;
-import com.lantone.vo.analyze.MedQcresultCasesVO;
-import com.lantone.vo.analyze.QcResultAlgVO;
-import com.lantone.dblayermbg.entity.HospitalSet;
-import com.lantone.analyze.entity.MedQcresultDetail;
-import com.lantone.dblayermbg.facade.HospitalSetFacade;
-import com.lantone.report.facade.base.analyze.MedQcresultDetailFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 评分算法
- * @author: gaodm
- * @time: 2020/4/14 9:52
- */
-@Component
-public class AlgorithmFacade {
-    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3,4);
-
-    @Autowired
-    private HospitalSetFacade sysHospitalSetFacade;
-    @Autowired
-    private MedQcresultDetailFacade qcresultDetailFacade;
-
-    /**
-     * 获取评分结果和等级
-     *
-     * @param algorithmVO 操作条目的所有信息
-     * @return 评分结果和等级
-     */
-    public AlgorithmDTO getAlgorithmRes(AlgorithmVO algorithmVO) {
-        AlgorithmDTO algorithmDTO = new AlgorithmDTO();
-        BigDecimal score = getScore(algorithmVO);
-        algorithmDTO.setScore(score);
-        algorithmDTO.setLevel(this.getLevel(score));
-        return algorithmDTO;
-    }
-
-    /**
-     * 评结果分数
-     *
-     * @param algorithmVO 操作条目的所有信息
-     * @return 评结果分数
-     */
-    private BigDecimal getScore(AlgorithmVO algorithmVO) {
-        if (!types.contains(algorithmVO.getType())) {
-            Asserts.fail("操作类型只有0,1,2,3!");
-        }
-        //处理数据
-        dataDeal(algorithmVO);
-
-        BigDecimal res = BigDecimal.ZERO;
-        //统一为长兴的算法
-        res = getScoreForCx(algorithmVO);
-        return res;
-    }
-
-    /**
-     * 评结果分数(长兴)
-     *
-     * @param algorithmVO 操作条目的所有信息
-     * @return 评结果分数
-     */
-    private BigDecimal getScoreForCx(AlgorithmVO algorithmVO) {
-        List<QcResultAlgVO> qcResultAlgHomePage = new ArrayList<>();
-        List<QcResultAlgVO> qcResultAlgHomePageExt = new ArrayList<>();
-        for (QcResultAlgVO qcResultAlgVO : algorithmVO.getQcResultAlgVOList()) {
-            //首页的情况
-            if (qcResultAlgVO.getCasesId().equals(243L)) {
-                qcResultAlgHomePage.add(qcResultAlgVO);
-            } else {
-                //非首页
-                qcResultAlgHomePageExt.add(qcResultAlgVO);
-            }
-        }
-        List<MedQcresultCasesVO> medQcresultCasesVOList = new ArrayList<>();
-        //病案首页
-        AlgorithmVO homePage = new AlgorithmVO();
-        BeanUtil.copyProperties(algorithmVO, homePage);
-        homePage.setQcResultAlgVOList(qcResultAlgHomePage);
-        homePage.setIsHomePage(true);
-        BigDecimal homePageRes = cal(homePage);
-        String level = getHomePageLevel(homePageRes);
-        MedQcresultCasesVO medQcresultCasesVOHp = new MedQcresultCasesVO();
-        medQcresultCasesVOHp.setHospitalId(algorithmVO.getHospitalId());
-        medQcresultCasesVOHp.setBehospitalCode(algorithmVO.getBehospitalCode());
-        medQcresultCasesVOHp.setCasesId(243L);
-        medQcresultCasesVOHp.setScoreRes(homePageRes);
-        medQcresultCasesVOHp.setLevel(level);
-        medQcresultCasesVOList.add(medQcresultCasesVOHp);
-        //病案首页以外
-        AlgorithmVO homePageExt = new AlgorithmVO();
-        BeanUtil.copyProperties(algorithmVO, homePageExt);
-        homePageExt.setQcResultAlgVOList(qcResultAlgHomePageExt);
-        BigDecimal homePageExtRes = cal(homePageExt);
-        MedQcresultCasesVO medQcresultCasesVOHpExt = new MedQcresultCasesVO();
-        medQcresultCasesVOHpExt.setHospitalId(algorithmVO.getHospitalId());
-        medQcresultCasesVOHpExt.setBehospitalCode(algorithmVO.getBehospitalCode());
-        medQcresultCasesVOHpExt.setCasesId(0L);
-        medQcresultCasesVOHpExt.setScoreRes(homePageExtRes);
-        medQcresultCasesVOHpExt.setLevel("");
-        medQcresultCasesVOList.add(medQcresultCasesVOHpExt);
-        algorithmVO.setMedQcresultCasesVOList(medQcresultCasesVOList);
-        //计算分数(120分计分方式)
-        BigDecimal res = homePageRes
-                .add(homePageExtRes)
-                .multiply(new BigDecimal(100))
-                .divide(new BigDecimal(120), 1, RoundingMode.HALF_UP);
-        // 判断是否是百分制
-        String val = "0";
-        HospitalSet sysHospitalSet
-                = sysHospitalSetFacade.getOne(new QueryWrapper<HospitalSet>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("hospital_id", algorithmVO.getHospitalId())
-                        .eq("code", "score_type")
-                , false);
-        if (null != sysHospitalSet
-                && sysHospitalSet.getVal().equals("1")) {
-            val = "1";
-        }
-        if (val.equals("1")
-                ||(algorithmVO.getHospitalId().intValue() == 1
-                && StringUtil.isNotBlank(algorithmVO.getIsPlacefile())
-                && algorithmVO.getIsPlacefile().equals("0"))) {
-            //按照百分制计算总得分
-            res = cal(algorithmVO);
-        }
-        return res;
-    }
-
-    /**
-     * 根据分数评定等级（病案首页）
-     *
-     * @param score 评分分数
-     * @return 等级
-     */
-    private String getHomePageLevel(BigDecimal score) {
-        String level = "不合格";
-        //得分≥18分为甲级
-        if (BigDecimalUtil.ge(score, new BigDecimal(18))) {
-            level = "合格";
-        }
-        return level;
-    }
-
-    /**
-     * 根据分数评定等级
-     *
-     * @param score 评分分数
-     * @return 等级
-     */
-    private String getLevel(BigDecimal score) {
-        String level = "甲";
-        //得分≥90分为甲级
-        if (BigDecimalUtil.ge(score, new BigDecimal(90))) {
-            level = "甲";
-        }
-        //得分<90分且得分≥80分为乙级
-        if (BigDecimalUtil.lt(score, new BigDecimal(90))
-                && BigDecimalUtil.ge(score, new BigDecimal(80))) {
-            level = "乙";
-        }
-        //得分<80分为丙级
-        if (BigDecimalUtil.lt(score, new BigDecimal(80))) {
-            level = "丙";
-        }
-
-        return level;
-    }
-
-    /**
-     * 处理数据
-     *
-     * @param algorithmVO 操作条目的所有信息
-     */
-    private void dataDeal(AlgorithmVO algorithmVO) {
-        List<QcResultAlgVO> qcResultAlgVOList = algorithmVO.getQcResultAlgVOList();
-        //新增
-        if (algorithmVO.getType().equals(1)) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail("新增操作条目不能为空！");
-            }
-            //验证和操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getCasesId().equals(algorithmVO.getOptResultAlgVO().getCasesId())
-                            && qcResultAlgVO.getCasesEntryId().equals(algorithmVO.getOptResultAlgVO().getCasesEntryId())) {
-                        Asserts.fail("不能重复加入已经评分的条目");
-                    } else {
-                        if (algorithmVO.getOptResultAlgVO().getCasesId().equals(qcResultAlgVO.getCasesId())) {
-                            algorithmVO.getOptResultAlgVO().setCasesScore(qcResultAlgVO.getCasesScore());
-                        }
-                    }
-                }
-                qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-            }
-            if(ListUtil.isEmpty(qcResultAlgVOList)){
-                qcResultAlgVOList = new ArrayList<>();
-                qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-                algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
-            }
-        }
-        //删除
-        else if (algorithmVO.getType().equals(2)||(algorithmVO.getType().equals(4)&&0==algorithmVO.getDelStatus())) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail( "删除操作条目不能为空！");
-            }
-            //操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                Boolean hasData = false;
-                Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getId().equals(optId)) {
-                        qcResultAlgVOList.remove(qcResultAlgVO);
-                        hasData = true;
-                        break;
-                    }
-                }
-                if (!hasData) {
-                    Asserts.fail("删除的条目不存在！");
-                }
-            }
-        }
-        //恢复
-        else if (algorithmVO.getType().equals(4)&&1==algorithmVO.getDelStatus()) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail( "恢复操作条目不能为空！");
-            }
-            //操作数据
-            Boolean hasData = false;
-            Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
-            MedQcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<MedQcresultDetail>()
-                    .eq("id",optId));
-            if(qcresultDetail!=null)
-            {
-                QcResultAlgVO qcResultAlgVO = new QcResultAlgVO();
-                qcResultAlgVO.setScore(qcresultDetail.getScore());
-                qcResultAlgVO.setId(qcresultDetail.getId());
-                qcResultAlgVO.setCasesEntryId(qcresultDetail.getCasesEntryId());
-                qcResultAlgVO.setCasesId(qcresultDetail.getCasesId());
-                qcResultAlgVO.setMsg(qcresultDetail.getMsg());
-                qcResultAlgVO.setIsReject(qcresultDetail.getIsReject());
-                qcResultAlgVO.setCasesScore(qcresultDetail.getCasesScore());
-                if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                    qcResultAlgVOList.add(qcResultAlgVO);
-                }else{
-                    qcResultAlgVOList = new ArrayList<>();
-                    qcResultAlgVOList.add(qcResultAlgVO);
-                    algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
-                }
-                hasData = true;
-            }
-                if (!hasData) {
-                    Asserts.fail( "恢复的条目不存在！");
-                }
-        }
-
-        //修改
-        else if (algorithmVO.getType().equals(3)) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail( "修改操作条目不能为空！");
-            }
-            //操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                Boolean hasData = false;
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getId().equals(algorithmVO.getOptResultAlgVO().getId())) {
-                        qcResultAlgVOList.remove(qcResultAlgVO);
-                        qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-                        hasData = true;
-                        break;
-                    }
-                }
-                if (!hasData) {
-                    Asserts.fail( "修改的条目不存在！");
-                }
-            }
-        }
-    }
-
-    /**
-     * 计算分数
-     *
-     * @param algorithmVO 操作条目的所有信息
-     * @return 评分分数
-     */
-    private BigDecimal cal(AlgorithmVO algorithmVO) {
-        BigDecimal res = new BigDecimal(100);
-        //统一为长兴的算法
-        if (algorithmVO.getIsHomePage().equals(true)) {
-            res = new BigDecimal(20);
-        }
-        //模块总分
-        Map<Long, BigDecimal> casesMap = new HashMap<>();
-        //单票否决计分
-        BigDecimal rejectScore = BigDecimal.ZERO;
-        //模块计分
-        Map<Long, BigDecimal> casesScoreMap = new HashMap<>();
-
-        List<QcResultAlgVO> qcResultAlgVOList = algorithmVO.getQcResultAlgVOList();
-        if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-            for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                if (!casesMap.containsKey(qcResultAlgVO.getCasesId())) {
-                    casesMap.put(qcResultAlgVO.getCasesId(), qcResultAlgVO.getCasesScore());
-                }
-                if (!casesScoreMap.containsKey(qcResultAlgVO.getCasesId())) {
-                    casesScoreMap.put(qcResultAlgVO.getCasesId(), BigDecimal.ZERO);
-                }
-                //单票否决计分
-                if (qcResultAlgVO.getIsReject().equals(1)) {
-                    rejectScore = rejectScore.add(qcResultAlgVO.getScore());
-                } else {
-                    //非单票否决计分
-                    if (casesScoreMap.containsKey(qcResultAlgVO.getCasesId())) {
-                        BigDecimal casesScore = casesScoreMap.get(qcResultAlgVO.getCasesId());
-                        casesScore = casesScore.add(qcResultAlgVO.getScore());
-                        casesScoreMap.put(qcResultAlgVO.getCasesId(), casesScore);
-                    }
-                }
-            }
-
-            //结果先减去单票否决计分总和
-            res = res.subtract(rejectScore);
-            //结果小于0按0计算
-            if (BigDecimalUtil.lt(res, BigDecimal.ZERO)) {
-                return BigDecimal.ZERO;
-            } else {
-                //模块计分
-                for (Map.Entry<Long, BigDecimal> casesScore : casesScoreMap.entrySet()) {
-                    BigDecimal allSccore = casesMap.get(casesScore.getKey());
-                    if (BigDecimalUtil.le(allSccore, casesScore.getValue())) {
-                        //模块标准分小于等于模块减分总和就用模块标准分
-                        res = res.subtract(allSccore);
-                    } else {
-                        //模块标准分大于模块减分总和就用模块减分总和
-                        res = res.subtract(casesScore.getValue());
-                    }
-                }
-            }
-            //结果小于0按0计算
-            if (BigDecimalUtil.lt(res, BigDecimal.ZERO)) {
-                res = BigDecimal.ZERO;
-            }
-        }
-        return res;
-    }
-
-    public static void main(String[] args) {
-        AlgorithmFacade algorithmFacade = new AlgorithmFacade();
-        System.out.println("100:" + algorithmFacade.getLevel(new BigDecimal(100)));
-        System.out.println("95:" + algorithmFacade.getLevel(new BigDecimal(95)));
-        System.out.println("90.1:" + algorithmFacade.getLevel(new BigDecimal(90.1)));
-        System.out.println("90:" + algorithmFacade.getLevel(new BigDecimal(90)));
-        System.out.println("85:" + algorithmFacade.getLevel(new BigDecimal(85)));
-        System.out.println("80.1:" + algorithmFacade.getLevel(new BigDecimal(80.1)));
-        System.out.println("80:" + algorithmFacade.getLevel(new BigDecimal(80)));
-        System.out.println("79.9:" + algorithmFacade.getLevel(new BigDecimal(79.9)));
-        System.out.println("60:" + algorithmFacade.getLevel(new BigDecimal(60)));
-        System.out.println("0:" + algorithmFacade.getLevel(new BigDecimal(0)));
-
-
-        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(20)));
-        System.out.println("18:" + algorithmFacade.getHomePageLevel(new BigDecimal(18)));
-        System.out.println("17.9:" + algorithmFacade.getHomePageLevel(new BigDecimal(17.9)));
-
-        if (BigDecimalUtil.lt(new BigDecimal(-1), BigDecimal.ZERO)) {
-            System.out.println(BigDecimal.ZERO);
-        }
-    }
-}

report-service/src/main/java/com/lantone/analyze/facade/analyze/QcClientFacade.java

@@ -1,67 +0,0 @@
-package com.lantone.analyze.facade.analyze;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.analyze.client.QcServiceClient;
-import com.lantone.dto.analyze.OutputInfo;
-import com.lantone.dto.analyze.Response;
-import com.lantone.common.enums.IsDeleteEnum;
-import com.lantone.common.exception.Asserts;
-import com.lantone.common.util.StringUtil;
-import com.lantone.vo.analyze.QueryVo;
-import com.lantone.dblayermbg.entity.HospitalSet;
-import com.lantone.dblayermbg.facade.HospitalSetFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.net.URI;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/7/8 11:33
- */
-@Component
-public class QcClientFacade {
-
-    @Autowired
-    private QcServiceClient qcServiceClient;
-    @Autowired
-    private HospitalSetFacade sysHospitalSetFacade;
-
-    public Response<OutputInfo> extract(QueryVo queryVo) {
-        URI uri = getUri(queryVo);
-        return qcServiceClient.extract(uri, queryVo);
-    }
-
-    public Response<OutputInfo> analyseField(QueryVo queryVo) {
-        URI uri = getUri(queryVo);
-        return qcServiceClient.analyseField(uri, queryVo);
-    }
-
-    private URI getUri(QueryVo queryVo) {
-        URI uri = null;
-//        String code = "active_profiles_" + SpringContextUtil.getActiveProfile();
-        String code = "active_profiles_local";
-        String url = "";
-        HospitalSet sysHospitalSet
-                = sysHospitalSetFacade.getOne(new QueryWrapper<HospitalSet>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("hospital_id", Long.valueOf(queryVo.getHospitalId()))
-                        .eq("code", code)
-                , false);
-        if (null != sysHospitalSet
-                && StringUtil.isNotBlank(sysHospitalSet.getVal())) {
-            url = sysHospitalSet.getVal();
-        }
-        if (StringUtil.isBlank(url)) {
-            Asserts.fail("配置表内找不到评分接口地址数据！");
-        }
-        try {
-//            uri = new URI(url);
-            uri = new URI("http://localhost:6010");
-        } catch (Exception e) {
-            Asserts.fail("各自业务错误");
-        }
-        return uri;
-    }
-}

report-service/src/main/java/com/lantone/analyze/facade/analyze/UserPagesetManagementFacade.java

@@ -1,116 +0,0 @@
-package com.lantone.analyze.facade.analyze;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.dto.analyze.SysUserPagesetDTO;
-import com.lantone.common.enums.IsDeleteEnum;
-import com.lantone.common.exception.Asserts;
-import com.lantone.common.util.BeanUtil;
-import com.lantone.common.util.DateUtil;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.SysUserUtils;
-import com.lantone.vo.analyze.SysUserPagesetQueryVO;
-import com.lantone.vo.analyze.SysUserPagesetSaveVO;
-import com.lantone.vo.analyze.SysUserPagesetVO;
-import com.lantone.analyze.entity.UserPageset;
-import com.lantone.analyze.service.impl.UserPagesetServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @Author songxl
- * @Date 2021/9/28
- */
-@Component
-public class UserPagesetManagementFacade {
-    @Autowired
-    @Qualifier("userPagesetServiceImpl")
-    private UserPagesetServiceImpl userPagesetService;
-
-    /**
-     * 获取用户对应页面设置
-     *
-     * @param sysUserPagesetQueryVO 获取用户对应页面设置参数
-     * @return 对应页面设置列表
-     */
-    public List<SysUserPagesetDTO> getPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
-        List<UserPageset> sysUserPagesetList = userPagesetService.list(
-                new QueryWrapper<UserPageset>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("user_id", SysUserUtils.getCurrentPrincipleId())
-                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                        .orderByAsc("order_no")
-        );
-
-        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
-        if (ListUtil.isEmpty(sysUserPagesetList)) {
-            List<UserPageset> sysUserPagesetListDefault = userPagesetService.list(
-                    new QueryWrapper<UserPageset>()
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .eq("user_id", -1)
-                            .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                            .orderByAsc("order_no")
-            );
-            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
-        } else {
-            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetList, SysUserPagesetDTO.class);
-        }
-        return sysUserPagesetDTOList;
-    }
-
-    /**
-     * 保存用户对应页面设置
-     *
-     * @param sysUserPagesetSaveVO 保存用户对应页面设置参数
-     * @return 是否成功
-     */
-    public Boolean savePageSet(SysUserPagesetSaveVO sysUserPagesetSaveVO) {
-        if (ListUtil.isEmpty(sysUserPagesetSaveVO.getSysUserPagesetVOList())) {
-            Asserts.fail("列名输入列表不能为空");
-        }
-        userPagesetService.remove(
-                new QueryWrapper<UserPageset>()
-                        .eq("user_id", SysUserUtils.getCurrentPrincipleId())
-                        .eq("page_type", sysUserPagesetSaveVO.getPageType())
-        );
-        List<UserPageset> saveList = new ArrayList<>();
-        Date now = DateUtil.now();
-            String userId = SysUserUtils.getCurrentPrincipleId().toString();
-        for (SysUserPagesetVO sysUserPagesetVO : sysUserPagesetSaveVO.getSysUserPagesetVOList()) {
-            UserPageset sysUserPageset = new UserPageset();
-            BeanUtil.copyProperties(sysUserPagesetVO, sysUserPageset);
-            sysUserPageset.setPageType(sysUserPagesetSaveVO.getPageType());
-            sysUserPageset.setUserId(Long.valueOf(userId));
-            sysUserPageset.setCreator(userId);
-            sysUserPageset.setModifier(userId);
-            sysUserPageset.setGmtCreate(now);
-            sysUserPageset.setGmtModified(now);
-            saveList.add(sysUserPageset);
-        }
-        return userPagesetService.saveBatch(saveList);
-    }
-
-    /**
-     * 获取默认列设置
-     *
-     * @param sysUserPagesetQueryVO
-     * @return
-     */
-    public List<SysUserPagesetDTO> getDefaultPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
-        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
-        List<UserPageset> sysUserPagesetListDefault = userPagesetService.list(
-                new QueryWrapper<UserPageset>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("user_id", -1)
-                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                        .orderByAsc("order_no")
-        );
-        sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
-        return sysUserPagesetDTOList;
-    }
-}

report-service/src/main/java/com/lantone/analyze/facade/analyze/compute/AlgorithmFacade_New.java

@@ -1,340 +0,0 @@
-package com.lantone.analyze.facade.analyze.compute;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
-import com.lantone.dto.analyze.AlgorithmDTO;
-import com.lantone.common.exception.Asserts;
-import com.lantone.common.util.BigDecimalUtil;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.StringUtil;
-import com.lantone.vo.analyze.AlgorithmVO;
-import com.lantone.vo.analyze.MedQcresultCasesVO;
-import com.lantone.vo.analyze.QcCasesHospitalVO;
-import com.lantone.vo.analyze.QcResultAlgVO;
-import com.lantone.analyze.entity.MedQcresultDetail;
-import com.lantone.dblayermbg.facade.HospitalSetFacade;
-import com.lantone.report.facade.base.analyze.MedQcresultDetailFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 评分算法
- * @author: gaodm
- * @time: 2020/4/14 9:52
- */
-@Component
-public class AlgorithmFacade_New {
-    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3, 4);
-
-    @Autowired
-    private HospitalSetFacade sysHospitalSetFacade;
-    @Autowired
-    private MedQcresultDetailFacade qcresultDetailFacade;
-    @Autowired
-    private HospitalSetFacade hospitalSetFacade;
-
-
-    /**
-     * 评结果分数
-     *
-     * @param algorithmVO 操作条目的所有信息
-     * @return 评分结果对象
-     */
-    public AlgorithmDTO getScoreDto(AlgorithmVO algorithmVO) {
-        AlgorithmDTO algorithmDTO = new AlgorithmDTO();
-        if (!types.contains(algorithmVO.getType())) {
-            Asserts.fail("操作类型只有0,1,2,3,4!");
-        }
-        //处理数据
-        dataDeal(algorithmVO);
-        //获取本医院相关评分配置
-        Map<String, String> scoreSet = hospitalSetFacade.getHospitalCodeMap(algorithmVO.getHospitalId() + "", "score_set");
-        //合格率配置
-        JSONObject qualifiedJSON = JSONObject.parseObject(scoreSet.get("qualified"));
-        //结果等级配置
-        JSONObject resultJSON = JSONObject.parseObject(scoreSet.get("level"));
-        //该医院总分
-        BigDecimal totalScore = new BigDecimal(JSONObject.parseObject(scoreSet.get("score")).getLong("totalScore"));
-        BigDecimal notHomePageScore = new BigDecimal(JSONObject.parseObject(scoreSet.get("score")).getLong("notHomePageScore"));
-        //生成各模块扣分条目map
-        Map<Long, List<QcResultAlgVO>> casesQcResultAlgMap = new HashMap<>();
-        if (ListUtil.isNotEmpty(algorithmVO.getQcResultAlgVOList())) {
-            casesQcResultAlgMap = algorithmVO.getQcResultAlgVOList().stream()
-                    .collect(Collectors.groupingBy(QcResultAlgVO::getCasesId));
-        }
-        if (ListUtil.isNotEmpty(algorithmVO.getQcCasesHospitalVOS())) {
-            //遍历各个模块
-            for (QcCasesHospitalVO qcCasesHospitalVO : algorithmVO.getQcCasesHospitalVOS()) {
-                //计算各个模块分值
-                BigDecimal casesRes = casesCal(casesQcResultAlgMap.get(qcCasesHospitalVO.getCasesId()), qcCasesHospitalVO.getScore());
-                //合格率计算
-                String level = getLevel(qualifiedJSON.getJSONObject(qcCasesHospitalVO.getCasesId() + ""), casesRes.longValue());
-                //添加各个模块要保存的评分结果
-                addSaveQcResultCasesInfo(casesRes, qcCasesHospitalVO.getCasesId(), level, algorithmVO);
-            }
-        }
-        //非病案首页模块分值计算
-        List<QcResultAlgVO> notHomePageQcResultAlg = algorithmVO.getQcResultAlgVOList().stream()
-                .filter(qcResultAlgVO -> !"243".equals(qcResultAlgVO.getCasesId().toString())).collect(Collectors.toList());
-        BigDecimal casesRes = casesCal(notHomePageQcResultAlg, notHomePageScore.longValue());
-        //合格率计算
-        String notHomePageLevel = getLevel(qualifiedJSON.getJSONObject("0"), casesRes.longValue());
-        //添加各个模块要保存的评分结果
-        addSaveQcResultCasesInfo(casesRes, 0l, notHomePageLevel, algorithmVO);
-
-        //总分算分
-        BigDecimal res = casesCal(algorithmVO.getQcResultAlgVOList(), totalScore.longValue());
-        //等级计算
-        String level = getLevel(resultJSON, res.longValue());
-        //结果转为100进制
-        res = res.multiply(new BigDecimal(100))
-                .divide(totalScore, 1, RoundingMode.HALF_UP);
-        algorithmDTO.setLevel(level);
-        algorithmDTO.setScore(res);
-        return algorithmDTO;
-    }
-
-
-    /**
-     * @param casesRes    模块分值
-     * @param casesId     模块id
-     * @param level       合格率
-     * @param algorithmVO 算分对象
-     * @Description拼装要保存的med_qcresult_cases表信息
-     * @Return void
-     */
-    private void addSaveQcResultCasesInfo(BigDecimal casesRes, Long casesId, String level, AlgorithmVO algorithmVO) {
-
-        if (ListUtil.isEmpty(algorithmVO.getMedQcresultCasesVOList())) {
-            algorithmVO.setMedQcresultCasesVOList(new ArrayList<>());
-        }
-        //拼装要保存的med_qcresult_cases 表信息
-        MedQcresultCasesVO medQcresultCasesVOHp = new MedQcresultCasesVO();
-        medQcresultCasesVOHp.setHospitalId(algorithmVO.getHospitalId());
-        medQcresultCasesVOHp.setBehospitalCode(algorithmVO.getBehospitalCode());
-        medQcresultCasesVOHp.setCasesId(casesId);
-        medQcresultCasesVOHp.setScoreRes(casesRes);
-        medQcresultCasesVOHp.setLevel(level);
-        algorithmVO.getMedQcresultCasesVOList().add(medQcresultCasesVOHp);
-    }
-
-
-    /**
-     * 根据分数评定等级
-     *
-     * @param getLevJSON 区间及对应区间等级json
-     * @param value      字符串区间用逗号隔开
-     * @return 等级
-     */
-    private String getLevel(JSONObject getLevJSON, Long value) {
-        if (getLevJSON == null) {
-            return "";
-        }
-        String strSection = getLevJSON.getString("section");
-        String strLevs = getLevJSON.getString("lev");
-        if (StringUtil.isNotBlank(strSection) && StringUtil.isNotBlank(strLevs)) {
-            List<String> sections = Lists.newArrayList(Splitter.on(",").split(strSection));
-            List<String> levs = Lists.newArrayList(Splitter.on(",").split(strLevs));
-            int i = 0;
-            for (; i <= sections.size(); i++) {
-                //区间采用左开右闭原则
-                if (i == 0) {
-                    //(-∞..b]
-                    if (Range.atMost(Long.parseLong(sections.get(i))).contains(value)) {
-                        return getLev(levs, i);
-                    }
-                } else if (i == sections.size()) {
-                    //(a..+∞)
-                    if (Range.greaterThan(Long.parseLong(sections.get(i - 1))).contains(value)) {
-                        return getLev(levs, i);
-                    }
-                } else {
-                    //(a..b]
-                    if (Range.openClosed(Long.parseLong(sections.get(i - 1)), Long.parseLong(sections.get(i))).contains(value)) {
-                        return getLev(levs, i);
-                    }
-                }
-            }
-        }
-        return "";
-    }
-
-    /**
-     * @param levs
-     * @param index
-     * @Description根据位置获取数组指定位置的值
-     * @Return java.lang.String
-     */
-    private String getLev(List<String> levs, int index) {
-        if (Range.closedOpen(0, levs.size()).contains(index)) {
-            return levs.get(index);
-        }
-        return "无对应结果区间";
-    }
-
-    /**
-     * 处理数据
-     *
-     * @param algorithmVO 操作条目的所有信息
-     */
-    private void dataDeal(AlgorithmVO algorithmVO) {
-        List<QcResultAlgVO> qcResultAlgVOList = algorithmVO.getQcResultAlgVOList();
-        //新增
-        if (algorithmVO.getType().equals(1)) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail("新增操作条目不能为空！");
-            }
-            //验证和操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getCasesId().equals(algorithmVO.getOptResultAlgVO().getCasesId())
-                            && qcResultAlgVO.getCasesEntryId().equals(algorithmVO.getOptResultAlgVO().getCasesEntryId())) {
-                        Asserts.fail("不能重复加入已经评分的条目");
-                    } else {
-                        if (algorithmVO.getOptResultAlgVO().getCasesId().equals(qcResultAlgVO.getCasesId())) {
-                            algorithmVO.getOptResultAlgVO().setCasesScore(qcResultAlgVO.getCasesScore());
-                        }
-                    }
-                }
-                qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-            }
-            if (ListUtil.isEmpty(qcResultAlgVOList)) {
-                qcResultAlgVOList = new ArrayList<>();
-                qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-                algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
-            }
-        }
-        //删除
-        else if (algorithmVO.getType().equals(2) || (algorithmVO.getType().equals(4) && 0 == algorithmVO.getDelStatus())) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail("删除操作条目不能为空！");
-            }
-            //操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                Boolean hasData = false;
-                Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getId().equals(optId)) {
-                        qcResultAlgVOList.remove(qcResultAlgVO);
-                        hasData = true;
-                        break;
-                    }
-                }
-                if (!hasData) {
-                    Asserts.fail("删除的条目不存在！");
-                }
-            }
-        }
-        //恢复
-        else if (algorithmVO.getType().equals(4) && 1 == algorithmVO.getDelStatus()) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail("恢复操作条目不能为空！");
-            }
-            //操作数据
-            Boolean hasData = false;
-            Long optId = algorithmVO.getOptResultAlgVO().getId(); // 操作id
-            MedQcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<MedQcresultDetail>()
-                    .eq("id", optId));
-            if (qcresultDetail != null) {
-                QcResultAlgVO qcResultAlgVO = new QcResultAlgVO();
-                qcResultAlgVO.setScore(qcresultDetail.getScore());
-                qcResultAlgVO.setId(qcresultDetail.getId());
-                qcResultAlgVO.setCasesEntryId(qcresultDetail.getCasesEntryId());
-                qcResultAlgVO.setCasesId(qcresultDetail.getCasesId());
-                qcResultAlgVO.setMsg(qcresultDetail.getMsg());
-                qcResultAlgVO.setIsReject(qcresultDetail.getIsReject());
-                qcResultAlgVO.setCasesScore(qcresultDetail.getCasesScore());
-                if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                    qcResultAlgVOList.add(qcResultAlgVO);
-                } else {
-                    qcResultAlgVOList = new ArrayList<>();
-                    qcResultAlgVOList.add(qcResultAlgVO);
-                    algorithmVO.setQcResultAlgVOList(qcResultAlgVOList);
-                }
-                hasData = true;
-            }
-            if (!hasData) {
-                Asserts.fail("恢复的条目不存在！");
-            }
-        }
-
-        //修改
-        else if (algorithmVO.getType().equals(3)) {
-            if (null == algorithmVO.getOptResultAlgVO()) {
-                Asserts.fail("修改操作条目不能为空！");
-            }
-            //操作数据
-            if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-                Boolean hasData = false;
-                for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                    if (qcResultAlgVO.getId().equals(algorithmVO.getOptResultAlgVO().getId())) {
-                        qcResultAlgVOList.remove(qcResultAlgVO);
-                        qcResultAlgVOList.add(algorithmVO.getOptResultAlgVO());
-                        hasData = true;
-                        break;
-                    }
-                }
-                if (!hasData) {
-                    Asserts.fail("修改的条目不存在！");
-                }
-            }
-        }
-    }
-
-    /**
-     * 计算分数
-     *
-     * @param qcResultAlgVOList 扣分条目
-     * @return 评分分数
-     */
-    private BigDecimal casesCal(List<QcResultAlgVO> qcResultAlgVOList, Long totalScore) {
-        //总分
-        BigDecimal res = new BigDecimal(totalScore);
-        //模块内单票否决扣分
-        BigDecimal subRejectScore = BigDecimal.ZERO;
-        //模块内其他扣分
-        BigDecimal subOrderScore = BigDecimal.ZERO;
-        if (ListUtil.isNotEmpty(qcResultAlgVOList)) {
-            //遍历扣分条目
-            for (QcResultAlgVO qcResultAlgVO : qcResultAlgVOList) {
-                if (qcResultAlgVO.getIsReject().equals(1)) {
-                    //单票否决扣分
-                    subRejectScore = subRejectScore.add(qcResultAlgVO.getScore());
-                } else {
-                    //非单票否决扣分
-                    subOrderScore = subOrderScore.add(qcResultAlgVO.getScore());
-                }
-            }
-            //总分小于等于其他扣分时
-            if (BigDecimalUtil.le(new BigDecimal(totalScore), subOrderScore)) {
-                subOrderScore = new BigDecimal(totalScore);
-            }
-            //模块总分减去模块单票否决扣分
-            res = res.subtract(subRejectScore);
-            //结果小于0按0返回
-            if (BigDecimalUtil.lt(res, BigDecimal.ZERO)) {
-                return BigDecimal.ZERO;
-            } else {
-                //模块总分减去其他扣分
-                res = res.subtract(subOrderScore);
-            }
-            //结果小于0按0计算
-            if (BigDecimalUtil.lt(res, BigDecimal.ZERO)) {
-                res = BigDecimal.ZERO;
-            }
-        }
-        return res;
-    }
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedBehospitalInfoMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.dto.analyze.BehospitalInfoDTO;
-import com.lantone.vo.analyze.BehospitalPageVO;
-import com.lantone.analyze.entity.MedBehospitalInfo;
-
-/**
- * <p>
- * 表名：med_behospital_info Mapper接口
- * </p>
- */
-public interface MedBehospitalInfoMapper extends BaseMapper<MedBehospitalInfo> {
-
-    IPage<BehospitalInfoDTO> getPage(BehospitalPageVO behospitalPageVO);
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedBehospitalTypeMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedBehospitalType;
-
-/**
- * <p>
- * 表名：med_behospital_type Mapper接口
- * </p>
- */
-public interface MedBehospitalTypeMapper extends BaseMapper<MedBehospitalType> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedCheckInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedCheckInfo;
-
-/**
- * <p>
- * 表名：med_check_info Mapper接口
- * </p>
- */
-public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedCrisisInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedCrisisInfo;
-
-/**
- * <p>
- * 表名：med_crisis_info Mapper接口
- * </p>
- */
-public interface MedCrisisInfoMapper extends BaseMapper<MedCrisisInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedDoctorAdviceMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedDoctorAdvice;
-
-/**
- * <p>
- * 表名：med_doctor_advice Mapper接口
- * </p>
- */
-public interface MedDoctorAdviceMapper extends BaseMapper<MedDoctorAdvice> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedHomeDiagnoseInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedHomeDiagnoseInfo;
-
-/**
- * <p>
- * 表名：med_home_diagnose_info Mapper接口
- * </p>
- */
-public interface MedHomeDiagnoseInfoMapper extends BaseMapper<MedHomeDiagnoseInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedHomeOperationInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedHomeOperationInfo;
-
-/**
- * <p>
- * 表名：med_home_operation_info Mapper接口
- * </p>
- */
-public interface MedHomeOperationInfoMapper extends BaseMapper<MedHomeOperationInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedHomePageMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedHomePage;
-
-/**
- * <p>
- * 表名：med_home_page Mapper接口
- * </p>
- */
-public interface MedHomePageMapper extends BaseMapper<MedHomePage> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedLisInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedLisInfo;
-
-/**
- * <p>
- * 表名：med_lis_info Mapper接口
- * </p>
- */
-public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedLisResultMapper.java

@@ -1,18 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dto.analyze.MedLisResultDTO;
-import com.lantone.analyze.entity.MedBehospitalInfo;
-import com.lantone.analyze.entity.MedLisResult;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：med_lis_result Mapper接口
- * </p>
- */
-public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
-
-    List<MedLisResultDTO> getMedLisResults(MedBehospitalInfo medBehospitalInfo);
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedMedicalRecordContentMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedMedicalRecordContent;
-
-/**
- * <p>
- * 表名：med_medical_record_content Mapper接口
- * </p>
- */
-public interface MedMedicalRecordContentMapper extends BaseMapper<MedMedicalRecordContent> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedMedicalRecordMapper.java

@@ -1,18 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dto.analyze.RecordContentDTO;
-import com.lantone.vo.analyze.RecordContentVO;
-import com.lantone.analyze.entity.MedMedicalRecord;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：med_medical_record Mapper接口
- * </p>
- */
-public interface MedMedicalRecordMapper extends BaseMapper<MedMedicalRecord> {
-
-    List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedNurseMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedNurse;
-
-/**
- * <p>
- * 表名：med_nurse Mapper接口
- * </p>
- */
-public interface MedNurseMapper extends BaseMapper<MedNurse> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedPacsInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedPacsInfo;
-
-/**
- * <p>
- * 表名：med_pacs_info Mapper接口
- * </p>
- */
-public interface MedPacsInfoMapper extends BaseMapper<MedPacsInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedPacsResultMapper.java

@@ -1,18 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dto.analyze.MedPacsResultDTO;
-import com.lantone.analyze.entity.MedBehospitalInfo;
-import com.lantone.analyze.entity.MedPacsResult;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：med_pacs_result Mapper接口
- * </p>
- */
-public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
-
-    List<MedPacsResultDTO> getMedPacsResults(MedBehospitalInfo medBehospitalInfo);
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedQcresultCasesMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedQcresultCases;
-
-/**
- * <p>
- * 表名：med_qcresult_cases Mapper接口
- * </p>
- */
-public interface MedQcresultCasesMapper extends BaseMapper<MedQcresultCases> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedQcresultDetailMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedQcresultDetail;
-
-/**
- * <p>
- * 表名：med_qcresult_detail Mapper接口
- * </p>
- */
-public interface MedQcresultDetailMapper extends BaseMapper<MedQcresultDetail> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedQcresultInfoMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedQcresultInfo;
-
-/**
- * <p>
- * 表名：med_qcresult_info Mapper接口
- * </p>
- */
-public interface MedQcresultInfoMapper extends BaseMapper<MedQcresultInfo> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/MedTransferRecordMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.MedTransferRecord;
-
-/**
- * <p>
- * 表名：med_transfer_record Mapper接口
- * </p>
- */
-public interface MedTransferRecordMapper extends BaseMapper<MedTransferRecord> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcCasesEntryHospitalMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.QcCasesEntryHospital;
-
-/**
- * <p>
- * 表名：qc_cases_entry_hospital Mapper接口
- * </p>
- */
-public interface QcCasesEntryHospitalMapper extends BaseMapper<QcCasesEntryHospital> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcCasesEntryMapper.java

@@ -1,22 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.dto.analyze.QcCasesEntryDTO;
-import com.lantone.vo.analyze.AnalyzeVO;
-import com.lantone.vo.analyze.QcResultAlgQueryVO;
-import com.lantone.vo.analyze.QcResultAlgVO;
-import com.lantone.analyze.entity.QcCasesEntry;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：qc_cases_entry Mapper接口
- * </p>
- */
-public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
-
-    List<QcCasesEntryDTO> getQcCasesEntry(AnalyzeVO analyzeVO);
-
-    List<QcResultAlgVO> getQcResultAlgVO(QcResultAlgQueryVO qcResultAlgQueryVO);
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcCasesHospitalMapper.java

@@ -1,18 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.vo.analyze.QcCasesHospitalVO;
-import com.lantone.analyze.entity.QcCasesHospital;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：qc_cases_hospital Mapper接口
- * </p>
- */
-public interface QcCasesHospitalMapper extends BaseMapper<QcCasesHospital> {
-
-    List<QcCasesHospitalVO> getCasesByHospitals(@Param("hospitalId") Long hospitalId);
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcCasesMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.QcCases;
-
-/**
- * <p>
- * 表名：qc_cases Mapper接口
- * </p>
- */
-public interface QcCasesMapper extends BaseMapper<QcCases> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcModeMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.QcMode;
-
-/**
- * <p>
- * 表名：qc_mode Mapper接口
- * </p>
- */
-public interface QcModeMapper extends BaseMapper<QcMode> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcTypeCasesEntryMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.QcTypeCasesEntry;
-
-/**
- * <p>
- * 表名：qc_type_cases_entry Mapper接口
- * </p>
- */
-public interface QcTypeCasesEntryMapper extends BaseMapper<QcTypeCasesEntry> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/QcTypeMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.QcType;
-
-/**
- * <p>
- * 表名：qc_type Mapper接口
- * </p>
- */
-public interface QcTypeMapper extends BaseMapper<QcType> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/StrAdmissionNoteMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.StrAdmissionNote;
-
-/**
- * <p>
- * 表名：str_admission_note Mapper接口
- * </p>
- */
-public interface StrAdmissionNoteMapper extends BaseMapper<StrAdmissionNote> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/StrBloodResultMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.StrBloodResult;
-
-/**
- * <p>
- * 表名：str_blood_result Mapper接口
- * </p>
- */
-public interface StrBloodResultMapper extends BaseMapper<StrBloodResult> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/StrBloodTransfusionMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.StrBloodTransfusion;
-
-/**
- * <p>
- * 表名：str_blood_transfusion Mapper接口
- * </p>
- */
-public interface StrBloodTransfusionMapper extends BaseMapper<StrBloodTransfusion> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/StrConsultationApplyMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.StrConsultationApply;
-
-/**
- * <p>
- * 表名：str_consultation_apply Mapper接口
- * </p>
- */
-public interface StrConsultationApplyMapper extends BaseMapper<StrConsultationApply> {
-
-}

report-service/src/main/java/com/lantone/analyze/mapper/StrConsultationNoteMapper.java

@@ -1,13 +0,0 @@
-package com.lantone.analyze.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.analyze.entity.StrConsultationNote;
-
-/**
- * <p>
- * 表名：str_consultation_note Mapper接口
- * </p>
- */
-public interface StrConsultationNoteMapper extends BaseMapper<StrConsultationNote> {
-
-}