业务对接接口

data-service/pom.xml

@@ -13,40 +13,74 @@
     <name>data-service</name>
     <packaging>jar</packaging>
 
+    <properties>
+        <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
+        <mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
+        <druid.version>1.1.21</druid.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-data-redis</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--redis设置-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
         </dependency>
+
+        <!-- mybatis-plus begin -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>${mybatis-plus-boot-starter.version}</version>
+        </dependency>
+        <!-- mybatis-plus end -->
+
+        <!-- springboot整合mybatis（核心就这一个） -->
+        <!-- 注意顺序，这个一定要放在最下面 -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis-spring-boot.version}</version>
+        </dependency>
+
+        <!-- 阿里巴巴druid数据库连接池 -->
         <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
         </dependency>
     </dependencies>
 
@@ -56,9 +90,26 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <!-- 添加docker-maven插件 -->
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
+                    <forceTags>true</forceTags>
+                    <!--镜像的FROM，使用压缩的小镜像-->
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
+                    <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <serverId>docker-registry</serverId>
+                    <registryUrl>${registryUrl}</registryUrl>
+                </configuration>
             </plugin>
         </plugins>
     </build>

data-service/src/main/java/com/lantone/data/aggregate/ViewSupplementAggregate.java

@@ -0,0 +1,73 @@
+package com.lantone.data.aggregate;
+
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.facade.dataView.VLtBehospitalInfoFacade;
+import com.diagbot.facade.dataView.VLtDoctorAdviceFacade;
+import com.diagbot.facade.dataView.VLtHomePageFacade;
+import com.diagbot.facade.dataView.VLtMedicalRecordFacade;
+import com.diagbot.vo.data.DataViewVO;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ViewSupplementAggregate {
+
+    @Autowired
+    private VLtBehospitalInfoFacade vLtBehospitalInfoFacade;
+    @Autowired
+    private VLtDoctorAdviceFacade vLtDoctorAdviceFacade;
+    @Autowired
+    private VLtMedicalRecordFacade vLtMedicalRecordFacade;
+    @Autowired
+    private VLtHomePageFacade vLtHomePageFacade;
+
+    @DataProvider("viewDataSupplement")
+    public RespDTO ViewDataSupplement(@InvokeParameter("dataViewVO") DataViewVO dataViewVO,
+                                      @InvokeParameter("beHospitalInfoList") List<HisBehospitalInfo> beHospitalInfoList,
+                                      @DataConsumer("getBehospitalInfoData") RespDTO getBehospitalInfoData,
+                                      @DataConsumer("getDoctorAdviceData") RespDTO getDoctorAdviceData,
+                                      @DataConsumer("getMedicalRecordData") RespDTO getMedicalRecordData,
+                                      @DataConsumer("getHomePageData") RespDTO getHomePageData){
+
+        StringBuffer sbString=new StringBuffer();
+        if(!"0".equals(getBehospitalInfoData.code)){
+            sbString.append(getBehospitalInfoData.msg+"\t\n");
+        }else if(!"0".equals(getDoctorAdviceData.code)){
+            sbString.append(getBehospitalInfoData.msg+"\t\n");
+        }else if(!"0".equals(getMedicalRecordData.code)){
+            sbString.append(getMedicalRecordData.msg+"\t\n");
+        }else if(!"0".equals(getHomePageData.code)){
+            sbString.append(getHomePageData.msg+"\t\n");
+        }
+        if(sbString.length()>0){
+            return RespDTO.onError(sbString.toString());
+        }
+        return RespDTO.onSuc("数据补录完成！！");
+    }
+
+    @DataProvider("getBehospitalInfoData")
+    public RespDTO getBehospitalInfoData(@InvokeParameter("beHospitalInfoList") List<HisBehospitalInfo> beHospitalInfoList){
+        return vLtBehospitalInfoFacade.getBehospitalInfoData(beHospitalInfoList);
+    }
+
+    @DataProvider("getDoctorAdviceData")
+    public RespDTO getDoctorAdviceData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO) {
+        return vLtDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
+    }
+
+    @DataProvider("getMedicalRecordData")
+    public RespDTO getMedicalRecordData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO){
+        return vLtMedicalRecordFacade.getMedicalRecordSupplement(dataViewVO);
+    }
+
+    @DataProvider("getHomePageData")
+    public RespDTO getHomePageData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO){
+        return vLtHomePageFacade.getHomePageSupplement(dataViewVO);
+    }
+}

data-service/src/main/java/com/lantone/data/annotation/MrqcLog.java

@@ -0,0 +1,15 @@
+package com.lantone.data.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @Description:日志记录
+ * @Author:liuqq
+ * @time: ${DATE} ${TIME}
+ **/
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface MrqcLog {
+    String value() default "";
+}

data-service/src/main/java/com/lantone/data/dto/ColumnDTO.java

@@ -0,0 +1,20 @@
+package com.lantone.data.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/7/13 17:37
+ */
+@Getter
+@Setter
+public class ColumnDTO {
+    private Long id;
+    private String columnName;
+    private String fieldName;
+    private Integer orderNo;
+    private String fieldType;
+    private Integer isShow;
+}

data-service/src/main/java/com/lantone/data/dto/ColumnZhAndChDTO.java

@@ -0,0 +1,11 @@
+package com.lantone.data.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ColumnZhAndChDTO {
+    private String en;//英文字段名转对应的属性名
+    private String ch;//中文注释
+}

data-service/src/main/java/com/lantone/data/entity/BasDeptInfo.java

@@ -0,0 +1,181 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 医院科室信息
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-27
+ */
+public class BasDeptInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 科室编码（HIS导入）
+     */
+    @TableId(value = "dept_id",type = IdType.INPUT)
+    private String deptId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    private String parentDeptId;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 科室类别
+     */
+    private String deptType;
+
+    /**
+     * 首字母拼音
+     */
+    private String spell;
+
+    /**
+     * 区域类别（门诊、工作站、住院等）
+     */
+    private String station;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getParentDeptId() {
+        return parentDeptId;
+    }
+
+    public void setParentDeptId(String parentDeptId) {
+        this.parentDeptId = parentDeptId;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getDeptType() {
+        return deptType;
+    }
+
+    public void setDeptType(String deptType) {
+        this.deptType = deptType;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "BasDeptInfo{" +
+            "deptId=" + deptId +
+            ", hospitalId=" + hospitalId +
+            ", parentDeptId=" + parentDeptId +
+            ", deptName=" + deptName +
+            ", deptType=" + deptType +
+            ", spell=" + spell +
+            ", station=" + station +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/BasDoctorInfo.java

@@ -0,0 +1,171 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-17
+ */
+public class BasDoctorInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * HIS导入的医生ID
+     */
+    @TableId(value = "doctor_id",type = IdType.INPUT)
+    private String doctorId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 医院导入科室ID
+     */
+    private String deptId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 职称
+     */
+    private String professor;
+
+    /**
+     * 职业医师资格
+     */
+    private String occup;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getProfessor() {
+        return professor;
+    }
+
+    public void setProfessor(String professor) {
+        this.professor = professor;
+    }
+    public String getOccup() {
+        return occup;
+    }
+
+    public void setOccup(String occup) {
+        this.occup = occup;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "BasDoctorInfo{" +
+                "doctorId=" + doctorId +
+                ", hospitalId=" + hospitalId +
+                ", deptId=" + deptId +
+                ", name=" + name +
+                ", professor=" + professor +
+                ", occup=" + occup +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/DoctorAdvice.java

@@ -0,0 +1,175 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病人医嘱
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_doctor_advice")
+@Data
+public class DoctorAdvice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人医嘱ID
+     */
+    @TableId(value = "doctor_advice_id",type = IdType.INPUT)
+    private String doctorAdviceId;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医生开单判别
+     */
+    private String orderDoctorName;
+
+    /**
+     * 医嘱频率判别
+     */
+    private String frequency;
+
+    /**
+     * 父类医嘱ID
+     */
+    private String parentTypeId;
+
+    /**
+     * 医嘱类型判别(嘱托长嘱、长期医嘱等)
+     */
+    private String doctorAdviceType;
+
+    /**
+     * 一次使用数量
+     */
+    private String usageNum;
+
+    /**
+     * 一次用量单位
+     */
+    private String usageUnit;
+
+    /**
+     * 医嘱单次剂量
+     */
+    private String dose;
+
+    /**
+     * 单次剂量单位
+     */
+    private String doseUnit;
+
+    /**
+     * 给药方式
+     */
+    private String medModeType;
+
+    /**
+     * 医嘱频率
+     */
+    private String daFrequency;
+
+    /**
+     * 医嘱处理类型
+     */
+    private String daDealType;
+
+    /**
+     * 医嘱开始时间
+     */
+    private Date daStartDate;
+
+    /**
+     * 医嘱项目名称
+     */
+    private String daItemName;
+
+    /**
+     * 医嘱状态判别
+     */
+    private String daStatus;
+
+    /**
+     * 医嘱结束时间
+     */
+    private Date daStopDate;
+
+    /**
+     * 医嘱同组序号
+     */
+    private String daGroupNo;
+
+    /**
+     * 医嘱处方类型(检验、描述医嘱、膳食、西药、护理等)
+     */
+    private String daPrescriptionType;
+
+    /**
+     * 药品类型(0.普药 1.抗生素 2.激素)
+     */
+    private String medicineType;
+
+    /**
+     * 医嘱领药类型
+     */
+    private String daMedType;
+
+    /**
+     * 医生嘱托
+     */
+    private String doctorNotice;
+
+    /**
+     * 开单医生ID
+     */
+    private String doctorId;
+
+    /**
+     * 开单医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

data-service/src/main/java/com/lantone/data/entity/HomeDiagnoseInfo.java

@@ -0,0 +1,85 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_home_diagnose_info")
+@Data
+public class HomeDiagnoseInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病案首页ID
+     */
+    @TableId(value = "home_page_id",type = IdType.INPUT)
+    private String homePageId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 诊断序号
+     */
+    private String diagnoseOrderNo;
+
+    /**
+     * 诊断类别（主要诊断、其他诊断）
+     */
+    private String diagnoseType;
+
+    /**
+     * 诊断判别（主、次）
+     */
+    private String diagnoseTypeShort;
+
+    private String diagnoseName;
+
+    private String behospitalType;
+
+    private String leaveHospitalType;
+
+    private String pathologyDiagnose;
+
+    private String icdCode;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

data-service/src/main/java/com/lantone/data/entity/HomeOperationInfo.java

@@ -0,0 +1,126 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_home_operation_info")
+@Data
+public class HomeOperationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病案首页ID
+     */
+    @TableId(value = "home_page_id",type = IdType.INPUT)
+    private String homePageId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 手术序号
+     */
+    private String operationOrderNo;
+
+    /**
+     * 手术日期
+     */
+    private Date operationDate;
+
+    /**
+     * 手术编码
+     */
+    private String operationCode;
+
+    /**
+     * 手术医生ID
+     */
+    private String operationDoctorId;
+
+    /**
+     * 一助医生ID
+     */
+    private String firstAssistantId;
+
+    /**
+     * 二助医生ID
+     */
+    private String secondAssistantId;
+
+    /**
+     * 切口等级
+     */
+    private String cutLevel;
+
+    /**
+     * 愈合等级
+     */
+    private String healingLevel;
+
+    /**
+     * 手术名称
+     */
+    private String operationName;
+
+    /**
+     * 手术级别
+     */
+    private String operationLevel;
+
+    /**
+     * 麻醉方式（全麻、局麻、静脉麻醉）
+     */
+    private String anaesthesiaName;
+
+    /**
+     * 拟手术名称
+     */
+    private String shamOperationName;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 麻醉医师
+     */
+    private String anaesthesiaDoctor;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+}

data-service/src/main/java/com/lantone/data/entity/HomePage.java

@@ -0,0 +1,751 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_home_page")
+@Data
+public class HomePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病案首页编号
+     */
+    @TableId(value = "home_page_id",type = IdType.INPUT)
+    private String homePageId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    private String behospitalCode;
+
+    /**
+     * 组织机构id
+     */
+    private String hospitalCode;
+
+    /**
+     * 医疗机构名称
+     */
+    private String hospitalName;
+
+    /**
+     * 医疗机构代码
+     */
+    private String orgCode;
+
+    /**
+     * 医疗付费方式
+     */
+    private String payType;
+
+    /**
+     * 健康卡号
+     */
+    private String healthCard;
+
+    /**
+     * 住院次数
+     */
+    private String behospitalNum;
+
+    /**
+     * 病案号
+     */
+    private String fileCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 年龄(拼接年龄单位)
+     */
+    private String age;
+
+    /**
+     * 年龄单位
+     */
+    private String ageUnit;
+
+    /**
+     * 国籍
+     */
+    private String nationality;
+
+    /**
+     * 新生儿出生月数
+     */
+    private String newbornMonth;
+
+    /**
+     * 新生儿出生天数
+     */
+    private String newbornDay;
+
+    /**
+     * 新生儿出生体重
+     */
+    private String newbornWeight;
+
+    /**
+     * 新生儿入院体重
+     */
+    private String newbornBehospitalWeight;
+
+    /**
+     * 出生地
+     */
+    private String bornAddress;
+
+    /**
+     * 籍贯
+     */
+    private String bornPlace;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 身份证号
+     */
+    private String identityCardNo;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 婚姻
+     */
+    private String marriage;
+
+    /**
+     * 现住址
+     */
+    private String curAddress;
+
+    /**
+     * 现住址电话
+     */
+    private String curPhone;
+
+    /**
+     * 现住址邮编
+     */
+    private String curPostCode;
+
+    /**
+     * 户口地址
+     */
+    private String residenceAddress;
+
+    /**
+     * 户口地址邮编
+     */
+    private String residencePostCode;
+
+    /**
+     * 工作单位
+     */
+    private String workAddress;
+
+    /**
+     * 工作单位电话
+     */
+    private String workPhone;
+
+    /**
+     * 工作单位邮编
+     */
+    private String workPostCode;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人关系
+     */
+    private String contactRelation;
+
+    /**
+     * 联系人地址
+     */
+    private String contactAddress;
+
+    /**
+     * 联系人电话
+     */
+    private String contactPhone;
+
+    /**
+     * 入院途径
+     */
+    private String behospitalWay;
+
+    /**
+     * 入院时间
+     */
+    private Date behospitalDate;
+
+    /**
+     * 入院科别
+     */
+    private String behospitalDept;
+
+    /**
+     * 入院病房
+     */
+    private String behospitalWard;
+
+    /**
+     * 入院床位序号
+     */
+    private String behospitalBedId;
+
+    /**
+     * 入院床位号码
+     */
+    private String behospitalBedCode;
+
+    /**
+     * 转科科别
+     */
+    private String changeDept;
+
+    /**
+     * 出院时间
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 出院科别
+     */
+    private String leaveHospitalDept;
+
+    /**
+     * 出院病房
+     */
+    private String leaveHospitalWard;
+
+    /**
+     * 出院床位序号
+     */
+    private String leaveHospitalBedId;
+
+    /**
+     * 出院床位号码
+     */
+    private String leaveHospitalBedCode;
+
+    /**
+     * 实际住院天数
+     */
+    private String behospitalDayNum;
+
+    /**
+     * 门急诊诊断
+     */
+    private String outpatientEmrDiagnose;
+
+    /**
+     * 门急诊诊断编码
+     */
+    private String outpatientEmrDiagnoseCode;
+
+    /**
+     * 损伤中毒因素
+     */
+    private String poisonFactor;
+
+    /**
+     * 损伤中毒因素编码
+     */
+    private String poisonFactorCode;
+
+    /**
+     * 病理诊断
+     */
+    private String pathologyDiagnose;
+
+    /**
+     * 病理诊断编码
+     */
+    private String pathologyDiagnoseCode;
+
+    /**
+     * 病理诊断编号
+     */
+    private String pathologyDiagnoseId;
+
+    /**
+     * 药物过敏
+     */
+    private String isMedAllergy;
+
+    /**
+     * 过敏药物
+     */
+    private String medAllergyName;
+
+    /**
+     * 死亡患者尸检
+     */
+    private String autopsy;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * Rh
+     */
+    private String rh;
+
+    /**
+     * 科主任
+     */
+    private String deptDirector;
+
+    /**
+     * 主任医师
+     */
+    private String directorDoctor;
+
+    /**
+     * 主治医师
+     */
+    private String attendingDoctor;
+
+    /**
+     * 住院医师
+     */
+    private String behospitalDoctor;
+
+    /**
+     * 责任护士
+     */
+    private String responseNurse;
+
+    /**
+     * 进修医师
+     */
+    private String studyDoctor;
+
+    /**
+     * 实习医师
+     */
+    private String practiceDoctor;
+
+    /**
+     * 编码员
+     */
+    private String encodeMan;
+
+    /**
+     * 病案质量
+     */
+    private String homePageQuality;
+
+    /**
+     * 质控医师
+     */
+    private String qcDoctor;
+
+    /**
+     * 质控护士
+     */
+    private String qcNurse;
+
+    /**
+     * 质控日期
+     */
+    private Date qcDate;
+
+    /**
+     * 离院方式
+     */
+    private String leaveHospitalType;
+
+    /**
+     * 接收机构名称
+     */
+    private String acceptOrgCode;
+
+    /**
+     * 31天内再住院计划
+     */
+    private String againBehospitalPlan;
+
+    /**
+     * 再住院目的
+     */
+    private String againBehospitalGoal;
+
+    /**
+     * 颅脑损伤患者昏迷前天数
+     */
+    private String tbiBeforeDay;
+
+    /**
+     * 颅脑损伤患者昏迷前小时
+     */
+    private String tbiBeforeHour;
+
+    /**
+     * 颅脑损伤患者昏迷前分钟
+     */
+    private String tbiBeforeMinute;
+
+    /**
+     * 颅脑损伤患者昏迷后天数
+     */
+    private String tbiAfterDay;
+
+    /**
+     * 颅脑损伤患者昏迷后小时
+     */
+    private String tbiAfterHour;
+
+    /**
+     * 颅脑损伤患者昏迷后分钟
+     */
+    private String tbiAfterMinute;
+
+    /**
+     * 总费用
+     */
+    private String totalFee;
+
+    /**
+     * 自付金额
+     */
+    private String ownFee;
+
+    /**
+     * 一般医疗服务费
+     */
+    private String generalFee;
+
+    /**
+     * 一般治疗服务费
+     */
+    private String serviceFee;
+
+    /**
+     * 护理费
+     */
+    private String nurseFee;
+
+    /**
+     * 其他费用
+     */
+    private String otherFee;
+
+    /**
+     * 病理诊断费
+     */
+    private String pathologyFee;
+
+    /**
+     * 实验室诊断费
+     */
+    private String labFee;
+
+    /**
+     * 影像学诊断费
+     */
+    private String pacsFee;
+
+    /**
+     * 临床诊断项目费
+     */
+    private String clinicDiagnoseFee;
+
+    /**
+     * 非手术治疗项目费
+     */
+    private String notOperationFee;
+
+    /**
+     * 临床物理治疗费
+     */
+    private String clinicPhysicFee;
+
+    /**
+     * 手术治疗费
+     */
+    private String operationTreatFee;
+
+    /**
+     * 麻醉费
+     */
+    private String anaesthesiaFee;
+
+    /**
+     * 手术费
+     */
+    private String operationFee;
+
+    /**
+     * 康复类
+     */
+    private String healthTypeFee;
+
+    /**
+     * 中医治疗费
+     */
+    private String chnTreatFee;
+
+    /**
+     * 西药费
+     */
+    private String westernMedFee;
+
+    /**
+     * 抗菌药物费用
+     */
+    private String antibiosisFee;
+
+    /**
+     * 中成药费
+     */
+    private String chnMedFee;
+
+    /**
+     * 中草药费
+     */
+    private String chnHerbFee;
+
+    /**
+     * 血费
+     */
+    private String bloodFee;
+
+    /**
+     * 白蛋白类制品费
+     */
+    private String albumenFee;
+
+    /**
+     * 球蛋白类制品费
+     */
+    private String globulinFee;
+
+    /**
+     * 凝血因子类制品费
+     */
+    private String bloodFactorFee;
+
+    /**
+     * 细胞因子类制品费
+     */
+    private String cellFactorFee;
+
+    /**
+     * 检查用一次性医用材料费
+     */
+    private String checkMaterialFee;
+
+    /**
+     * 治疗用一次性医用材料费
+     */
+    private String treatMaterialFee;
+
+    /**
+     * 手术用一次性医用材料费
+     */
+    private String operationMaterialFee;
+
+    /**
+     * 其他类其他费
+     */
+    private String otherTypeFee;
+
+    /**
+     * 单病种管理
+     */
+    private String singleDiagManage;
+
+    /**
+     * 临床路径管理
+     */
+    private String clinicPathwayManage;
+
+    /**
+     * 门诊与住院
+     */
+    private String isOutpatientBehospital;
+
+    /**
+     * 入院与出院
+     */
+    private String isLeaveBehospital;
+
+    /**
+     * 术前与术后
+     */
+    private String isOperationBeforeAfter;
+
+    /**
+     * 临床与病理
+     */
+    private String isClinicPathology;
+
+    /**
+     * 放射与病理
+     */
+    private String isRadiatePathology;
+
+    /**
+     * 病人抢救次数
+     */
+    private String rescueNum;
+
+    /**
+     * 病人抢救成功次数
+     */
+    private String rescueSuccessNum;
+
+    /**
+     * 是否为自动出院
+     */
+    private String isAutoLeavehospital;
+
+    /**
+     * 转归情况
+     */
+    private String returnToType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 住院期间身体约束
+     */
+    private String isPhysicalRestraint;
+
+    /**
+     * 颅脑损伤患者昏迷时间(入院前)
+     */
+    private String tbiBehospitalBeforeTime;
+
+    /**
+     * 颅脑损伤患者昏迷时间(入院后)
+     */
+    private String tbiBehospitalAfterTime;
+
+    /**
+     * 住院期间是否发生跌倒或坠床
+     */
+    private String isFallBed;
+
+    /**
+     * 医院感染
+     */
+    private String isNosocomialInfection;
+
+    /**
+     * 入住ICU情况
+     */
+    private String isIntoIcu;
+
+    /**
+     * 并发症情况
+     */
+    private String isComplications;
+
+    /**
+     * 是否发生压疮
+     */
+    private String isPressureSore;
+
+    /**
+     * 是否住院期间发生压疮
+     */
+    private String isBehospitalPressureSore;
+
+    /**
+     * 非计划再次手术
+     */
+    private String isUnplannedReoperation;
+
+    /**
+     * 治疗结果
+     */
+    private String treatmentResults;
+
+    /**
+     * 并发症
+     */
+    private String complicationsResults;
+
+    /**
+     * 感染部位
+     */
+    private String infectionSite;
+
+    /**
+     * 住院期间有无告病危
+     */
+    private String isBeInDanger;
+
+}

data-service/src/main/java/com/lantone/data/entity/LogInfo.java

@@ -0,0 +1,160 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-12-31
+ */
+public class LogInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 接口方法名
+     */
+    private String funcName;
+
+    /**
+     * 入参
+     */
+    private String reqParam;
+
+    /**
+     * 回参
+     */
+    private String respParam;
+
+    /**
+     * 请求时间
+     */
+    private Date gmtReq;
+
+    /**
+     * 响应时间
+     */
+    private Date gmtResp;
+
+    private String execTime;
+
+    private String status;
+
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getFuncName() {
+        return funcName;
+    }
+
+    public void setFuncName(String funcName) {
+        this.funcName = funcName;
+    }
+    public String getReqParam() {
+        return reqParam;
+    }
+
+    public void setReqParam(String reqParam) {
+        this.reqParam = reqParam;
+    }
+    public String getRespParam() {
+        return respParam;
+    }
+
+    public void setRespParam(String respParam) {
+        this.respParam = respParam;
+    }
+    public Date getGmtReq() {
+        return gmtReq;
+    }
+
+    public void setGmtReq(Date gmtReq) {
+        this.gmtReq = gmtReq;
+    }
+    public Date getGmtResp() {
+        return gmtResp;
+    }
+
+    public void setGmtResp(Date gmtResp) {
+        this.gmtResp = gmtResp;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getExecTime() {
+        return execTime;
+    }
+
+    public void setExecTime(String execTime) {
+        this.execTime = execTime;
+    }
+
+    @Override
+    public String toString() {
+        return "LogInfo{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", funcName=" + funcName +
+            ", reqParam=" + reqParam +
+            ", respParam=" + respParam +
+            ", gmtReq=" + gmtReq +
+            ", gmtResp=" + gmtResp +
+            ", status=" + status +
+            ", remark=" + remark +
+                ", execTime=" + execTime +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrAdmissionNote.java

@@ -0,0 +1,804 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 入院记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrAdmissionNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 婚姻状况
+     */
+    private String marriage;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 工作单位
+     */
+    private String workplace;
+
+    /**
+     * 户口地址
+     */
+    private String registerAddress;
+
+    /**
+     * 出生地
+     */
+    private String bornAddress;
+
+    /**
+     * 预产期
+     */
+    private String expectDate;
+
+    /**
+     * 末次月经
+     */
+    private String lastMenstrual;
+
+    /**
+     * 孕/产次
+     */
+    private String pregnantNum;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 病史陈述者
+     */
+    private String historyTeller;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 个人史
+     */
+    private String personalHistory;
+
+    /**
+     * 婚育史
+     */
+    private String maritalHistory;
+
+    /**
+     * 月经史
+     */
+    private String menstrualHistory;
+
+    /**
+     * 家族史
+     */
+    private String familyHistory;
+
+    /**
+     * 喂养史
+     */
+    private String feedingHistory;
+
+    /**
+     * 手术外伤史
+     */
+    private String operationHistory;
+
+    /**
+     * 输血史
+     */
+    private String bloodHistory;
+
+    /**
+     * 传染病史
+     */
+    private String infectionHistory;
+
+    /**
+     * 专科检查
+     */
+    private String specialVital;
+
+    /**
+     * 辅助检查
+     */
+    private String assistantExam;
+
+    /**
+     * 实验室检查
+     */
+    private String lisExam;
+
+    /**
+     * 影像学检查
+     */
+    private String pacsExam;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 补充诊断
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 修正诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 体温
+     */
+    private String temperature;
+
+    /**
+     * 脉搏
+     */
+    private String pulse;
+
+    /**
+     * 呼吸
+     */
+    private String breathe;
+
+    /**
+     * 血压
+     */
+    private String bloodPressure;
+
+    /**
+     * 疼痛
+     */
+    private String pain;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * BMI
+     */
+    private String bmi;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+    public String getMarriage() {
+        return marriage;
+    }
+
+    public void setMarriage(String marriage) {
+        this.marriage = marriage;
+    }
+    public String getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(String jobType) {
+        this.jobType = jobType;
+    }
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+    public String getWorkplace() {
+        return workplace;
+    }
+
+    public void setWorkplace(String workplace) {
+        this.workplace = workplace;
+    }
+    public String getRegisterAddress() {
+        return registerAddress;
+    }
+
+    public void setRegisterAddress(String registerAddress) {
+        this.registerAddress = registerAddress;
+    }
+    public String getBornAddress() {
+        return bornAddress;
+    }
+
+    public void setBornAddress(String bornAddress) {
+        this.bornAddress = bornAddress;
+    }
+    public String getExpectDate() {
+        return expectDate;
+    }
+
+    public void setExpectDate(String expectDate) {
+        this.expectDate = expectDate;
+    }
+    public String getLastMenstrual() {
+        return lastMenstrual;
+    }
+
+    public void setLastMenstrual(String lastMenstrual) {
+        this.lastMenstrual = lastMenstrual;
+    }
+    public String getPregnantNum() {
+        return pregnantNum;
+    }
+
+    public void setPregnantNum(String pregnantNum) {
+        this.pregnantNum = pregnantNum;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getHistoryTeller() {
+        return historyTeller;
+    }
+
+    public void setHistoryTeller(String historyTeller) {
+        this.historyTeller = historyTeller;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getPresent() {
+        return present;
+    }
+
+    public void setPresent(String present) {
+        this.present = present;
+    }
+    public String getPastHistory() {
+        return pastHistory;
+    }
+
+    public void setPastHistory(String pastHistory) {
+        this.pastHistory = pastHistory;
+    }
+    public String getPersonalHistory() {
+        return personalHistory;
+    }
+
+    public void setPersonalHistory(String personalHistory) {
+        this.personalHistory = personalHistory;
+    }
+    public String getMaritalHistory() {
+        return maritalHistory;
+    }
+
+    public void setMaritalHistory(String maritalHistory) {
+        this.maritalHistory = maritalHistory;
+    }
+    public String getMenstrualHistory() {
+        return menstrualHistory;
+    }
+
+    public void setMenstrualHistory(String menstrualHistory) {
+        this.menstrualHistory = menstrualHistory;
+    }
+    public String getFamilyHistory() {
+        return familyHistory;
+    }
+
+    public void setFamilyHistory(String familyHistory) {
+        this.familyHistory = familyHistory;
+    }
+    public String getFeedingHistory() {
+        return feedingHistory;
+    }
+
+    public void setFeedingHistory(String feedingHistory) {
+        this.feedingHistory = feedingHistory;
+    }
+    public String getOperationHistory() {
+        return operationHistory;
+    }
+
+    public void setOperationHistory(String operationHistory) {
+        this.operationHistory = operationHistory;
+    }
+    public String getBloodHistory() {
+        return bloodHistory;
+    }
+
+    public void setBloodHistory(String bloodHistory) {
+        this.bloodHistory = bloodHistory;
+    }
+    public String getInfectionHistory() {
+        return infectionHistory;
+    }
+
+    public void setInfectionHistory(String infectionHistory) {
+        this.infectionHistory = infectionHistory;
+    }
+    public String getSpecialVital() {
+        return specialVital;
+    }
+
+    public void setSpecialVital(String specialVital) {
+        this.specialVital = specialVital;
+    }
+    public String getAssistantExam() {
+        return assistantExam;
+    }
+
+    public void setAssistantExam(String assistantExam) {
+        this.assistantExam = assistantExam;
+    }
+    public String getLisExam() {
+        return lisExam;
+    }
+
+    public void setLisExam(String lisExam) {
+        this.lisExam = lisExam;
+    }
+    public String getPacsExam() {
+        return pacsExam;
+    }
+
+    public void setPacsExam(String pacsExam) {
+        this.pacsExam = pacsExam;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getSupplyDiagnosis() {
+        return supplyDiagnosis;
+    }
+
+    public void setSupplyDiagnosis(String supplyDiagnosis) {
+        this.supplyDiagnosis = supplyDiagnosis;
+    }
+    public String getRevisedDiagnosis() {
+        return revisedDiagnosis;
+    }
+
+    public void setRevisedDiagnosis(String revisedDiagnosis) {
+        this.revisedDiagnosis = revisedDiagnosis;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+    public String getPulse() {
+        return pulse;
+    }
+
+    public void setPulse(String pulse) {
+        this.pulse = pulse;
+    }
+    public String getBreathe() {
+        return breathe;
+    }
+
+    public void setBreathe(String breathe) {
+        this.breathe = breathe;
+    }
+    public String getBloodPressure() {
+        return bloodPressure;
+    }
+
+    public void setBloodPressure(String bloodPressure) {
+        this.bloodPressure = bloodPressure;
+    }
+    public String getPain() {
+        return pain;
+    }
+
+    public void setPain(String pain) {
+        this.pain = pain;
+    }
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+    public String getBmi() {
+        return bmi;
+    }
+
+    public void setBmi(String bmi) {
+        this.bmi = bmi;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrAdmissionNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", birthday=" + birthday +
+            ", marriage=" + marriage +
+            ", jobType=" + jobType +
+            ", nation=" + nation +
+            ", phone=" + phone +
+            ", workplace=" + workplace +
+            ", registerAddress=" + registerAddress +
+            ", bornAddress=" + bornAddress +
+            ", expectDate=" + expectDate +
+            ", lastMenstrual=" + lastMenstrual +
+            ", pregnantNum=" + pregnantNum +
+            ", behospitalDate=" + behospitalDate +
+            ", historyTeller=" + historyTeller +
+            ", chief=" + chief +
+            ", present=" + present +
+            ", pastHistory=" + pastHistory +
+            ", personalHistory=" + personalHistory +
+            ", maritalHistory=" + maritalHistory +
+            ", menstrualHistory=" + menstrualHistory +
+            ", familyHistory=" + familyHistory +
+            ", feedingHistory=" + feedingHistory +
+            ", operationHistory=" + operationHistory +
+            ", bloodHistory=" + bloodHistory +
+            ", infectionHistory=" + infectionHistory +
+            ", specialVital=" + specialVital +
+            ", assistantExam=" + assistantExam +
+            ", lisExam=" + lisExam +
+            ", pacsExam=" + pacsExam +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", supplyDiagnosis=" + supplyDiagnosis +
+            ", revisedDiagnosis=" + revisedDiagnosis +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", temperature=" + temperature +
+            ", pulse=" + pulse +
+            ", breathe=" + breathe +
+            ", bloodPressure=" + bloodPressure +
+            ", pain=" + pain +
+            ", weight=" + weight +
+            ", height=" + height +
+            ", bmi=" + bmi +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrBloodResult.java

@@ -0,0 +1,310 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血效果评价
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrBloodResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 效果评价
+     */
+    private String transfusionEvaluate;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getTransfusionEvaluate() {
+        return transfusionEvaluate;
+    }
+
+    public void setTransfusionEvaluate(String transfusionEvaluate) {
+        this.transfusionEvaluate = transfusionEvaluate;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrBloodResult{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transfusionEvaluate=" + transfusionEvaluate +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrBloodTransfusion.java

@@ -0,0 +1,362 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 输血记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrBloodTransfusion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 输血原因
+     */
+    private String transfusionReason;
+
+    /**
+     * 输注种类、血型、数量
+     */
+    private String transfusionType;
+
+    /**
+     * 输注过程
+     */
+    private String transfusionProcess;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getTransfusionReason() {
+        return transfusionReason;
+    }
+
+    public void setTransfusionReason(String transfusionReason) {
+        this.transfusionReason = transfusionReason;
+    }
+    public String getTransfusionType() {
+        return transfusionType;
+    }
+
+    public void setTransfusionType(String transfusionType) {
+        this.transfusionType = transfusionType;
+    }
+    public String getTransfusionProcess() {
+        return transfusionProcess;
+    }
+
+    public void setTransfusionProcess(String transfusionProcess) {
+        this.transfusionProcess = transfusionProcess;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrBloodTransfusion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", transfusionReason=" + transfusionReason +
+            ", transfusionType=" + transfusionType +
+            ", transfusionProcess=" + transfusionProcess +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrConsultationApply.java

@@ -0,0 +1,466 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊申请单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrConsultationApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    private String diagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+    public String getInviteType() {
+        return inviteType;
+    }
+
+    public void setInviteType(String inviteType) {
+        this.inviteType = inviteType;
+    }
+    public String getInviteDept() {
+        return inviteDept;
+    }
+
+    public void setInviteDept(String inviteDept) {
+        this.inviteDept = inviteDept;
+    }
+    public String getInviteDoctor() {
+        return inviteDoctor;
+    }
+
+    public void setInviteDoctor(String inviteDoctor) {
+        this.inviteDoctor = inviteDoctor;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+    public String getTreatmentSituation() {
+        return treatmentSituation;
+    }
+
+    public void setTreatmentSituation(String treatmentSituation) {
+        this.treatmentSituation = treatmentSituation;
+    }
+    public Date getConsultationDate() {
+        return consultationDate;
+    }
+
+    public void setConsultationDate(Date consultationDate) {
+        this.consultationDate = consultationDate;
+    }
+    public String getConsultationPurpose() {
+        return consultationPurpose;
+    }
+
+    public void setConsultationPurpose(String consultationPurpose) {
+        this.consultationPurpose = consultationPurpose;
+    }
+    public String getConsultationOpinions() {
+        return consultationOpinions;
+    }
+
+    public void setConsultationOpinions(String consultationOpinions) {
+        this.consultationOpinions = consultationOpinions;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrConsultationApply{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", behospitalDate=" + behospitalDate +
+            ", recTitle=" + recTitle +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", diagnosis=" + diagnosis +
+            ", treatmentSituation=" + treatmentSituation +
+            ", consultationDate=" + consultationDate +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrConsultationNote.java

@@ -0,0 +1,466 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊单（申请和结果）
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrConsultationNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+    public String getInviteType() {
+        return inviteType;
+    }
+
+    public void setInviteType(String inviteType) {
+        this.inviteType = inviteType;
+    }
+    public String getInviteDept() {
+        return inviteDept;
+    }
+
+    public void setInviteDept(String inviteDept) {
+        this.inviteDept = inviteDept;
+    }
+    public String getInviteDoctor() {
+        return inviteDoctor;
+    }
+
+    public void setInviteDoctor(String inviteDoctor) {
+        this.inviteDoctor = inviteDoctor;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatmentSituation() {
+        return treatmentSituation;
+    }
+
+    public void setTreatmentSituation(String treatmentSituation) {
+        this.treatmentSituation = treatmentSituation;
+    }
+    public Date getConsultationDate() {
+        return consultationDate;
+    }
+
+    public void setConsultationDate(Date consultationDate) {
+        this.consultationDate = consultationDate;
+    }
+    public String getConsultationPurpose() {
+        return consultationPurpose;
+    }
+
+    public void setConsultationPurpose(String consultationPurpose) {
+        this.consultationPurpose = consultationPurpose;
+    }
+    public String getConsultationOpinions() {
+        return consultationOpinions;
+    }
+
+    public void setConsultationOpinions(String consultationOpinions) {
+        this.consultationOpinions = consultationOpinions;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrConsultationNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatmentSituation=" + treatmentSituation +
+            ", consultationDate=" + consultationDate +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrConsultationRecord.java

@@ -0,0 +1,466 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊记录
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-11-13
+ */
+public class StrConsultationRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 诊疗情况
+     */
+    private String treatmentSituation;
+
+    /**
+     * 会诊时间
+     */
+    private Date consultationDate;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+    public String getInviteType() {
+        return inviteType;
+    }
+
+    public void setInviteType(String inviteType) {
+        this.inviteType = inviteType;
+    }
+    public String getInviteDept() {
+        return inviteDept;
+    }
+
+    public void setInviteDept(String inviteDept) {
+        this.inviteDept = inviteDept;
+    }
+    public String getInviteDoctor() {
+        return inviteDoctor;
+    }
+
+    public void setInviteDoctor(String inviteDoctor) {
+        this.inviteDoctor = inviteDoctor;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatmentSituation() {
+        return treatmentSituation;
+    }
+
+    public void setTreatmentSituation(String treatmentSituation) {
+        this.treatmentSituation = treatmentSituation;
+    }
+    public Date getConsultationDate() {
+        return consultationDate;
+    }
+
+    public void setConsultationDate(Date consultationDate) {
+        this.consultationDate = consultationDate;
+    }
+    public String getConsultationPurpose() {
+        return consultationPurpose;
+    }
+
+    public void setConsultationPurpose(String consultationPurpose) {
+        this.consultationPurpose = consultationPurpose;
+    }
+    public String getConsultationOpinions() {
+        return consultationOpinions;
+    }
+
+    public void setConsultationOpinions(String consultationOpinions) {
+        this.consultationOpinions = consultationOpinions;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrConsultationRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", briefNote=" + briefNote +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatmentSituation=" + treatmentSituation +
+            ", consultationDate=" + consultationDate +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrConsultationResult.java

@@ -0,0 +1,440 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会诊结果单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrConsultationResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 申请科室
+     */
+    private String applyDept;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 申请日期
+     */
+    private Date applyDate;
+
+    /**
+     * 会诊类别
+     */
+    private String inviteType;
+
+    /**
+     * 会诊科室
+     */
+    private String inviteDept;
+
+    /**
+     * 会诊医生
+     */
+    private String inviteDoctor;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 会诊目的
+     */
+    private String consultationPurpose;
+
+    /**
+     * 会诊意见
+     */
+    private String consultationOpinions;
+
+    /**
+     * 会诊到达时间
+     */
+    private Date consultationArriveDate;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public String getApplyDept() {
+        return applyDept;
+    }
+
+    public void setApplyDept(String applyDept) {
+        this.applyDept = applyDept;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public Date getApplyDate() {
+        return applyDate;
+    }
+
+    public void setApplyDate(Date applyDate) {
+        this.applyDate = applyDate;
+    }
+    public String getInviteType() {
+        return inviteType;
+    }
+
+    public void setInviteType(String inviteType) {
+        this.inviteType = inviteType;
+    }
+    public String getInviteDept() {
+        return inviteDept;
+    }
+
+    public void setInviteDept(String inviteDept) {
+        this.inviteDept = inviteDept;
+    }
+    public String getInviteDoctor() {
+        return inviteDoctor;
+    }
+
+    public void setInviteDoctor(String inviteDoctor) {
+        this.inviteDoctor = inviteDoctor;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getConsultationPurpose() {
+        return consultationPurpose;
+    }
+
+    public void setConsultationPurpose(String consultationPurpose) {
+        this.consultationPurpose = consultationPurpose;
+    }
+    public String getConsultationOpinions() {
+        return consultationOpinions;
+    }
+
+    public void setConsultationOpinions(String consultationOpinions) {
+        this.consultationOpinions = consultationOpinions;
+    }
+    public Date getConsultationArriveDate() {
+        return consultationArriveDate;
+    }
+
+    public void setConsultationArriveDate(Date consultationArriveDate) {
+        this.consultationArriveDate = consultationArriveDate;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrConsultationResult{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", applyDept=" + applyDept +
+            ", applyDoctor=" + applyDoctor +
+            ", applyDate=" + applyDate +
+            ", inviteType=" + inviteType +
+            ", inviteDept=" + inviteDept +
+            ", inviteDoctor=" + inviteDoctor +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", consultationPurpose=" + consultationPurpose +
+            ", consultationOpinions=" + consultationOpinions +
+            ", consultationArriveDate=" + consultationArriveDate +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrCrisisNote.java

@@ -0,0 +1,336 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 危急值记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrCrisisNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 危急值报告
+     */
+    private String crisisNote;
+
+    /**
+     * 病情分析及处理
+     */
+    private String briefNote;
+
+    /**
+     * 接收时间
+     */
+    private Date recieveDate;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCrisisNote() {
+        return crisisNote;
+    }
+
+    public void setCrisisNote(String crisisNote) {
+        this.crisisNote = crisisNote;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public Date getRecieveDate() {
+        return recieveDate;
+    }
+
+    public void setRecieveDate(Date recieveDate) {
+        this.recieveDate = recieveDate;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrCrisisNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", crisisNote=" + crisisNote +
+            ", briefNote=" + briefNote +
+            ", recieveDate=" + recieveDate +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrDeathDiscussion.java

@@ -0,0 +1,440 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡病例讨论记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDeathDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 死亡诊断
+     */
+    private String deathDiagnosis;
+
+    /**
+     * 死亡原因
+     */
+    private String deathReason;
+
+    /**
+     * 死亡时间
+     */
+    private Date deathDate;
+
+    /**
+     * 讨论时间
+     */
+    private Date discussDate;
+
+    /**
+     * 讨论地点
+     */
+    private String discussPlace;
+
+    /**
+     * 主持人
+     */
+    private String anchor;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    private String briefHistory;
+
+    /**
+     * 讨论内容
+     */
+    private String discussionContent;
+
+    /**
+     * 主持人小结
+     */
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getDeathDiagnosis() {
+        return deathDiagnosis;
+    }
+
+    public void setDeathDiagnosis(String deathDiagnosis) {
+        this.deathDiagnosis = deathDiagnosis;
+    }
+    public String getDeathReason() {
+        return deathReason;
+    }
+
+    public void setDeathReason(String deathReason) {
+        this.deathReason = deathReason;
+    }
+    public Date getDeathDate() {
+        return deathDate;
+    }
+
+    public void setDeathDate(Date deathDate) {
+        this.deathDate = deathDate;
+    }
+    public Date getDiscussDate() {
+        return discussDate;
+    }
+
+    public void setDiscussDate(Date discussDate) {
+        this.discussDate = discussDate;
+    }
+    public String getDiscussPlace() {
+        return discussPlace;
+    }
+
+    public void setDiscussPlace(String discussPlace) {
+        this.discussPlace = discussPlace;
+    }
+    public String getAnchor() {
+        return anchor;
+    }
+
+    public void setAnchor(String anchor) {
+        this.anchor = anchor;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefHistory() {
+        return briefHistory;
+    }
+
+    public void setBriefHistory(String briefHistory) {
+        this.briefHistory = briefHistory;
+    }
+    public String getDiscussionContent() {
+        return discussionContent;
+    }
+
+    public void setDiscussionContent(String discussionContent) {
+        this.discussionContent = discussionContent;
+    }
+    public String getAnchorConclusion() {
+        return anchorConclusion;
+    }
+
+    public void setAnchorConclusion(String anchorConclusion) {
+        this.anchorConclusion = anchorConclusion;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrDeathDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", deathReason=" + deathReason +
+            ", deathDate=" + deathDate +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchor=" + anchor +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussionContent=" + discussionContent +
+            ", anchorConclusion=" + anchorConclusion +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrDeathNote.java

@@ -0,0 +1,388 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 死亡记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDeathNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 死亡日期
+     */
+    private Date deathDate;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 死亡原因
+     */
+    private String deathReason;
+
+    /**
+     * 死亡诊断
+     */
+    private String deathDiagnosis;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public Date getDeathDate() {
+        return deathDate;
+    }
+
+    public void setDeathDate(Date deathDate) {
+        this.deathDate = deathDate;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getDeathReason() {
+        return deathReason;
+    }
+
+    public void setDeathReason(String deathReason) {
+        this.deathReason = deathReason;
+    }
+    public String getDeathDiagnosis() {
+        return deathDiagnosis;
+    }
+
+    public void setDeathDiagnosis(String deathDiagnosis) {
+        this.deathDiagnosis = deathDiagnosis;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrDeathNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", deathDate=" + deathDate +
+            ", behospitalSituation=" + behospitalSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", deathReason=" + deathReason +
+            ", deathDiagnosis=" + deathDiagnosis +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrDifficultCase.java

@@ -0,0 +1,401 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 疑难病例讨论记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrDifficultCase implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 讨论日期
+     */
+    private Date discussDate;
+
+    /**
+     * 讨论地点
+     */
+    private String discussPlace;
+
+    /**
+     * 主持人姓名及专业技术职务
+     */
+    private String anchorMan;
+
+    /**
+     * 参加人员的姓名及专业技术职务
+     */
+    private String participant;
+
+    /**
+     * 病史简介
+     */
+    private String briefHistory;
+
+    /**
+     * 讨论目的
+     */
+    private String discussAim;
+
+    /**
+     * 具体讨论意见
+     */
+    private String discussionOpinions;
+
+    /**
+     * 主持人小结
+     */
+    private String anchorConclusion;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getDiscussDate() {
+        return discussDate;
+    }
+
+    public void setDiscussDate(Date discussDate) {
+        this.discussDate = discussDate;
+    }
+    public String getDiscussPlace() {
+        return discussPlace;
+    }
+
+    public void setDiscussPlace(String discussPlace) {
+        this.discussPlace = discussPlace;
+    }
+    public String getAnchorMan() {
+        return anchorMan;
+    }
+
+    public void setAnchorMan(String anchorMan) {
+        this.anchorMan = anchorMan;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefHistory() {
+        return briefHistory;
+    }
+
+    public void setBriefHistory(String briefHistory) {
+        this.briefHistory = briefHistory;
+    }
+    public String getDiscussAim() {
+        return discussAim;
+    }
+
+    public void setDiscussAim(String discussAim) {
+        this.discussAim = discussAim;
+    }
+    public String getDiscussionOpinions() {
+        return discussionOpinions;
+    }
+
+    public void setDiscussionOpinions(String discussionOpinions) {
+        this.discussionOpinions = discussionOpinions;
+    }
+    public String getAnchorConclusion() {
+        return anchorConclusion;
+    }
+
+    public void setAnchorConclusion(String anchorConclusion) {
+        this.anchorConclusion = anchorConclusion;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrDifficultCase{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", discussDate=" + discussDate +
+            ", discussPlace=" + discussPlace +
+            ", anchorMan=" + anchorMan +
+            ", participant=" + participant +
+            ", briefHistory=" + briefHistory +
+            ", discussAim=" + discussAim +
+            ", discussionOpinions=" + discussionOpinions +
+            ", anchorConclusion=" + anchorConclusion +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrFirstRecord.java

@@ -0,0 +1,427 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 首次病程录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrFirstRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 现病史
+     */
+    private String present;
+
+    /**
+     * 既往史
+     */
+    private String pastHistory;
+
+    /**
+     * 查体
+     */
+    private String vital;
+
+    /**
+     * 辅检
+     */
+    private String assistantExam;
+
+    /**
+     * 病例特点
+     */
+    private String caseCharacter;
+
+    /**
+     * 初步诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊断依据
+     */
+    private String supplyDiagnosis;
+
+    /**
+     * 鉴别诊断
+     */
+    private String revisedDiagnosis;
+
+    /**
+     * 诊疗计划(方案)
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getPresent() {
+        return present;
+    }
+
+    public void setPresent(String present) {
+        this.present = present;
+    }
+    public String getPastHistory() {
+        return pastHistory;
+    }
+
+    public void setPastHistory(String pastHistory) {
+        this.pastHistory = pastHistory;
+    }
+    public String getVital() {
+        return vital;
+    }
+
+    public void setVital(String vital) {
+        this.vital = vital;
+    }
+    public String getAssistantExam() {
+        return assistantExam;
+    }
+
+    public void setAssistantExam(String assistantExam) {
+        this.assistantExam = assistantExam;
+    }
+    public String getCaseCharacter() {
+        return caseCharacter;
+    }
+
+    public void setCaseCharacter(String caseCharacter) {
+        this.caseCharacter = caseCharacter;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getSupplyDiagnosis() {
+        return supplyDiagnosis;
+    }
+
+    public void setSupplyDiagnosis(String supplyDiagnosis) {
+        this.supplyDiagnosis = supplyDiagnosis;
+    }
+    public String getRevisedDiagnosis() {
+        return revisedDiagnosis;
+    }
+
+    public void setRevisedDiagnosis(String revisedDiagnosis) {
+        this.revisedDiagnosis = revisedDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrFirstRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", chief=" + chief +
+            ", present=" + present +
+            ", pastHistory=" + pastHistory +
+            ", vital=" + vital +
+            ", assistantExam=" + assistantExam +
+            ", caseCharacter=" + caseCharacter +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", supplyDiagnosis=" + supplyDiagnosis +
+            ", revisedDiagnosis=" + revisedDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrIllCritically.java

@@ -0,0 +1,323 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病危通知单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrIllCritically implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getCriticalSituation() {
+        return criticalSituation;
+    }
+
+    public void setCriticalSituation(String criticalSituation) {
+        this.criticalSituation = criticalSituation;
+    }
+    public String getPatientSign() {
+        return patientSign;
+    }
+
+    public void setPatientSign(String patientSign) {
+        this.patientSign = patientSign;
+    }
+    public Date getPatientSignDate() {
+        return patientSignDate;
+    }
+
+    public void setPatientSignDate(Date patientSignDate) {
+        this.patientSignDate = patientSignDate;
+    }
+    public String getDoctorSign() {
+        return doctorSign;
+    }
+
+    public void setDoctorSign(String doctorSign) {
+        this.doctorSign = doctorSign;
+    }
+    public Date getDoctorSignDate() {
+        return doctorSignDate;
+    }
+
+    public void setDoctorSignDate(Date doctorSignDate) {
+        this.doctorSignDate = doctorSignDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrIllCritically{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", criticalSituation=" + criticalSituation +
+            ", patientSign=" + patientSign +
+            ", patientSignDate=" + patientSignDate +
+            ", doctorSign=" + doctorSign +
+            ", doctorSignDate=" + doctorSignDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrIllSeriousl.java

@@ -0,0 +1,323 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病重通知单
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrIllSeriousl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 当前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 病情危重情况
+     */
+    private String criticalSituation;
+
+    /**
+     * 患者签名
+     */
+    private String patientSign;
+
+    /**
+     * 患者签名时间
+     */
+    private Date patientSignDate;
+
+    /**
+     * 医生签名
+     */
+    private String doctorSign;
+
+    /**
+     * 医生签名时间
+     */
+    private Date doctorSignDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getCriticalSituation() {
+        return criticalSituation;
+    }
+
+    public void setCriticalSituation(String criticalSituation) {
+        this.criticalSituation = criticalSituation;
+    }
+    public String getPatientSign() {
+        return patientSign;
+    }
+
+    public void setPatientSign(String patientSign) {
+        this.patientSign = patientSign;
+    }
+    public Date getPatientSignDate() {
+        return patientSignDate;
+    }
+
+    public void setPatientSignDate(Date patientSignDate) {
+        this.patientSignDate = patientSignDate;
+    }
+    public String getDoctorSign() {
+        return doctorSign;
+    }
+
+    public void setDoctorSign(String doctorSign) {
+        this.doctorSign = doctorSign;
+    }
+    public Date getDoctorSignDate() {
+        return doctorSignDate;
+    }
+
+    public void setDoctorSignDate(Date doctorSignDate) {
+        this.doctorSignDate = doctorSignDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrIllSeriousl{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", criticalSituation=" + criticalSituation +
+            ", patientSign=" + patientSign +
+            ", patientSignDate=" + patientSignDate +
+            ", doctorSign=" + doctorSign +
+            ", doctorSignDate=" + doctorSignDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrInformedConsent.java

@@ -0,0 +1,167 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-01-04
+ */
+public class StrInformedConsent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    private String recId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历标题
+     */
+    private String recTitle;
+
+    /**
+     * 文书内容（blob）
+     */
+    private String content;
+
+    /**
+     * 文书类别
+     */
+    private String recType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getRecType() {
+        return recType;
+    }
+
+    public void setRecType(String recType) {
+        this.recType = recType;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrInformedConsent{" +
+            "recId=" + recId +
+            ", behospitalCode=" + behospitalCode +
+            ", hospitalId=" + hospitalId +
+            ", recTitle=" + recTitle +
+            ", content=" + content +
+            ", recType=" + recType +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrLeaveHospital.java

@@ -0,0 +1,427 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 出院小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrLeaveHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 入院日期
+     */
+    private Date behospitalDate;
+
+    /**
+     * 出院日期
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 出院诊断
+     */
+    private String leaveDiagnosis;
+
+    /**
+     * 住院天数
+     */
+    private String behospitalDayNum;
+
+    /**
+     * 入院原因
+     */
+    private String behospitalReason;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 诊治经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 出院情况
+     */
+    private String leaveHospitalSituation;
+
+    /**
+     * 出院医嘱
+     */
+    private String leaveHospitalDoctoradvice;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+    public Date getLeaveHospitalDate() {
+        return leaveHospitalDate;
+    }
+
+    public void setLeaveHospitalDate(Date leaveHospitalDate) {
+        this.leaveHospitalDate = leaveHospitalDate;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getLeaveDiagnosis() {
+        return leaveDiagnosis;
+    }
+
+    public void setLeaveDiagnosis(String leaveDiagnosis) {
+        this.leaveDiagnosis = leaveDiagnosis;
+    }
+    public String getBehospitalDayNum() {
+        return behospitalDayNum;
+    }
+
+    public void setBehospitalDayNum(String behospitalDayNum) {
+        this.behospitalDayNum = behospitalDayNum;
+    }
+    public String getBehospitalReason() {
+        return behospitalReason;
+    }
+
+    public void setBehospitalReason(String behospitalReason) {
+        this.behospitalReason = behospitalReason;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getLeaveHospitalSituation() {
+        return leaveHospitalSituation;
+    }
+
+    public void setLeaveHospitalSituation(String leaveHospitalSituation) {
+        this.leaveHospitalSituation = leaveHospitalSituation;
+    }
+    public String getLeaveHospitalDoctoradvice() {
+        return leaveHospitalDoctoradvice;
+    }
+
+    public void setLeaveHospitalDoctoradvice(String leaveHospitalDoctoradvice) {
+        this.leaveHospitalDoctoradvice = leaveHospitalDoctoradvice;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrLeaveHospital{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", behospitalDate=" + behospitalDate +
+            ", leaveHospitalDate=" + leaveHospitalDate +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", leaveDiagnosis=" + leaveDiagnosis +
+            ", behospitalDayNum=" + behospitalDayNum +
+            ", behospitalReason=" + behospitalReason +
+            ", behospitalSituation=" + behospitalSituation +
+            ", treatmentProcess=" + treatmentProcess +
+            ", leaveHospitalSituation=" + leaveHospitalSituation +
+            ", leaveHospitalDoctoradvice=" + leaveHospitalDoctoradvice +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrOperativeFirstRecord.java

@@ -0,0 +1,531 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术后首程
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrOperativeFirstRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 手术日期
+     */
+    private Date operationDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 麻醉方式
+     */
+    private String narcosisType;
+
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 术（中）后诊断
+     */
+    private String postoperativeDiagnosis;
+
+    /**
+     * 手术人员
+     */
+    private String operationMan;
+
+    /**
+     * 手术名称方式
+     */
+    private String operationName;
+
+    /**
+     * 手术简要经过
+     */
+    private String operationProcess;
+
+    /**
+     * 患者术后情况
+     */
+    private String postoperativeSituation;
+
+    /**
+     * 术后处理措施
+     */
+    private String postoperativeTreatment;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 术后可能出现的并发症及预防措施
+     */
+    private String postoperativeComplication;
+
+    /**
+     * 手术切除标本
+     */
+    private String operationSpecimen;
+
+    /**
+     * 术中出血量
+     */
+    private String operationBleed;
+
+    /**
+     * 术中输血量
+     */
+    private String operationBloodTransfusion;
+
+    /**
+     * 术中并发症
+     */
+    private String operationComplication;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getNarcosisType() {
+        return narcosisType;
+    }
+
+    public void setNarcosisType(String narcosisType) {
+        this.narcosisType = narcosisType;
+    }
+    public String getNarcosisDoctor() {
+        return narcosisDoctor;
+    }
+
+    public void setNarcosisDoctor(String narcosisDoctor) {
+        this.narcosisDoctor = narcosisDoctor;
+    }
+    public String getPreoperationDiagnosis() {
+        return preoperationDiagnosis;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getPostoperativeDiagnosis() {
+        return postoperativeDiagnosis;
+    }
+
+    public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
+        this.postoperativeDiagnosis = postoperativeDiagnosis;
+    }
+    public String getOperationMan() {
+        return operationMan;
+    }
+
+    public void setOperationMan(String operationMan) {
+        this.operationMan = operationMan;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getOperationProcess() {
+        return operationProcess;
+    }
+
+    public void setOperationProcess(String operationProcess) {
+        this.operationProcess = operationProcess;
+    }
+    public String getPostoperativeSituation() {
+        return postoperativeSituation;
+    }
+
+    public void setPostoperativeSituation(String postoperativeSituation) {
+        this.postoperativeSituation = postoperativeSituation;
+    }
+    public String getPostoperativeTreatment() {
+        return postoperativeTreatment;
+    }
+
+    public void setPostoperativeTreatment(String postoperativeTreatment) {
+        this.postoperativeTreatment = postoperativeTreatment;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    public String getPostoperativeComplication() {
+        return postoperativeComplication;
+    }
+
+    public void setPostoperativeComplication(String postoperativeComplication) {
+        this.postoperativeComplication = postoperativeComplication;
+    }
+    public String getOperationSpecimen() {
+        return operationSpecimen;
+    }
+
+    public void setOperationSpecimen(String operationSpecimen) {
+        this.operationSpecimen = operationSpecimen;
+    }
+    public String getOperationBleed() {
+        return operationBleed;
+    }
+
+    public void setOperationBleed(String operationBleed) {
+        this.operationBleed = operationBleed;
+    }
+    public String getOperationBloodTransfusion() {
+        return operationBloodTransfusion;
+    }
+
+    public void setOperationBloodTransfusion(String operationBloodTransfusion) {
+        this.operationBloodTransfusion = operationBloodTransfusion;
+    }
+    public String getOperationComplication() {
+        return operationComplication;
+    }
+
+    public void setOperationComplication(String operationComplication) {
+        this.operationComplication = operationComplication;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrOperativeFirstRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", operationDate=" + operationDate +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", narcosisType=" + narcosisType +
+            ", narcosisDoctor=" + narcosisDoctor +
+            ", preoperationDiagnosis=" + preoperationDiagnosis +
+            ", postoperativeDiagnosis=" + postoperativeDiagnosis +
+            ", operationMan=" + operationMan +
+            ", operationName=" + operationName +
+            ", operationProcess=" + operationProcess +
+            ", postoperativeSituation=" + postoperativeSituation +
+            ", postoperativeTreatment=" + postoperativeTreatment +
+            ", postoperativeNotice=" + postoperativeNotice +
+            ", postoperativeComplication=" + postoperativeComplication +
+            ", operationSpecimen=" + operationSpecimen +
+            ", operationBleed=" + operationBleed +
+            ", operationBloodTransfusion=" + operationBloodTransfusion +
+            ", operationComplication=" + operationComplication +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrOperativeNote.java

@@ -0,0 +1,544 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手术记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrOperativeNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 手术日期
+     */
+    private Date operationDate;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术名称
+     */
+    private String operationName;
+
+    /**
+     * 术（中）后诊断
+     */
+    private String postoperativeDiagnosis;
+
+    /**
+     * 主刀医师
+     */
+    private String operationSurgeon;
+
+    /**
+     * 一助
+     */
+    private String firstHelping;
+
+    /**
+     * 二助
+     */
+    private String secondHelping;
+
+    /**
+     * 麻醉医师
+     */
+    private String narcosisDoctor;
+
+    /**
+     * 麻醉方式
+     */
+    private String narcosisType;
+
+    /**
+     * 切口类别
+     */
+    private String cutType;
+
+    /**
+     * 病理诊断
+     */
+    private String pathologicalDiagnosis;
+
+    /**
+     * 是否术中植入物
+     */
+    private String isImplants;
+
+    /**
+     * 植入物名称
+     */
+    private String implantsName;
+
+    /**
+     * 出血
+     */
+    private String bloodLoss;
+
+    /**
+     * 术中所见
+     */
+    private String intraoperativeView;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 手术经过及处理
+     */
+    private String operationProcess;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getPreoperationDiagnosis() {
+        return preoperationDiagnosis;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getPostoperativeDiagnosis() {
+        return postoperativeDiagnosis;
+    }
+
+    public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
+        this.postoperativeDiagnosis = postoperativeDiagnosis;
+    }
+    public String getOperationSurgeon() {
+        return operationSurgeon;
+    }
+
+    public void setOperationSurgeon(String operationSurgeon) {
+        this.operationSurgeon = operationSurgeon;
+    }
+    public String getFirstHelping() {
+        return firstHelping;
+    }
+
+    public void setFirstHelping(String firstHelping) {
+        this.firstHelping = firstHelping;
+    }
+    public String getSecondHelping() {
+        return secondHelping;
+    }
+
+    public void setSecondHelping(String secondHelping) {
+        this.secondHelping = secondHelping;
+    }
+    public String getNarcosisDoctor() {
+        return narcosisDoctor;
+    }
+
+    public void setNarcosisDoctor(String narcosisDoctor) {
+        this.narcosisDoctor = narcosisDoctor;
+    }
+    public String getNarcosisType() {
+        return narcosisType;
+    }
+
+    public void setNarcosisType(String narcosisType) {
+        this.narcosisType = narcosisType;
+    }
+    public String getCutType() {
+        return cutType;
+    }
+
+    public void setCutType(String cutType) {
+        this.cutType = cutType;
+    }
+    public String getPathologicalDiagnosis() {
+        return pathologicalDiagnosis;
+    }
+
+    public void setPathologicalDiagnosis(String pathologicalDiagnosis) {
+        this.pathologicalDiagnosis = pathologicalDiagnosis;
+    }
+    public String getIsImplants() {
+        return isImplants;
+    }
+
+    public void setIsImplants(String isImplants) {
+        this.isImplants = isImplants;
+    }
+    public String getImplantsName() {
+        return implantsName;
+    }
+
+    public void setImplantsName(String implantsName) {
+        this.implantsName = implantsName;
+    }
+    public String getBloodLoss() {
+        return bloodLoss;
+    }
+
+    public void setBloodLoss(String bloodLoss) {
+        this.bloodLoss = bloodLoss;
+    }
+    public String getIntraoperativeView() {
+        return intraoperativeView;
+    }
+
+    public void setIntraoperativeView(String intraoperativeView) {
+        this.intraoperativeView = intraoperativeView;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    public String getOperationProcess() {
+        return operationProcess;
+    }
+
+    public void setOperationProcess(String operationProcess) {
+        this.operationProcess = operationProcess;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrOperativeNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", operationDate=" + operationDate +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", preoperationDiagnosis=" + preoperationDiagnosis +
+            ", operationName=" + operationName +
+            ", postoperativeDiagnosis=" + postoperativeDiagnosis +
+            ", operationSurgeon=" + operationSurgeon +
+            ", firstHelping=" + firstHelping +
+            ", secondHelping=" + secondHelping +
+            ", narcosisDoctor=" + narcosisDoctor +
+            ", narcosisType=" + narcosisType +
+            ", cutType=" + cutType +
+            ", pathologicalDiagnosis=" + pathologicalDiagnosis +
+            ", isImplants=" + isImplants +
+            ", implantsName=" + implantsName +
+            ", bloodLoss=" + bloodLoss +
+            ", intraoperativeView=" + intraoperativeView +
+            ", postoperativeNotice=" + postoperativeNotice +
+            ", operationProcess=" + operationProcess +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrPeriodConclusion.java

@@ -0,0 +1,401 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 阶段小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrPeriodConclusion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊治经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 目前情况
+     */
+    private String presentSituation;
+
+    /**
+     * 诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getPresentSituation() {
+        return presentSituation;
+    }
+
+    public void setPresentSituation(String presentSituation) {
+        this.presentSituation = presentSituation;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrPeriodConclusion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", participant=" + participant +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", presentSituation=" + presentSituation +
+            ", treatPlan=" + treatPlan +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrPreoperativeDiscussion.java

@@ -0,0 +1,466 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 术前讨论小结
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrPreoperativeDiscussion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 讨论时间
+     */
+    private Date discussTime;
+
+    /**
+     * 讨论方式
+     */
+    private String discussType;
+
+    /**
+     * 参加人员
+     */
+    private String participant;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 术前诊断
+     */
+    private String preoperationDiagnosis;
+
+    /**
+     * 手术指征与禁忌
+     */
+    private String operationIndication;
+
+    /**
+     * 可替代的方案
+     */
+    private String replacePlan;
+
+    /**
+     * 拟施手术方式、名称及可能的变更与禁忌症
+     */
+    private String operationName;
+
+    /**
+     * 拟施麻醉方式
+     */
+    private String anesthesiaType;
+
+    /**
+     * 术前准备
+     */
+    private String preoperationPrepare;
+
+    /**
+     * 主要术中、术后风险及防范措施
+     */
+    private String intraoperativeRisk;
+
+    /**
+     * 术中注意事项
+     */
+    private String intraoperativeNotice;
+
+    /**
+     * 术后注意事项
+     */
+    private String postoperativeNotice;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getDiscussTime() {
+        return discussTime;
+    }
+
+    public void setDiscussTime(Date discussTime) {
+        this.discussTime = discussTime;
+    }
+    public String getDiscussType() {
+        return discussType;
+    }
+
+    public void setDiscussType(String discussType) {
+        this.discussType = discussType;
+    }
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getPreoperationDiagnosis() {
+        return preoperationDiagnosis;
+    }
+
+    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
+        this.preoperationDiagnosis = preoperationDiagnosis;
+    }
+    public String getOperationIndication() {
+        return operationIndication;
+    }
+
+    public void setOperationIndication(String operationIndication) {
+        this.operationIndication = operationIndication;
+    }
+    public String getReplacePlan() {
+        return replacePlan;
+    }
+
+    public void setReplacePlan(String replacePlan) {
+        this.replacePlan = replacePlan;
+    }
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+    public String getAnesthesiaType() {
+        return anesthesiaType;
+    }
+
+    public void setAnesthesiaType(String anesthesiaType) {
+        this.anesthesiaType = anesthesiaType;
+    }
+    public String getPreoperationPrepare() {
+        return preoperationPrepare;
+    }
+
+    public void setPreoperationPrepare(String preoperationPrepare) {
+        this.preoperationPrepare = preoperationPrepare;
+    }
+    public String getIntraoperativeRisk() {
+        return intraoperativeRisk;
+    }
+
+    public void setIntraoperativeRisk(String intraoperativeRisk) {
+        this.intraoperativeRisk = intraoperativeRisk;
+    }
+    public String getIntraoperativeNotice() {
+        return intraoperativeNotice;
+    }
+
+    public void setIntraoperativeNotice(String intraoperativeNotice) {
+        this.intraoperativeNotice = intraoperativeNotice;
+    }
+    public String getPostoperativeNotice() {
+        return postoperativeNotice;
+    }
+
+    public void setPostoperativeNotice(String postoperativeNotice) {
+        this.postoperativeNotice = postoperativeNotice;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrPreoperativeDiscussion{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", sex=" + sex +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", discussTime=" + discussTime +
+            ", discussType=" + discussType +
+            ", participant=" + participant +
+            ", briefNote=" + briefNote +
+            ", preoperationDiagnosis=" + preoperationDiagnosis +
+            ", operationIndication=" + operationIndication +
+            ", replacePlan=" + replacePlan +
+            ", operationName=" + operationName +
+            ", anesthesiaType=" + anesthesiaType +
+            ", preoperationPrepare=" + preoperationPrepare +
+            ", intraoperativeRisk=" + intraoperativeRisk +
+            ", intraoperativeNotice=" + intraoperativeNotice +
+            ", postoperativeNotice=" + postoperativeNotice +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrRescueNote.java

@@ -0,0 +1,362 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 抢救记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrRescueNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 简要病情
+     */
+    private String briefNote;
+
+    /**
+     * 抢救措施
+     */
+    private String resuscitation;
+
+    /**
+     * 参加抢救的医务人员姓名及专业技术职称
+     */
+    private String rescueMan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+    public String getBriefNote() {
+        return briefNote;
+    }
+
+    public void setBriefNote(String briefNote) {
+        this.briefNote = briefNote;
+    }
+    public String getResuscitation() {
+        return resuscitation;
+    }
+
+    public void setResuscitation(String resuscitation) {
+        this.resuscitation = resuscitation;
+    }
+    public String getRescueMan() {
+        return rescueMan;
+    }
+
+    public void setRescueMan(String rescueMan) {
+        this.rescueMan = rescueMan;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrRescueNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", startTime=" + startTime +
+            ", endTime=" + endTime +
+            ", briefNote=" + briefNote +
+            ", resuscitation=" + resuscitation +
+            ", rescueMan=" + rescueMan +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrTalkInform.java

@@ -0,0 +1,167 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-01-04
+ */
+public class StrTalkInform implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    private String recId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历标题
+     */
+    private String recTitle;
+
+    /**
+     * 文书内容（blob）
+     */
+    private String content;
+
+    /**
+     * 文书类别
+     */
+    private String recType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getRecType() {
+        return recType;
+    }
+
+    public void setRecType(String recType) {
+        this.recType = recType;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrTalkInform{" +
+            "recId=" + recId +
+            ", behospitalCode=" + behospitalCode +
+            ", hospitalId=" + hospitalId +
+            ", recTitle=" + recTitle +
+            ", content=" + content +
+            ", recType=" + recType +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrTotalInfo.java

@@ -0,0 +1,197 @@
+package com.lantone.data.entity.dataStr;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 结构化文书异常监察表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-03-12
+ */
+public class StrTotalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 医院模板ID
+     */
+    private String modelId;
+
+    /**
+     * 医院模板名称
+     */
+    private String modelName;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getModelId() {
+        return modelId;
+    }
+
+    public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrTotalInfo{" +
+            "id=" + id +
+            ", recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", modelId=" + modelId +
+            ", modelName=" + modelName +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrTransferInNote.java

@@ -0,0 +1,427 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转入记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrTransferInNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 转入日期
+     */
+    private Date transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getTransferInDate() {
+        return transferInDate;
+    }
+
+    public void setTransferInDate(Date transferInDate) {
+        this.transferInDate = transferInDate;
+    }
+    public String getTransferOutDept() {
+        return transferOutDept;
+    }
+
+    public void setTransferOutDept(String transferOutDept) {
+        this.transferOutDept = transferOutDept;
+    }
+    public String getTransferInDept() {
+        return transferInDept;
+    }
+
+    public void setTransferInDept(String transferInDept) {
+        this.transferInDept = transferInDept;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getCurrentSituation() {
+        return currentSituation;
+    }
+
+    public void setCurrentSituation(String currentSituation) {
+        this.currentSituation = currentSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrTransferInNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transferInDate=" + transferInDate +
+            ", transferOutDept=" + transferOutDept +
+            ", transferInDept=" + transferInDept +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", currentSituation=" + currentSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrTransferOutNote.java

@@ -0,0 +1,427 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 转出记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrTransferOutNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 标题
+     */
+    private String recTitle;
+
+    /**
+     * 转入日期   --实际转出日期 ！！不能改动
+     */
+    private Date transferInDate;
+
+    /**
+     * 转出科室
+     */
+    private String transferOutDept;
+
+    /**
+     * 转入科室
+     */
+    private String transferInDept;
+
+    /**
+     * 主诉
+     */
+    private String chief;
+
+    /**
+     * 入院情况
+     */
+    private String behospitalSituation;
+
+    /**
+     * 目前病情
+     */
+    private String currentSituation;
+
+    /**
+     * 入院诊断
+     */
+    private String tentativeDiagnosis;
+
+    /**
+     * 诊疗经过
+     */
+    private String treatmentProcess;
+
+    /**
+     * 目前诊断
+     */
+    private String currentDiagnosis;
+
+    /**
+     * 转入诊疗计划
+     */
+    private String treatPlan;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Date getTransferInDate() {
+        return transferInDate;
+    }
+
+    public void setTransferInDate(Date transferInDate) {
+        this.transferInDate = transferInDate;
+    }
+    public String getTransferOutDept() {
+        return transferOutDept;
+    }
+
+    public void setTransferOutDept(String transferOutDept) {
+        this.transferOutDept = transferOutDept;
+    }
+    public String getTransferInDept() {
+        return transferInDept;
+    }
+
+    public void setTransferInDept(String transferInDept) {
+        this.transferInDept = transferInDept;
+    }
+    public String getChief() {
+        return chief;
+    }
+
+    public void setChief(String chief) {
+        this.chief = chief;
+    }
+    public String getBehospitalSituation() {
+        return behospitalSituation;
+    }
+
+    public void setBehospitalSituation(String behospitalSituation) {
+        this.behospitalSituation = behospitalSituation;
+    }
+    public String getCurrentSituation() {
+        return currentSituation;
+    }
+
+    public void setCurrentSituation(String currentSituation) {
+        this.currentSituation = currentSituation;
+    }
+    public String getTentativeDiagnosis() {
+        return tentativeDiagnosis;
+    }
+
+    public void setTentativeDiagnosis(String tentativeDiagnosis) {
+        this.tentativeDiagnosis = tentativeDiagnosis;
+    }
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+    public String getCurrentDiagnosis() {
+        return currentDiagnosis;
+    }
+
+    public void setCurrentDiagnosis(String currentDiagnosis) {
+        this.currentDiagnosis = currentDiagnosis;
+    }
+    public String getTreatPlan() {
+        return treatPlan;
+    }
+
+    public void setTreatPlan(String treatPlan) {
+        this.treatPlan = treatPlan;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrTransferOutNote{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", sex=" + sex +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", recordDate=" + recordDate +
+            ", recTitle=" + recTitle +
+            ", transferInDate=" + transferInDate +
+            ", transferOutDept=" + transferOutDept +
+            ", transferInDept=" + transferInDept +
+            ", chief=" + chief +
+            ", behospitalSituation=" + behospitalSituation +
+            ", currentSituation=" + currentSituation +
+            ", tentativeDiagnosis=" + tentativeDiagnosis +
+            ", treatmentProcess=" + treatmentProcess +
+            ", currentDiagnosis=" + currentDiagnosis +
+            ", treatPlan=" + treatPlan +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/dataStr/StrWardRecord.java

@@ -0,0 +1,388 @@
+package com.lantone.data.entity.dataStr;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 查房记录
+ * </p>
+ *
+ * @author cy
+ * @since 2020-10-09
+ */
+public class StrWardRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录编号
+     */
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 床号
+     */
+    private String bedNo;
+
+    /**
+     * 科别
+     */
+    private String deptName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 病历日期
+     */
+    private Date recordDate;
+
+    /**
+     * 查房日期
+     */
+    private Date wardDate;
+
+    /**
+     * 查房医生
+     */
+    private String wardDoctor;
+
+    /**
+     * 标题
+     */
+    private String wardTitle;
+
+    /**
+     * 病情记录
+     */
+    private String wardContent;
+
+    /**
+     * S
+     */
+    private String wardS;
+
+    /**
+     * O
+     */
+    private String wardO;
+
+    /**
+     * A
+     */
+    private String wardA;
+
+    /**
+     * P
+     */
+    private String wardP;
+
+    /**
+     * 记录医生
+     */
+    private String recDoctor;
+
+    /**
+     * 记录时间
+     */
+    private Date recDate;
+
+    /**
+     * 审核医生
+     */
+    private String auditDoctor;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 结构化数据
+     */
+    private String wholeData;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 修改人
+     */
+    private String modifier;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+    public String getBedNo() {
+        return bedNo;
+    }
+
+    public void setBedNo(String bedNo) {
+        this.bedNo = bedNo;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+    public Date getWardDate() {
+        return wardDate;
+    }
+
+    public void setWardDate(Date wardDate) {
+        this.wardDate = wardDate;
+    }
+    public String getWardDoctor() {
+        return wardDoctor;
+    }
+
+    public void setWardDoctor(String wardDoctor) {
+        this.wardDoctor = wardDoctor;
+    }
+    public String getWardTitle() {
+        return wardTitle;
+    }
+
+    public void setWardTitle(String wardTitle) {
+        this.wardTitle = wardTitle;
+    }
+    public String getWardContent() {
+        return wardContent;
+    }
+
+    public void setWardContent(String wardContent) {
+        this.wardContent = wardContent;
+    }
+    public String getWardS() {
+        return wardS;
+    }
+
+    public void setWardS(String wardS) {
+        this.wardS = wardS;
+    }
+    public String getWardO() {
+        return wardO;
+    }
+
+    public void setWardO(String wardO) {
+        this.wardO = wardO;
+    }
+    public String getWardA() {
+        return wardA;
+    }
+
+    public void setWardA(String wardA) {
+        this.wardA = wardA;
+    }
+    public String getWardP() {
+        return wardP;
+    }
+
+    public void setWardP(String wardP) {
+        this.wardP = wardP;
+    }
+    public String getRecDoctor() {
+        return recDoctor;
+    }
+
+    public void setRecDoctor(String recDoctor) {
+        this.recDoctor = recDoctor;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getAuditDoctor() {
+        return auditDoctor;
+    }
+
+    public void setAuditDoctor(String auditDoctor) {
+        this.auditDoctor = auditDoctor;
+    }
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+    public String getWholeData() {
+        return wholeData;
+    }
+
+    public void setWholeData(String wholeData) {
+        this.wholeData = wholeData;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "StrWardRecord{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", name=" + name +
+            ", age=" + age +
+            ", bedNo=" + bedNo +
+            ", deptName=" + deptName +
+            ", sex=" + sex +
+            ", recordDate=" + recordDate +
+            ", wardDate=" + wardDate +
+            ", wardDoctor=" + wardDoctor +
+            ", wardTitle=" + wardTitle +
+            ", wardContent=" + wardContent +
+            ", wardS=" + wardS +
+            ", wardO=" + wardO +
+            ", wardA=" + wardA +
+            ", wardP=" + wardP +
+            ", recDoctor=" + recDoctor +
+            ", recDate=" + recDate +
+            ", auditDoctor=" + auditDoctor +
+            ", auditDate=" + auditDate +
+            ", wholeData=" + wholeData +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/HisBehospitalInfo.java

@@ -0,0 +1,316 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("V_LT_BEHOSPITAL_INFO")
+public class HisBehospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("SEX")
+    private String sex;
+
+    @TableField("BIRTHDAY")
+    private Date birthday;
+
+    @TableField("FILE_CODE")
+    private String fileCode;
+
+    @TableField("WARD_CODE")
+    private String wardCode;
+
+    @TableField("WARD_NAME")
+    private String wardName;
+
+    @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("DIAGNOSE_ICD")
+    private String diagnoseIcd;
+
+    @TableField("DOCTOR_ID")
+    private String doctorId;
+
+    @TableField("DOCTOR_NAME")
+    private String doctorName;
+
+    @TableField("BEH_DOCTOR_ID")
+    private String behDoctorId;
+
+    @TableField("BEH_DOCTOR_NAME")
+    private String behDoctorName;
+
+    @TableField("DIRECTOR_DOCTOR_ID")
+    private String directorDoctorId;
+
+    @TableField("DIRECTOR_DOCTOR_NAME")
+    private String directorDoctorName;
+
+    @TableField("DIAGNOSE")
+    private String diagnose;
+
+    @TableField("HOSPITAL_ID")
+    private Integer hospitalId;
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getFileCode() {
+        return fileCode;
+    }
+
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
+
+    public String getWardCode() {
+        return wardCode;
+    }
+
+    public void setWardCode(String wardCode) {
+        this.wardCode = wardCode;
+    }
+
+    public String getWardName() {
+        return wardName;
+    }
+
+    public void setWardName(String wardName) {
+        this.wardName = wardName;
+    }
+
+    public String getBehDeptId() {
+        return behDeptId;
+    }
+
+    public void setBehDeptId(String behDeptId) {
+        this.behDeptId = behDeptId;
+    }
+
+    public String getBehDeptName() {
+        return behDeptName;
+    }
+
+    public void setBehDeptName(String behDeptName) {
+        this.behDeptName = behDeptName;
+    }
+
+    public String getBedCode() {
+        return bedCode;
+    }
+
+    public void setBedCode(String bedCode) {
+        this.bedCode = bedCode;
+    }
+
+    public String getBedName() {
+        return bedName;
+    }
+
+    public void setBedName(String bedName) {
+        this.bedName = bedName;
+    }
+
+    public String getInsuranceName() {
+        return insuranceName;
+    }
+
+    public void setInsuranceName(String insuranceName) {
+        this.insuranceName = insuranceName;
+    }
+
+    public String getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(String jobType) {
+        this.jobType = jobType;
+    }
+
+    public Date getBehospitalDate() {
+        return behospitalDate;
+    }
+
+    public void setBehospitalDate(Date behospitalDate) {
+        this.behospitalDate = behospitalDate;
+    }
+
+    public Date getLeaveHospitalDate() {
+        return leaveHospitalDate;
+    }
+
+    public void setLeaveHospitalDate(Date leaveHospitalDate) {
+        this.leaveHospitalDate = leaveHospitalDate;
+    }
+
+    public String getDiagnoseIcd() {
+        return diagnoseIcd;
+    }
+
+    public void setDiagnoseIcd(String diagnoseIcd) {
+        this.diagnoseIcd = diagnoseIcd;
+    }
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public String getBehDoctorId() {
+        return behDoctorId;
+    }
+
+    public void setBehDoctorId(String behDoctorId) {
+        this.behDoctorId = behDoctorId;
+    }
+
+    public String getBehDoctorName() {
+        return behDoctorName;
+    }
+
+    public void setBehDoctorName(String behDoctorName) {
+        this.behDoctorName = behDoctorName;
+    }
+
+    public String getDirectorDoctorId() {
+        return directorDoctorId;
+    }
+
+    public void setDirectorDoctorId(String directorDoctorId) {
+        this.directorDoctorId = directorDoctorId;
+    }
+
+    public String getDirectorDoctorName() {
+        return directorDoctorName;
+    }
+
+    public void setDirectorDoctorName(String directorDoctorName) {
+        this.directorDoctorName = directorDoctorName;
+    }
+
+    public String getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose;
+    }
+
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    @Override
+    public String toString() {
+        return "HisBehospitalInfo{" +
+                "behospitalCode=" + behospitalCode +
+                ", name=" + name +
+                ", sex=" + sex +
+                ", birthday=" + birthday +
+                ", fileCode=" + fileCode +
+                ", wardCode=" + wardCode +
+                ", wardName=" + wardName +
+                ", behDeptId=" + behDeptId +
+                ", behDeptName=" + behDeptName +
+                ", bedCode=" + bedCode +
+                ", bedName=" + bedName +
+                ", insuranceName=" + insuranceName +
+                ", jobType=" + jobType +
+                ", behospitalDate=" + behospitalDate +
+                ", leaveHospitalDate=" + leaveHospitalDate +
+                ", diagnoseIcd=" + diagnoseIcd +
+                ", doctorId=" + doctorId +
+                ", doctorName=" + doctorName +
+                ", behDoctorId=" + behDoctorId +
+                ", behDoctorName=" + behDoctorName +
+                ", directorDoctorId=" + directorDoctorId +
+                ", directorDoctorName=" + directorDoctorName +
+                ", diagnose=" + diagnose +
+                ", hospitalId=" + hospitalId +
+                "}";
+    }
+
+}

data-service/src/main/java/com/lantone/data/entity/his/HisDoctorAdvice.java

@@ -0,0 +1,303 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("V_LT_DOCTOR_ADVICE")
+public class HisDoctorAdvice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("DOCTOR_ADVICE_ID")
+    private String doctorAdviceId;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("ORDER_DOCTOR_NAME")
+    private String orderDoctorName;
+
+    @TableField("FREQUENCY")
+    private String frequency;
+
+    @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;
+
+    @TableField("MEDICINE_TYPE")
+    private String medicineType;
+
+    @TableField("DA_MED_TYPE")
+    private String daMedType;
+
+    @TableField("DOCTOR_NOTICE")
+    private String doctorNotice;
+
+    @TableField("DOCTOR_ID")
+    private String doctorId;
+
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    @TableField("DOCTOR_NAME")
+    private String doctorName;
+
+    public String getDoctorAdviceId() {
+        return doctorAdviceId;
+    }
+
+    public void setDoctorAdviceId(String doctorAdviceId) {
+        this.doctorAdviceId = doctorAdviceId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getOrderDoctorName() {
+        return orderDoctorName;
+    }
+
+    public void setOrderDoctorName(String orderDoctorName) {
+        this.orderDoctorName = orderDoctorName;
+    }
+    public String getFrequency() {
+        return frequency;
+    }
+
+    public void setFrequency(String frequency) {
+        this.frequency = frequency;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getDoctorAdviceType() {
+        return doctorAdviceType;
+    }
+
+    public void setDoctorAdviceType(String doctorAdviceType) {
+        this.doctorAdviceType = doctorAdviceType;
+    }
+    public String getUsageNum() {
+        return usageNum;
+    }
+
+    public void setUsageNum(String usageNum) {
+        this.usageNum = usageNum;
+    }
+    public String getUsageUnit() {
+        return usageUnit;
+    }
+
+    public void setUsageUnit(String usageUnit) {
+        this.usageUnit = usageUnit;
+    }
+    public String getDose() {
+        return dose;
+    }
+
+    public void setDose(String dose) {
+        this.dose = dose;
+    }
+    public String getDoseUnit() {
+        return doseUnit;
+    }
+
+    public void setDoseUnit(String doseUnit) {
+        this.doseUnit = doseUnit;
+    }
+    public String getMedModeType() {
+        return medModeType;
+    }
+
+    public void setMedModeType(String medModeType) {
+        this.medModeType = medModeType;
+    }
+    public String getDaFrequency() {
+        return daFrequency;
+    }
+
+    public void setDaFrequency(String daFrequency) {
+        this.daFrequency = daFrequency;
+    }
+    public String getDaDealType() {
+        return daDealType;
+    }
+
+    public void setDaDealType(String daDealType) {
+        this.daDealType = daDealType;
+    }
+    public Date getDaStartDate() {
+        return daStartDate;
+    }
+
+    public void setDaStartDate(Date daStartDate) {
+        this.daStartDate = daStartDate;
+    }
+    public String getDaItemName() {
+        return daItemName;
+    }
+
+    public void setDaItemName(String daItemName) {
+        this.daItemName = daItemName;
+    }
+    public String getDaStatus() {
+        return daStatus;
+    }
+
+    public void setDaStatus(String daStatus) {
+        this.daStatus = daStatus;
+    }
+    public Date getDaStopDate() {
+        return daStopDate;
+    }
+
+    public void setDaStopDate(Date daStopDate) {
+        this.daStopDate = daStopDate;
+    }
+    public String getDaGroupNo() {
+        return daGroupNo;
+    }
+
+    public void setDaGroupNo(String daGroupNo) {
+        this.daGroupNo = daGroupNo;
+    }
+    public String getDaPrescriptionType() {
+        return daPrescriptionType;
+    }
+
+    public void setDaPrescriptionType(String daPrescriptionType) {
+        this.daPrescriptionType = daPrescriptionType;
+    }
+    public String getMedicineType() {
+        return medicineType;
+    }
+
+    public void setMedicineType(String medicineType) {
+        this.medicineType = medicineType;
+    }
+    public String getDaMedType() {
+        return daMedType;
+    }
+
+    public void setDaMedType(String daMedType) {
+        this.daMedType = daMedType;
+    }
+    public String getDoctorNotice() {
+        return doctorNotice;
+    }
+
+    public void setDoctorNotice(String doctorNotice) {
+        this.doctorNotice = doctorNotice;
+    }
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    @Override
+    public String toString() {
+        return "HisDoctorAdvice{" +
+                "doctorAdviceId=" + doctorAdviceId +
+                ", behospitalCode=" + behospitalCode +
+                ", orderDoctorName=" + orderDoctorName +
+                ", frequency=" + frequency +
+                ", parentTypeId=" + parentTypeId +
+                ", doctorAdviceType=" + doctorAdviceType +
+                ", usageNum=" + usageNum +
+                ", usageUnit=" + usageUnit +
+                ", dose=" + dose +
+                ", doseUnit=" + doseUnit +
+                ", medModeType=" + medModeType +
+                ", daFrequency=" + daFrequency +
+                ", daDealType=" + daDealType +
+                ", daStartDate=" + daStartDate +
+                ", daItemName=" + daItemName +
+                ", daStatus=" + daStatus +
+                ", daStopDate=" + daStopDate +
+                ", daGroupNo=" + daGroupNo +
+                ", daPrescriptionType=" + daPrescriptionType +
+                ", medicineType=" + medicineType +
+                ", daMedType=" + daMedType +
+                ", doctorNotice=" + doctorNotice +
+                ", doctorId=" + doctorId +
+                ", hospitalId=" + hospitalId +
+                ", doctorName=" + doctorName +
+                "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/HisHomeDiagnoseInfo.java

@@ -0,0 +1,162 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("V_LT_HOME_DIAGNOSE_INFO")
+public class HisHomeDiagnoseInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("HOME_PAGE_ID")
+    private String homePageId;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("DIAGNOSE_ORDER_NO")
+    private String 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;
+
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getHomePageId() {
+        return homePageId;
+    }
+
+    public void setHomePageId(String homePageId) {
+        this.homePageId = homePageId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public String getDiagnoseOrderNo() {
+        return diagnoseOrderNo;
+    }
+
+    public void setDiagnoseOrderNo(String diagnoseOrderNo) {
+        this.diagnoseOrderNo = diagnoseOrderNo;
+    }
+
+    public String getDiagnoseType() {
+        return diagnoseType;
+    }
+
+    public void setDiagnoseType(String diagnoseType) {
+        this.diagnoseType = diagnoseType;
+    }
+
+    public String getDiagnoseTypeShort() {
+        return diagnoseTypeShort;
+    }
+
+    public void setDiagnoseTypeShort(String diagnoseTypeShort) {
+        this.diagnoseTypeShort = diagnoseTypeShort;
+    }
+
+    public String getDiagnoseName() {
+        return diagnoseName;
+    }
+
+    public void setDiagnoseName(String diagnoseName) {
+        this.diagnoseName = diagnoseName;
+    }
+
+    public String getBehospitalType() {
+        return behospitalType;
+    }
+
+    public void setBehospitalType(String behospitalType) {
+        this.behospitalType = behospitalType;
+    }
+
+    public String getLeaveHospitalType() {
+        return leaveHospitalType;
+    }
+
+    public void setLeaveHospitalType(String leaveHospitalType) {
+        this.leaveHospitalType = leaveHospitalType;
+    }
+
+    public String getPathologyDiagnose() {
+        return pathologyDiagnose;
+    }
+
+    public void setPathologyDiagnose(String pathologyDiagnose) {
+        this.pathologyDiagnose = pathologyDiagnose;
+    }
+
+    public String getIcdCode() {
+        return icdCode;
+    }
+
+    public void setIcdCode(String icdCode) {
+        this.icdCode = icdCode;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    @Override
+    public String toString() {
+        return "HisHomeDiagnoseInfo{" +
+                "homePageId='" + homePageId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", diagnoseOrderNo='" + diagnoseOrderNo + '\'' +
+                ", diagnoseType='" + diagnoseType + '\'' +
+                ", diagnoseTypeShort='" + diagnoseTypeShort + '\'' +
+                ", diagnoseName='" + diagnoseName + '\'' +
+                ", behospitalType='" + behospitalType + '\'' +
+                ", leaveHospitalType='" + leaveHospitalType + '\'' +
+                ", pathologyDiagnose='" + pathologyDiagnose + '\'' +
+                ", icdCode='" + icdCode + '\'' +
+                ", hospitalId=" + hospitalId +
+                '}';
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/HisHomeOperationInfo.java

@@ -0,0 +1,219 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("V_LT_HOME_OPERATION_INFO")
+public class HisHomeOperationInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("HOME_PAGE_ID")
+    private String homePageId;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("OPERATION_ORDER_NO")
+    private String 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;
+
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    public String getHomePageId() {
+        return homePageId;
+    }
+
+    public void setHomePageId(String homePageId) {
+        this.homePageId = homePageId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public String getOperationOrderNo() {
+        return operationOrderNo;
+    }
+
+    public void setOperationOrderNo(String operationOrderNo) {
+        this.operationOrderNo = operationOrderNo;
+    }
+
+    public Date getOperationDate() {
+        return operationDate;
+    }
+
+    public void setOperationDate(Date operationDate) {
+        this.operationDate = operationDate;
+    }
+
+    public String getOperationCode() {
+        return operationCode;
+    }
+
+    public void setOperationCode(String operationCode) {
+        this.operationCode = operationCode;
+    }
+
+    public String getOperationDoctorId() {
+        return operationDoctorId;
+    }
+
+    public void setOperationDoctorId(String operationDoctorId) {
+        this.operationDoctorId = operationDoctorId;
+    }
+
+    public String getFirstAssistantId() {
+        return firstAssistantId;
+    }
+
+    public void setFirstAssistantId(String firstAssistantId) {
+        this.firstAssistantId = firstAssistantId;
+    }
+
+    public String getSecondAssistantId() {
+        return secondAssistantId;
+    }
+
+    public void setSecondAssistantId(String secondAssistantId) {
+        this.secondAssistantId = secondAssistantId;
+    }
+
+    public String getCutLevel() {
+        return cutLevel;
+    }
+
+    public void setCutLevel(String cutLevel) {
+        this.cutLevel = cutLevel;
+    }
+
+    public String getHealingLevel() {
+        return healingLevel;
+    }
+
+    public void setHealingLevel(String healingLevel) {
+        this.healingLevel = healingLevel;
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
+    public String getOperationLevel() {
+        return operationLevel;
+    }
+
+    public void setOperationLevel(String operationLevel) {
+        this.operationLevel = operationLevel;
+    }
+
+    public String getAnaesthesiaName() {
+        return anaesthesiaName;
+    }
+
+    public void setAnaesthesiaName(String anaesthesiaName) {
+        this.anaesthesiaName = anaesthesiaName;
+    }
+
+    public String getAnaesthesiaDoctor() {
+        return anaesthesiaDoctor;
+    }
+
+    public void setAnaesthesiaDoctor(String anaesthesiaDoctor) {
+        this.anaesthesiaDoctor = anaesthesiaDoctor;
+    }
+
+    public String getShamOperationName() {
+        return shamOperationName;
+    }
+
+    public void setShamOperationName(String shamOperationName) {
+        this.shamOperationName = shamOperationName;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    @Override
+    public String toString() {
+        return "HisHomeOperationInfo{" +
+                "homePageId='" + homePageId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", operationOrderNo='" + operationOrderNo + '\'' +
+                ", operationDate=" + operationDate +
+                ", operationCode='" + operationCode + '\'' +
+                ", operationDoctorId='" + operationDoctorId + '\'' +
+                ", firstAssistantId='" + firstAssistantId + '\'' +
+                ", secondAssistantId='" + secondAssistantId + '\'' +
+                ", cutLevel='" + cutLevel + '\'' +
+                ", healingLevel='" + healingLevel + '\'' +
+                ", operationName='" + operationName + '\'' +
+                ", operationLevel='" + operationLevel + '\'' +
+                ", anaesthesiaName='" + anaesthesiaName + '\'' +
+                ", anaesthesiaDoctor='" + anaesthesiaDoctor + '\'' +
+                ", shamOperationName='" + shamOperationName + '\'' +
+                ", hospitalId=" + hospitalId +
+                '}';
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/HisMedicalRecord.java

@@ -0,0 +1,129 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("V_LT_MEDICAL_RECORD")
+public class HisMedicalRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("REC_ID")
+    private String recId;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("ORG_CODE")
+    private String orgCode;
+
+    @TableField("REC_TYPE_ID")
+    private String recTypeId;
+
+    @TableField("REC_DATE")
+    private Date recDate;
+
+    @TableField("REC_TITLE")
+    private String recTitle;
+
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    @TableField("XML_TEXT")
+    private String xmlText;
+
+    @TableField("HTML_TEXT")
+    private String htmlText;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+    public String getRecTypeId() {
+        return recTypeId;
+    }
+
+    public void setRecTypeId(String recTypeId) {
+        this.recTypeId = recTypeId;
+    }
+    public Date getRecDate() {
+        return recDate;
+    }
+
+    public void setRecDate(Date recDate) {
+        this.recDate = recDate;
+    }
+    public String getRecTitle() {
+        return recTitle;
+    }
+
+    public void setRecTitle(String recTitle) {
+        this.recTitle = recTitle;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getXmlText() {
+        return xmlText;
+    }
+
+    public void setXmlText(String xmlText) {
+        this.xmlText = xmlText;
+    }
+
+    public String getHtmlText() {
+        return htmlText;
+    }
+
+    public void setHtmlText(String htmlText) {
+        this.htmlText = htmlText;
+    }
+
+    @Override
+    public String toString() {
+        return "HisMedicalRecord{" +
+                "recId=" + recId +
+                ", behospitalCode=" + behospitalCode +
+                ", orgCode=" + orgCode +
+                ", recTypeId=" + recTypeId +
+                ", recDate=" + recDate +
+                ", recTitle=" + recTitle +
+                ", hospitalId=" + hospitalId +
+                ", xmlText=" + xmlText +
+                ", htmlText=" + htmlText +
+                "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/HisMedicalRecordContent.java

@@ -0,0 +1,86 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lipc
+ * @since 2021-09-28
+ */
+@TableName("HIS_MEDICAL_RECORD_CONTENT")
+public class HisMedicalRecordContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("REC_ID")
+    private String recId;
+
+    @TableField("BEHOSPITAL_CODE")
+    private String behospitalCode;
+
+    @TableField("HOSPITAL_ID")
+    private Long hospitalId;
+
+    @TableField("HTML_TEXT")
+    private String htmlText;
+
+    @TableField("XML_TEXT")
+    private String xmlText;
+
+    public String getRecId() {
+        return recId;
+    }
+
+    public void setRecId(String recId) {
+        this.recId = recId;
+    }
+
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getHtmlText() {
+        return htmlText;
+    }
+
+    public void setHtmlText(String htmlText) {
+        this.htmlText = htmlText;
+    }
+
+    public String getXmlText() {
+        return xmlText;
+    }
+
+    public void setXmlText(String xmlText) {
+        this.xmlText = xmlText;
+    }
+
+    @Override
+    public String toString() {
+        return "HisMedicalRecordContent{" +
+                "recId='" + recId + '\'' +
+                ", behospitalCode='" + behospitalCode + '\'' +
+                ", hospitalId=" + hospitalId +
+                ", htmlText='" + htmlText + '\'' +
+                ", xmlText='" + xmlText + '\'' +
+                '}';
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/VLtDeptInfo.java

@@ -0,0 +1,127 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@TableName("V_LT_DEPT_INFO")
+public class VLtDeptInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("DEPT_ID")
+    private String deptId;
+
+    @TableField("HOSPITAL_ID")
+    private long hospitalId;
+
+    @TableField("PARENT_DEPT_ID")
+    private String parentDeptId;
+
+    @TableField("DEPT_NAME")
+    private String deptName;
+
+    @TableField("DEPT_TYPE")
+    private String deptType;
+
+    @TableField("SPELL")
+    private String spell;
+
+    @TableField("STATION")
+    private String station;
+
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getParentDeptId() {
+        return parentDeptId;
+    }
+
+    public void setParentDeptId(String parentDeptId) {
+        this.parentDeptId = parentDeptId;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getDeptType() {
+        return deptType;
+    }
+
+    public void setDeptType(String deptType) {
+        this.deptType = deptType;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public String getStation() {
+        return station;
+    }
+
+    public void setStation(String station) {
+        this.station = station;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "VLtDeptInfo{" +
+            "deptId=" + deptId +
+            ", hospitalId=" + hospitalId +
+            ", parentDeptId=" + parentDeptId +
+            ", deptName=" + deptName +
+            ", deptType=" + deptType +
+            ", spell=" + spell +
+            ", station=" + station +
+            ", createTime=" + createTime +
+            ", updateTime=" + updateTime +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/VLtDoctorInfo.java

@@ -0,0 +1,128 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@TableName("V_LT_DOCTOR_INFO")
+public class VLtDoctorInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("DOCTOR_ID")
+    private String doctorId;
+
+    @TableField("HOSPITAL_ID")
+    private String hospitalId;
+
+    @TableField("DEPT_ID")
+    private String deptId;
+
+    @TableField("NAME")
+    private String name;
+
+    @TableField("PROFESSOR")
+    private String professor;
+
+    @TableField("OCCUP")
+    private String occup;
+
+    @TableField("GROUP_ID")
+    private String groupId;
+
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getProfessor() {
+        return professor;
+    }
+
+    public void setProfessor(String professor) {
+        this.professor = professor;
+    }
+    public String getOccup() {
+        return occup;
+    }
+
+    public void setOccup(String occup) {
+        this.occup = occup;
+    }
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "VLtDoctorInfo{" +
+            "doctorId=" + doctorId +
+            ", hospitalId=" + hospitalId +
+            ", deptId=" + deptId +
+            ", name=" + name +
+            ", professor=" + professor +
+            ", occup=" + occup +
+            ", groupId=" + groupId +
+            ", createTime=" + createTime +
+            ", updateTime=" + updateTime +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/entity/his/VLtRecordType.java

@@ -0,0 +1,105 @@
+package com.lantone.data.entity.his;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@TableName("V_LT_RECORD_TYPE")
+public class VLtRecordType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("TYPE_ID")
+    private String typeId;
+
+    @TableField("HOSPITAL_ID")
+    private long hospitalId;
+
+    @TableField("TYPE_NAME")
+    private String typeName;
+
+    @TableField("PARENT_TYPE_ID")
+    private String parentTypeId;
+
+    @TableField("OBJ_NAME")
+    private String objName;
+
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+    public long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "VLtRecordType{" +
+            "typeId=" + typeId +
+            ", hospitalId=" + hospitalId +
+            ", typeName=" + typeName +
+            ", parentTypeId=" + parentTypeId +
+            ", objName=" + objName +
+            ", createTime=" + createTime +
+            ", updateTime=" + updateTime +
+        "}";
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataStr/StrAdmissionNoteFacade.java

@@ -1,24 +1,13 @@
 package com.lantone.data.facade.dataStr;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
-import com.diagbot.enums.CacheKeyEnum;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
-import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.data.AStrAdmissionNoteVO;
-import com.diagbot.vo.str.StrAdmissionNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.google.common.collect.Lists;
+import com.lantone.data.entity.dataStr.StrAdmissionNote;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrAdmissionNoteServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrAdmissionNoteVO;
+import com.lantone.structure.dto.RespDTO;
+import com.lantone.structure.util.MapUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,13 +26,11 @@ public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
     private StrAdmissionNoteServiceImpl strAdmissionNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     @Value("${log_switch.enable}")
     private boolean logSwitch;
 
-    public void getColumnZhAndCh() {
+    /*public void getColumnZhAndCh() {
         List<ColumnZhAndChDTO> list = this.baseMapper.getColumnZhAndCh();
         list.forEach(s -> {
             s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
@@ -56,7 +43,7 @@ public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
         if (!flag) {
             return;
         }
-    }
+    }*/
     /**
      * @Description:不解析时入库
      * @Author:liuqq

data-service/src/main/java/com/lantone/data/facade/dataStr/StrContentFacade.java

@@ -6,16 +6,10 @@ package com.lantone.data.facade.dataStr;
  * @time: ${DATE} ${TIME}
  **/
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.ModelHospital;
-import com.diagbot.entity.StrTotalInfo;
-import com.diagbot.enums.ModeIdEnum;
-import com.diagbot.facade.ModelHospitalFacade;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
-import com.diagbot.vo.str.StrContentVO;
+import com.lantone.data.entity.dataStr.StrTotalInfo;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,7 +28,7 @@ public class StrContentFacade {
     @Autowired
     private ModelHospitalFacade modelHospitalFacade;
     @Autowired
-    private com.diagbot.facade.str.StrTotalInfoFacade strTotalInfoFacade;
+    private StrTotalInfoFacade strTotalInfoFacade;
 
     @Value("${log_switch.enable}")
     private boolean logSwitch;

data-service/src/main/java/com/lantone/data/facade/dataView/VLtBehospitalInfoFacade.java

@@ -0,0 +1,207 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.QcType;
+import com.diagbot.entity.his.HisBehospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.QcTypeFacade;
+import com.diagbot.facade.his.HisBehospitalInfoFacade;
+import com.diagbot.service.impl.BehospitalInfoServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
+import io.github.lvyahui8.spring.facade.DataFacade;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class VLtBehospitalInfoFacade extends BehospitalInfoServiceImpl {
+
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    private HisBehospitalInfoFacade hisBehospitalInfoFacade;
+    @Autowired
+    private QcTypeFacade qcTypeFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getBehospitalInfoData(DataViewVO dataViewVO){
+        try{
+            //判断入参
+            if(dataViewVO.getHospitalId()==null && dataViewVO.getHospitalId()==0L){
+                return RespDTO.onError("初始医院ID为空！！");
+            }else if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("住院登记病历号为空！！");
+            }
+            //从his视图中获取数据
+            List<HisBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
+            if(ListUtil.isNotEmpty(list)){
+                list.stream().forEach(s->{
+                    BehospitalInfo vo = new BehospitalInfo();
+                    BeanUtils.copyProperties(s, vo);
+                    vo.setHospitalId(Integer.toUnsignedLong(s.getHospitalId()));
+                    vo.setQcTypeId(initQcTypeId(vo));
+                    BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(queryWrapper(vo));
+                    //获取到对应数据，存到我方数据库中
+                    if (behospitalInfo != null) {
+                        //更新数据
+                        UpdateWrapper updateWrapper = updateWrapper(behospitalInfo);
+                        vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                        vo.setGmtModified(new Date());
+                        behospitalInfoFacade.update(vo, updateWrapper);
+                    } else {
+                        //新增数据
+                        vo.setGmtCreate(new Date());
+                        behospitalInfoFacade.save(vo);
+                    }
+                });
+                return RespDTO.onSuc("入院登记操作成功！");
+            }else{
+                return RespDTO.onSuc("入院登记操作取消，未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),new Throwable());
+            return RespDTO.onError("入院登记操作失败！");
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public QueryWrapper queryWrapper(BehospitalInfo behospitalInfo){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<BehospitalInfo>();
+        if(behospitalInfo.getHospitalId()!=null && behospitalInfo.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", behospitalInfo.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(behospitalInfo.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", behospitalInfo.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    private UpdateWrapper updateWrapper(BehospitalInfo behospitalInfo){
+        UpdateWrapper updateWrapper=new UpdateWrapper<BehospitalInfo>();
+        if(behospitalInfo.getHospitalId()!=null && behospitalInfo.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", behospitalInfo.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(behospitalInfo.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", behospitalInfo.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
+
+    /**
+     * @Description:his数据补录,根据单个病历号或某个出院时间段内病历数去进去补录
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO hisDataSupplement(DataViewVO dataViewVO){
+        try {
+            //从his视图中获取数据
+            List<HisBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
+            //将所有病历号组成list集合
+            List<String> beHospitalCodeList=list.stream().map(HisBehospitalInfo::getBehospitalCode).collect(Collectors.toList());
+            Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("beHospitalCodeList", beHospitalCodeList);
+            invokeParams.put("beHospitalInfoList", list);
+            invokeParams.put("dataViewVO", dataViewVO);
+            RespDTO dto= DataFacade.get("viewDataSupplement", invokeParams, RespDTO.class);
+
+            return dto;
+        } catch (Exception e) {
+            log.error("数据补录异常！！！！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("数据补录异常！！！！"+e.getMessage());
+        }
+    }
+
+    /**
+     * @Description:
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getBehospitalInfoData(List<HisBehospitalInfo> HisBehospitalInfoList){
+        try {
+            if (ListUtil.isNotEmpty(HisBehospitalInfoList)) {
+                HisBehospitalInfoList.stream().forEach(s -> {
+                    BehospitalInfo vo = new BehospitalInfo();
+                    BeanUtils.copyProperties(s, vo);
+                    vo.setHospitalId(Integer.toUnsignedLong(s.getHospitalId()));
+                    vo.setQcTypeId(initQcTypeId(vo));
+                    BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(queryWrapper(vo));
+                    //获取到对应数据，存到我方数据库中
+                    if (behospitalInfo != null) {
+                        //更新数据
+                        UpdateWrapper updateWrapper = updateWrapper(behospitalInfo);
+                        vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                        vo.setGmtModified(new Date());
+                        behospitalInfoFacade.update(vo, updateWrapper);
+                    } else {
+                        //新增数据
+                        vo.setGmtCreate(new Date());
+                        behospitalInfoFacade.save(vo);
+                    }
+                });
+                return RespDTO.onSuc("入院登记数据补录完成！");
+            }else{
+                return RespDTO.onSuc("入院登记数据补录取消，未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error("入院登记数据补录异常！！！！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("入院登记数据补录异常！！！"+e.getMessage());
+        }
+    }
+
+    /**
+     * 初始化QcTypeId
+     * @param s
+     * @return
+     */
+    private Long initQcTypeId(BehospitalInfo s) {
+        Long qcTypeId = Long.valueOf("0");
+        try {
+            //根据科室查找对应质控类型
+            QcType qcTypeList = qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                    .eq("beh_dept_id", s.getBehDeptId())
+                    .eq("hospital_id", s.getHospitalId())
+                    .eq("default_module", 0)
+                    .eq("sex",s.getSex())
+                    .eq("is_deleted", IsDeleteEnum.N));
+            if(qcTypeList == null){
+                //无质控类型时，新增后初始化
+                QcType qcType = qcTypeFacade.getOne(new QueryWrapper<QcType>()
+                        .eq("default_module", 1)
+                        .eq("hospital_id", s.getHospitalId())
+                        .eq("sex",s.getSex())
+                        .eq("is_deleted", IsDeleteEnum.N));
+                if(qcType!=null){
+                    qcTypeId = qcType.getId();
+                }
+            }else {
+                qcTypeId = qcTypeList.getId();
+            }
+        }catch (Exception e){
+            log.error("住院登记信息qc_type_id初始化异常！！！！"+e.getMessage(),new Throwable());
+        }
+        return qcTypeId;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtDeptInfoFacade.java

@@ -0,0 +1,46 @@
+package com.lantone.data.facade.dataView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.BasDeptInfo;
+import com.diagbot.entity.his.VLtDeptInfo;
+import com.diagbot.service.impl.his.VLtDeptInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+@Component
+public class VLtDeptInfoFacade extends VLtDeptInfoServiceImpl {
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    private static final String DEPTS = "depts";
+
+    public Boolean syncDeptInfo(){
+        QueryWrapper queryWrapper=new QueryWrapper<VLtDeptInfo>();
+        /*查询昨天调整或新增的数据
+        queryWrapper.eq("CREATE_TIME", DateUtil.formatDate(new Date()))
+                .or()
+                .eq("UPDATE_TIME", DateUtil.formatDate(new Date()));
+        */
+        List<VLtDeptInfo> list=this.getBaseMapper().selectList(queryWrapper);
+        if(ListUtil.isNotEmpty(list)){
+            //获取所有的key值
+            Set<String> keys= redisUtil.getKeyList(DEPTS);
+            //先删除以往缓存数据
+            redisUtil.delete(keys);
+
+            //将新获取的数据进行存储
+            List<BasDeptInfo> deptList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+            Boolean flag=redisUtil.setIfAbsent(DEPTS, JSON.toJSONString(deptList));
+            return flag;
+        }
+        return true;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtDoctorAdviceFacade.java

@@ -0,0 +1,96 @@
+package com.lantone.data.facade.dataView;
+
+import com.lantone.data.entity.his.HisDoctorAdvice;
+import com.lantone.data.facade.his.HisDoctorAdviceFacade;
+import com.lantone.data.service.impl.data.DoctorAdviceServiceImpl;
+import com.lantone.data.vo.DataViewVO;
+import com.lantone.structure.dto.RespDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Slf4j
+public class VLtDoctorAdviceFacade extends DoctorAdviceServiceImpl {
+
+    @Autowired
+    private HisDoctorAdviceFacade hisDoctorAdviceFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getDoctorAdviceData(DataViewVO dataViewVO){
+        try{
+            if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("住院医嘱病历号为空！！");
+            }
+            //从his视图中获取数据
+            List<HisDoctorAdvice> list=hisDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
+            if(ListUtil.isNotEmpty(list)){
+                list.stream().forEach(s->{
+                    DoctorAdvice vo=new DoctorAdvice();
+                    BeanUtils.copyProperties(s,vo);
+                    DoctorAdvice doctorAdvice=this.getOne(queryWrapper(vo));
+                    //获取到对应数据，存到我方数据库中
+                    if(doctorAdvice!=null){
+                        //更新数据
+                        vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                        vo.setGmtModified(new Date());
+                        this.update(vo,updateWrapper(vo));
+                    }else{
+                        //新增数据
+                        vo.setGmtCreate(new Date());
+                        this.save(vo);
+                    }
+                });
+                return RespDTO.onSuc("住院医嘱操作成功！");
+            }else{
+                return RespDTO.onSuc("住院医嘱操作取消，未获取到数据！");
+            }
+
+        }catch (Exception e){
+            log.error("住院医嘱操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("住院医嘱操作失败！"+e.getMessage());
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DoctorAdvice doctorAdvice){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<DoctorAdvice>();
+        if(StringUtil.isNotEmpty(doctorAdvice.getDoctorAdviceId())){
+            queryWrapper.eq("doctor_advice_id", doctorAdvice.getDoctorAdviceId());
+        }
+        if(doctorAdvice.getHospitalId()!=null && doctorAdvice.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", doctorAdvice.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(doctorAdvice.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", doctorAdvice.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    private UpdateWrapper updateWrapper(DoctorAdvice doctorAdvice){
+        UpdateWrapper updateWrapper=new UpdateWrapper<DoctorAdvice>();
+        if(StringUtil.isNotEmpty(doctorAdvice.getDoctorAdviceId())){
+            updateWrapper.eq("doctor_advice_id", doctorAdvice.getDoctorAdviceId());
+        }
+        if(doctorAdvice.getHospitalId()!=null && doctorAdvice.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", doctorAdvice.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(doctorAdvice.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", doctorAdvice.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtDoctorInfoFacade.java

@@ -0,0 +1,45 @@
+package com.lantone.data.facade.dataView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.BasDoctorInfo;
+import com.diagbot.entity.his.VLtDoctorInfo;
+import com.diagbot.service.impl.his.VLtDoctorInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+@Component
+public class VLtDoctorInfoFacade extends VLtDoctorInfoServiceImpl {
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    private static final String DOCTORS = "doctors";
+
+    public void syncDoctorInfo(){
+        QueryWrapper queryWrapper=new QueryWrapper<VLtDoctorInfo>();
+
+        /*查询昨天调整或新增的数据
+        queryWrapper.eq("CREATE_TIME", DateUtil.formatDate(new Date()))
+                .or()
+                .eq("UPDATE_TIME", DateUtil.formatDate(new Date()));
+        */
+        List<VLtDoctorInfo> list=this.getBaseMapper().selectList(queryWrapper);
+        if(ListUtil.isNotEmpty(list)){
+            //获取所有的key值
+            Set<String> keys= redisUtil.getKeyList(DOCTORS);
+            //先删除以往缓存数据
+            redisUtil.delete(keys);
+
+            //将新获取的数据进行存储
+            List<BasDoctorInfo> doctorList= BeanUtil.listCopyTo(list,BasDoctorInfo.class);
+            Boolean flag=redisUtil.setIfAbsent(DOCTORS, JSON.toJSONString(doctorList));
+        }
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtHomeDiagnoseInfoFacade.java

@@ -0,0 +1,104 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.entity.his.HisHomeDiagnoseInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.his.HisHomeDiagnoseInfoFacade;
+import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Slf4j
+public class VLtHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
+
+    @Autowired
+    private HisHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getHomeDiagnoseData(DataViewVO dataViewVO){
+        try{
+            if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+                return RespDTO.onError("病案首页ID为空！！");
+            }else if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+                return RespDTO.onError("初始医院ID为空！！");
+            }else if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("病历号为空！！");
+            }
+
+            List<HisHomeDiagnoseInfo> hisHomeDiagnoseList=hisHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+            if(ListUtil.isNotEmpty(hisHomeDiagnoseList)){
+                for (HisHomeDiagnoseInfo hisHomeDiagnose:hisHomeDiagnoseList) {
+                    HomeDiagnoseInfo vo=new HomeDiagnoseInfo();
+                    BeanUtils.copyProperties(hisHomeDiagnose,vo);
+
+                    HomeDiagnoseInfo homeDiagnoseInfo=this.getOne(queryWrapper(dataViewVO));
+                    //获取到对应数据，存到我方数据库中
+                    if(homeDiagnoseInfo!=null){
+                        //更新数据
+                        vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                        vo.setGmtModified(new Date());
+                        this.update(vo,updateWrapper(dataViewVO));
+                    }else{
+                        //新增数据
+                        vo.setGmtCreate(new Date());
+                        this.save(vo);
+                    }
+                }
+            }
+            return RespDTO.onSuc("操作成功！");
+        }catch (Exception e){
+            log.error("病案首页出院诊断操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("操作失败！");
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HomeDiagnoseInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            queryWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getDiagnoseOrderNo())){
+            queryWrapper.eq("diagnose_order_no", dataViewVO.getDiagnoseOrderNo());
+        }
+        return queryWrapper;
+    }
+
+    public UpdateWrapper updateWrapper(DataViewVO dataViewVO){
+        UpdateWrapper updateWrapper=new UpdateWrapper<HomeDiagnoseInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            updateWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getDiagnoseOrderNo())){
+            updateWrapper.eq("diagnose_order_no", dataViewVO.getDiagnoseOrderNo());
+        }
+        return updateWrapper;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtHomeOperationFacade.java

@@ -0,0 +1,96 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.entity.his.HisHomeOperationInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.his.HisHomeOperationInfoFacade;
+import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+@Slf4j
+public class VLtHomeOperationFacade extends HomeOperationInfoServiceImpl {
+    @Autowired
+    private HisHomeOperationInfoFacade hisHomeOperationInfoFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getHomeOperationData(DataViewVO dataViewVO){
+        try{
+            List<HisHomeOperationInfo> hisHomeOperationList=hisHomeOperationInfoFacade.getHomeOperationData(dataViewVO);
+            if(ListUtil.isNotEmpty(hisHomeOperationList)){
+                for (HisHomeOperationInfo hisHomeOperation:hisHomeOperationList) {
+                    HomeOperationInfo homeOperationInfo=this.getOne(queryWrapper(dataViewVO));
+                    HomeOperationInfo vo=new HomeOperationInfo();
+                    BeanUtils.copyProperties(hisHomeOperation,vo);
+                    //获取到对应数据，存到我方数据库中
+                    if(homeOperationInfo!=null){
+                        //更新数据
+                        vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                        vo.setGmtModified(new Date());
+                        this.update(vo,updateWrapper(dataViewVO));
+                    }else{
+                        //新增数据
+                        vo.setGmtCreate(new Date());
+                        this.save(vo);
+                    }
+                }
+                return RespDTO.onSuc("病案首页手术情况操作成功！");
+            }else{
+                return RespDTO.onSuc("病案首页手术情况操作取消，未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error("病案首页手术情况操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("病案首页手术情况操作失败！"+e.getMessage());
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HomeOperationInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            queryWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getOperationOrderNo())){
+            queryWrapper.eq("operation_order_no", dataViewVO.getOperationOrderNo());
+        }
+        return queryWrapper;
+    }
+
+    private UpdateWrapper updateWrapper(DataViewVO dataViewVO){
+        UpdateWrapper updateWrapper=new UpdateWrapper<HomeOperationInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            updateWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getOperationOrderNo())){
+            updateWrapper.eq("operation_order_no", dataViewVO.getOperationOrderNo());
+        }
+        return updateWrapper;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtHomePageFacade.java

@@ -0,0 +1,160 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.AnalyzeRunDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.HomePage;
+import com.diagbot.entity.his.HisHomePage;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.his.HisHomePageFacade;
+import com.diagbot.service.impl.HomePageServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.AnalyzeRunVO;
+import com.diagbot.vo.data.DataViewVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class VLtHomePageFacade extends HomePageServiceImpl {
+    @Autowired
+    private HisHomePageFacade hisHomePageFacade;
+    @Autowired
+    private VLtHomeDiagnoseInfoFacade vLtHomeDiagnoseInfoFacade;
+    @Autowired
+    private VLtHomeOperationFacade vLtHomeOperationFacade;
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getHomePageData(DataViewVO dataViewVO){
+        try{
+            if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("病案首页病历号为空！！");
+            }
+            HisHomePage hisHomePage=hisHomePageFacade.getHomePageData(dataViewVO);
+            if(hisHomePage!=null){
+                this.addHomePage(hisHomePage);
+                //病案首页关联出院诊断及手术
+                vLtHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+                vLtHomeOperationFacade.getHomeOperationData(dataViewVO);
+
+                return RespDTO.onSuc("病案首页操作成功！");
+                /*
+                //是否需要先评分，增加如下业务代码
+                this.analyzeRun(hisHomePage);
+                */
+            }else{
+                return RespDTO.onSuc("病案首页操作取消,未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error("病案首页操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("病案首页操作失败！");
+        }
+    }
+
+    public RespDTO analyzeRun(HisHomePage hisHomePage){
+        AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
+        analyzeRunVO.setBehospitalCode(hisHomePage.getBehospitalCode());
+        analyzeRunVO.setHospitalId(hisHomePage.getHospitalId());
+        analyzeRunVO.setModeId(6L);
+        AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+            map.put("analyze", analyzeRunDTO.getMsgDTOList());
+        }
+        return RespDTO.onSuc(map);
+    }
+
+    /**
+     * @Description:补录数据时调用
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getHomePageSupplement(DataViewVO dataViewVO){
+        try{
+            if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("病案首页病历号为空！！");
+            }
+            List<HisHomePage> list=hisHomePageFacade.getHomePageSupplement(dataViewVO);
+            if(ListUtil.isNotEmpty(list)){
+                list.stream().forEach(s->{
+                    this.addHomePage(s);
+                    //病案首页关联出院诊断及手术
+                    vLtHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+                    vLtHomeOperationFacade.getHomeOperationData(dataViewVO);
+                });
+            }
+            return RespDTO.onSuc("病案首页操作成功！");
+        }catch (Exception e){
+            log.error("病案首页操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("病案首页操作失败！");
+        }
+    }
+
+    public void addHomePage(HisHomePage hisHomePage){
+        HomePage vo=new HomePage();
+        BeanUtils.copyProperties(hisHomePage,vo);
+        HomePage homePage=this.getOne(queryWrapper(hisHomePage));
+        //获取到对应数据，存到我方数据库中
+        if(homePage!=null){
+            vo.setIsDeleted(IsDeleteEnum.N.getKey());
+            vo.setGmtModified(new Date());
+            //更新数据
+            UpdateWrapper updateWrapper=updateWrapper(hisHomePage);
+            this.update(vo,updateWrapper);
+        }else{
+            vo.setGmtCreate(new Date());
+            //新增数据
+            this.save(vo);
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(HisHomePage hisHomePage){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HomePage>();
+        if(StringUtil.isNotEmpty(hisHomePage.getHomePageId())){
+            queryWrapper.eq("home_page_id", hisHomePage.getHomePageId());
+        }
+        if(hisHomePage.getHospitalId()!=null && hisHomePage.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", hisHomePage.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisHomePage.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", hisHomePage.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    private UpdateWrapper updateWrapper(HisHomePage hisHomePage){
+        UpdateWrapper updateWrapper=new UpdateWrapper<HomePage>();
+        if(StringUtil.isNotEmpty(hisHomePage.getHomePageId())){
+            updateWrapper.eq("home_page_id", hisHomePage.getHomePageId());
+        }
+        if(hisHomePage.getHospitalId()!=null && hisHomePage.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", hisHomePage.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisHomePage.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", hisHomePage.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtMedicalRecordContentFacade.java

@@ -0,0 +1,65 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.MedicalRecordContent;
+import com.diagbot.entity.his.HisMedicalRecord;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
+import com.diagbot.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+@Slf4j
+public class VLtMedicalRecordContentFacade extends MedicalRecordContentServiceImpl {
+
+    public void addMrecordContent(HisMedicalRecord hisMedicalRecord){
+        try{
+            MedicalRecord vo=new MedicalRecord();
+            BeanUtils.copyProperties(hisMedicalRecord,vo);
+
+            MedicalRecordContent contentVo=new MedicalRecordContent();
+            BeanUtils.copyProperties(hisMedicalRecord,contentVo);
+            //判断我方数据是否有记录
+            MedicalRecordContent mRecordContent=this.getOne(queryWrapper(contentVo));
+            if(mRecordContent!=null){
+                contentVo.setGmtModified(new Date());
+                contentVo.setIsDeleted(IsDeleteEnum.N.getKey());
+                this.update(contentVo,updateWrapper(contentVo));
+            }else{
+                contentVo.setGmtCreate(new Date());
+                this.save(contentVo);
+            }
+        }catch (Exception e){
+            log.error("异步增加文书详情数据异常：：：："+e.getMessage(),new Throwable());
+        }
+    }
+
+    public QueryWrapper queryWrapper(MedicalRecordContent contentVo){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(contentVo.getRecId())){
+            queryWrapper.eq("rec_id", contentVo.getRecId());
+        }
+        if(contentVo.getHospitalId()!=null && contentVo.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", contentVo.getHospitalId());
+        }
+        return queryWrapper;
+    }
+
+    public UpdateWrapper updateWrapper(MedicalRecordContent contentVo){
+        UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecordContent>();
+        if(StringUtil.isNotEmpty(contentVo.getRecId())){
+            updateWrapper.eq("rec_id", contentVo.getRecId());
+        }
+        if(contentVo.getHospitalId()!=null && contentVo.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", contentVo.getHospitalId());
+        }
+        return updateWrapper;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtMedicalRecordFacade.java

@@ -0,0 +1,184 @@
+package com.lantone.data.facade.dataView;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.dto.AnalyzeRunDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.ModelHospital;
+import com.diagbot.entity.his.HisMedicalRecord;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.ModelHospitalFacade;
+import com.diagbot.facade.his.HisMedicalRecordFacade;
+import com.diagbot.service.impl.MedicalRecordServiceImpl;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.AnalyzeRunVO;
+import com.lantone.data.vo.DataViewVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Slf4j
+public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
+    @Autowired
+    private HisMedicalRecordFacade hisMedicalRecordFacade;
+
+    @Autowired
+    private ModelHospitalFacade modelHospitalFacade;
+
+    @Autowired
+    private VLtMedicalRecordContentFacade vLtMedicalRecordContentFacade;
+
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public RespDTO getMedicalRecordData(DataViewVO dataViewVO){
+        try{
+            if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
+                return RespDTO.onError("文书病历号为空！！");
+            }else if(StringUtil.isEmpty(dataViewVO.getRecId())){
+                return RespDTO.onError("文书病历序号为空！！");
+            }else if(dataViewVO.getHospitalId()==null || dataViewVO.getHospitalId()==0L){
+                return RespDTO.onError("初始医院ID为空！！");
+            }
+            HisMedicalRecord hisMedicalRecord=hisMedicalRecordFacade.getMedicalRecordData(dataViewVO);
+
+            if(hisMedicalRecord!=null){
+                this.addMrecord(hisMedicalRecord);
+                vLtMedicalRecordContentFacade.addMrecordContent(hisMedicalRecord);
+                return RespDTO.onSuc("病历文书操作成功！");
+                /*
+                //是否需要先评分，增加如下业务代码
+                this.analyzeRun(hisMedicalRecord);
+                */
+            }else{
+                return RespDTO.onSuc("病历文书操作取消,未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error("病历文书操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("病历文书操作失败！");
+        }
+    }
+
+    public RespDTO analyzeRun(HisMedicalRecord hisMedicalRecord){
+        Long initModeId=initModeId(hisMedicalRecord.getHospitalId(),hisMedicalRecord.getRecTypeId());
+        AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
+        analyzeRunVO.setBehospitalCode(hisMedicalRecord.getBehospitalCode());
+        analyzeRunVO.setHospitalId(hisMedicalRecord.getHospitalId());
+        analyzeRunVO.setModeId(initModeId);
+        AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+            map.put("analyze", analyzeRunDTO.getMsgDTOList());
+        }
+        return RespDTO.onSuc(map);
+    }
+
+    public RespDTO getMedicalRecordSupplement(DataViewVO dataViewVO){
+        try{
+            List<HisMedicalRecord> hisMedicalRecordList=hisMedicalRecordFacade.getMedicalRecordSupplement(dataViewVO);
+            if(ListUtil.isNotEmpty(hisMedicalRecordList)){
+                for (HisMedicalRecord hisMedicalRecord:hisMedicalRecordList) {
+                    this.addMrecord(hisMedicalRecord);
+                    vLtMedicalRecordContentFacade.addMrecordContent(hisMedicalRecord);
+                }
+                return RespDTO.onSuc("病历文书操作成功！");
+            }else{
+                return RespDTO.onSuc("病历文书操作取消,未获取到数据！");
+            }
+        }catch (Exception e){
+            log.error("病历文书操作失败！"+e.getMessage(),new Throwable());
+            return RespDTO.onError("病历文书操作失败！");
+        }
+    }
+
+    public QueryWrapper queryWrapper(HisMedicalRecord hisMedicalRecord){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
+            queryWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        }
+        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    public UpdateWrapper updateWrapper(HisMedicalRecord hisMedicalRecord){
+        UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
+            updateWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        }
+        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
+
+    public void addMrecord(HisMedicalRecord hisMedicalRecord){
+        try{
+            MedicalRecord medicalRecord=this.getOne(queryWrapper(hisMedicalRecord));
+            MedicalRecord vo=new MedicalRecord();
+            BeanUtils.copyProperties(hisMedicalRecord,vo);
+            //初始化mode_id
+            vo.setModeId(initModeId(hisMedicalRecord.getHospitalId(),hisMedicalRecord.getRecTypeId()));
+
+            //获取到对应数据，存到我方数据库中
+            if(medicalRecord!=null){
+                vo.setGmtModified(new Date());
+                vo.setIsDeleted(IsDeleteEnum.N.getKey());
+                //更新数据
+                this.update(vo,updateWrapper(hisMedicalRecord));
+            }else{
+                //新增数据
+                vo.setGmtCreate(new Date());
+                this.save(vo);
+            }
+        }catch (Exception e){
+            log.error("异步增加文书数据异常：：：："+e.getMessage(),new Throwable());
+        }
+    }
+
+    /**
+     * 初始化模型ID
+     *
+     * @param hospitalId
+     * @param recTypeId
+     * @return
+     */
+    public Long initModeId(Long hospitalId, String recTypeId) {
+        Long modeId = Long.valueOf("0");
+        QueryWrapper<ModelHospital> wrapper = new QueryWrapper<>();
+        wrapper.eq("hospital_id", hospitalId);
+        //wrapper.eq("hospital_model_name", recTitle);
+        wrapper.eq("remark", recTypeId);
+        ModelHospital mode = modelHospitalFacade.getOne(wrapper, false);
+        if (mode != null) {
+            modeId = mode.getStandModelId();
+        } else {
+            modeId = Long.valueOf("0");
+        }
+        modeId=11L;
+        return modeId;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/dataView/VLtRecordTypeFacade.java

@@ -0,0 +1,45 @@
+package com.lantone.data.facade.dataView;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.BasDeptInfo;
+import com.diagbot.entity.his.VLtRecordType;
+import com.diagbot.service.impl.his.VLtRecordTypeServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Set;
+
+@Component
+public class VLtRecordTypeFacade extends VLtRecordTypeServiceImpl {
+
+    @Autowired
+    RedisUtil redisUtil;
+
+    private static final String RECORD_TYPE = "recordTypes";
+
+    public void syncRecordType(){
+        QueryWrapper queryWrapper=new QueryWrapper<VLtRecordType>();
+
+        /*查询昨天调整或新增的数据
+        queryWrapper.eq("CREATE_TIME", DateUtil.formatDate(new Date()))
+                .or()
+                .eq("UPDATE_TIME", DateUtil.formatDate(new Date()));
+        */
+        List<VLtRecordType> list=this.getBaseMapper().selectList(queryWrapper);
+        if(ListUtil.isNotEmpty(list)){
+            //获取所有的key值
+            Set<String> keys= redisUtil.getKeyList(RECORD_TYPE);
+            //先删除以往缓存数据
+            redisUtil.delete(keys);
+
+            //将新获取的数据进行存储
+            List<BasDeptInfo> deptList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+            Boolean flag=redisUtil.setIfAbsent(RECORD_TYPE, JSON.toJSONString(deptList));
+        }
+    }
+}

data-service/src/main/java/com/lantone/data/facade/his/HisBehospitalInfoFacade.java

@@ -1,71 +1,50 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.his.HisBehospitalInfo;
 import com.diagbot.service.impl.his.HisBehospitalInfoServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.diagbot.vo.data.HisDataImportVO;
-import com.google.common.collect.Lists;
-import io.github.lvyahui8.spring.facade.DataFacade;
+import com.diagbot.vo.data.DataViewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Component
 @Slf4j
 public class HisBehospitalInfoFacade extends HisBehospitalInfoServiceImpl {
 
-    public List<HisBehospitalInfo> getHisBeHospitalInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
-        List<HisBehospitalInfo> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            HisBehospitalInfo hisBehospitalInfo = this.baseMapper.selectOne(new QueryWrapper<HisBehospitalInfo>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisBehospitalInfo != null) {
-                list.add(hisBehospitalInfo);
-            }
-        });
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public List<HisBehospitalInfo> getBehospitalInfoData(DataViewVO dataViewVO){
+        QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
+        List<HisBehospitalInfo> list=this.baseMapper.selectList(hisQueryWrapper);
         return list;
     }
 
-    /*
-     * @Description:拉取指定病历号，或指定出院时间段内的病历号的所有病历号用户导入历史数据
+    /**
+     * @Description:拼接查询条件
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public void getPatientRecord(HisDataImportVO hisDataImportVO){
-        try {
-            QueryWrapper queryWrapper=new QueryWrapper<HisBehospitalInfo>();
-            if(hisDataImportVO.getHospitalId()!=null && hisDataImportVO.getHospitalId()!=0L){
-                queryWrapper.eq("hospital_id", hisDataImportVO.getHospitalId());
-            }
-            if(StringUtil.isNotEmpty(hisDataImportVO.getBehospitalCode())){
-                queryWrapper.eq("behospital_code", hisDataImportVO.getBehospitalCode());
-            }
-            if(StringUtil.isNotEmpty(hisDataImportVO.getStartDate()) && StringUtil.isNotEmpty(hisDataImportVO.getEndDate())){
-                queryWrapper.gt("LEAVE_HOSPITAL_DATE",hisDataImportVO.getStartDate());
-                queryWrapper.lt("LEAVE_HOSPITAL_DATE",hisDataImportVO.getEndDate());
-            }
-            List<HisBehospitalInfo> list=this.baseMapper.selectList(queryWrapper);
-            if(list.size()>0){
-                List<ABehospitalInfoVO> aList=Lists.newLinkedList();
-                list.stream().forEach(s->{
-                    ABehospitalInfoVO aBehospitalInfoVO=new ABehospitalInfoVO();
-                    aBehospitalInfoVO.setBehospitalCode(s.getBehospitalCode());
-                    aList.add(aBehospitalInfoVO);
-                });
-                Map<String, Object> invokeParams = new HashMap<>();
-                invokeParams.put("aBehospitalInfoVO", list);
-                DataFacade.get("dataSupplement", invokeParams, RespDTO.class);
-            }
-        } catch (Exception e) {
-            log.error("导入历史数据异常==========",e.getMessage());
-            e.printStackTrace();
+    public QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接his查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HisBehospitalInfo>();
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("HOSPITAL_ID", Long.hashCode(dataViewVO.getHospitalId()));
         }
+        if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+            queryWrapper.eq("BEHOSPITAL_CODE", dataViewVO.getBehospitalCode());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getStartDate()) && StringUtil.isNotEmpty(dataViewVO.getEndDate())){
+            queryWrapper.gt("LEAVE_HOSPITAL_DATE", DateUtil.parseDate(dataViewVO.getStartDate()));
+            queryWrapper.lt("LEAVE_HOSPITAL_DATE",DateUtil.parseDate(dataViewVO.getEndDate()));
+        }
+        return queryWrapper;
     }
+
 }

data-service/src/main/java/com/lantone/data/facade/his/HisDoctorAdviceFacade.java

@@ -3,8 +3,8 @@ package com.lantone.data.facade.his;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.his.HisDoctorAdvice;
 import com.diagbot.service.impl.his.HisDoctorAdviceServiceImpl;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -12,17 +12,40 @@ import java.util.List;
 @Component
 public class HisDoctorAdviceFacade extends HisDoctorAdviceServiceImpl {
 
-    public List<List<HisDoctorAdvice>> getHisDoctorAdviceData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public List<HisDoctorAdvice> getDoctorAdviceData(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
+            List<HisDoctorAdvice> list=this.baseMapper.selectList(hisQueryWrapper);
+            return list;
+        }catch (Exception e){
+            log.error(e.getMessage());
+            return null;
+        }
+    }
 
-        List<List<HisDoctorAdvice>> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            List<HisDoctorAdvice> hisDoctorAdvice = this.baseMapper.selectList(new QueryWrapper<HisDoctorAdvice>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisDoctorAdvice != null && hisDoctorAdvice.size() > 0) {
-                list.add(hisDoctorAdvice);
-            }
-        });
-        return list;
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接HIS查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HisDoctorAdvice>();
+        if(StringUtil.isNotEmpty(dataViewVO.getDoctorAdviceId())){
+            queryWrapper.eq("DOCTOR_ADVICE_ID", dataViewVO.getDoctorAdviceId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("HOSPITAL_ID", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+            queryWrapper.eq("BEHOSPITAL_CODE", dataViewVO.getBehospitalCode());
+        }
+        return queryWrapper;
     }
+
 }

data-service/src/main/java/com/lantone/data/facade/his/HisHomeDiagnoseInfoFacade.java

@@ -1,10 +1,12 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.entity.his.HisHomeDiagnoseInfo;
 import com.diagbot.service.impl.his.HisHomeDiagnoseInfoServiceImpl;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -12,17 +14,50 @@ import java.util.List;
 @Component
 public class HisHomeDiagnoseInfoFacade extends HisHomeDiagnoseInfoServiceImpl {
 
-    public List<List<HisHomeDiagnoseInfo>> getHisHomeDiagnoseInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public List<HisHomeDiagnoseInfo> getHomeDiagnoseData(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
+            List<HisHomeDiagnoseInfo> hisHomeDiagnoseList=this.baseMapper.selectList(hisQueryWrapper);
+            return hisHomeDiagnoseList;
+        }catch (Exception e){
+            log.error(e.getMessage(),new Throwable());
+            return null;
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接HIS查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HisHomeDiagnoseInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("HOSPITAL_ID", dataViewVO.getHospitalId());
+        }
+        return queryWrapper;
+    }
 
-        List<List<HisHomeDiagnoseInfo>> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            List<HisHomeDiagnoseInfo> hisHomeDiagnoseInfo = this.baseMapper.selectList(new QueryWrapper<HisHomeDiagnoseInfo>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisHomeDiagnoseInfo != null && hisHomeDiagnoseInfo.size() > 0) {
-                list.add(hisHomeDiagnoseInfo);
-            }
-        });
-        return list;
+    private UpdateWrapper updateWrapper(DataViewVO dataViewVO){
+        UpdateWrapper updateWrapper=new UpdateWrapper<HomeDiagnoseInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            updateWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getDiagnoseOrderNo())){
+            updateWrapper.eq("diagnose_order_no", dataViewVO.getDiagnoseOrderNo());
+        }
+        return updateWrapper;
     }
 }

data-service/src/main/java/com/lantone/data/facade/his/HisHomeOperationInfoFacade.java

@@ -2,9 +2,11 @@ package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.his.HisHomeOperationInfo;
+import com.diagbot.facade.HomeOperationInfoFacade;
 import com.diagbot.service.impl.his.HisHomeOperationInfoServiceImpl;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -12,17 +14,40 @@ import java.util.List;
 @Component
 public class HisHomeOperationInfoFacade extends HisHomeOperationInfoServiceImpl {
 
-    public List<List<HisHomeOperationInfo>> getHisHomeOperationInfoData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+    @Autowired
+    private HomeOperationInfoFacade homeOperationInfoFacade;
 
-        List<List<HisHomeOperationInfo>> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            List<HisHomeOperationInfo> hisHomeOperationInfo = this.baseMapper.selectList(new QueryWrapper<HisHomeOperationInfo>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisHomeOperationInfo != null && hisHomeOperationInfo.size() > 0) {
-                list.add(hisHomeOperationInfo);
-            }
-        });
-        return list;
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public List<HisHomeOperationInfo> getHomeOperationData(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
+            List<HisHomeOperationInfo> hisHomeOperationList=this.baseMapper.selectList(hisQueryWrapper);
+            return hisHomeOperationList;
+        }catch (Exception e){
+            log.error("病案首页手术情况操作失败！"+e.getMessage(),new Throwable());
+            return null;
+        }
     }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DataViewVO dataViewVO){
+        //拼接HIS查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HisHomeOperationInfo>();
+        if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+            queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("HOSPITAL_ID", dataViewVO.getHospitalId());
+        }
+        return queryWrapper;
+    }
+
 }

data-service/src/main/java/com/lantone/data/facade/his/HisHomePageFacade.java

@@ -1,10 +1,11 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.HomePage;
 import com.diagbot.entity.his.HisHomePage;
 import com.diagbot.service.impl.his.HisHomePageServiceImpl;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -12,16 +13,66 @@ import java.util.List;
 @Component
 public class HisHomePageFacade extends HisHomePageServiceImpl {
 
-    public List<HisHomePage> getHomePageData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
-        List<HisHomePage> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            HisHomePage hisHomePage = this.baseMapper.selectOne(new QueryWrapper<HisHomePage>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisHomePage != null) {
-                list.add(hisHomePage);
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public HisHomePage getHomePageData(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO,0L);
+            HisHomePage hisHomePage=this.getOne(hisQueryWrapper);
+            return hisHomePage;
+        }catch (Exception e){
+            log.error(e.getMessage(),new Throwable());
+            return null;
+        }
+    }
+
+    public List<HisHomePage> getHomePageSupplement(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO,0L);
+            List<HisHomePage> list=this.baseMapper.selectList(hisQueryWrapper);
+            return list;
+        }catch (Exception e){
+            log.error(e.getMessage(),new Throwable());
+            return null;
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryWrapper(DataViewVO dataViewVO,long type){
+        if(type==0L){
+            //拼接HIS查询条件
+            QueryWrapper queryWrapper=new QueryWrapper<HisHomePage>();
+            if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+                queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
+            }
+            if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+                queryWrapper.eq("HOSPITAL_ID", dataViewVO.getHospitalId());
+            }
+            if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+                queryWrapper.eq("BEHOSPITAL_CODE", dataViewVO.getBehospitalCode());
+            }
+            return queryWrapper;
+        }else if(type==1L){
+            //拼接朗通查询条件
+            QueryWrapper queryWrapper=new QueryWrapper<HomePage>();
+            if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
+                queryWrapper.eq("home_page_id", dataViewVO.getHomePageId());
+            }
+            if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+                queryWrapper.eq("hospital_id", dataViewVO.getHospitalId());
+            }
+            if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+                queryWrapper.eq("behospital_code", dataViewVO.getBehospitalCode());
             }
-        });
-        return list;
+            return queryWrapper;
+        }
+        return null;
     }
 }

data-service/src/main/java/com/lantone/data/facade/his/HisMedicalRecordContentFacade.java

@@ -1,8 +1,12 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.his.HisMedicalRecord;
 import com.diagbot.entity.his.HisMedicalRecordContent;
 import com.diagbot.service.impl.his.HisMedicalRecordContentServiceImpl;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ABehospitalInfoVO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
@@ -23,4 +27,33 @@ public class HisMedicalRecordContentFacade extends HisMedicalRecordContentServic
         });
         return list;
     }
+
+    public QueryWrapper queryWrapper(HisMedicalRecord hisMedicalRecord, long type){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
+            queryWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        }
+        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    public UpdateWrapper updateWrapper(HisMedicalRecord hisMedicalRecord){
+        UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
+            updateWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        }
+        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
 }

data-service/src/main/java/com/lantone/data/facade/his/HisMedicalRecordFacade.java

@@ -3,24 +3,64 @@ package com.lantone.data.facade.his;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.entity.his.HisMedicalRecord;
 import com.diagbot.service.impl.his.HisMedicalRecordServiceImpl;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.google.common.collect.Lists;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.data.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 @Component
 public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
-    public List<List<HisMedicalRecord>> getHisMedicalRecordData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
-        List<List<HisMedicalRecord>> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
-            List<HisMedicalRecord> hisMedicalRecord = this.baseMapper.selectList(new QueryWrapper<HisMedicalRecord>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisMedicalRecord != null) {
-                list.add(hisMedicalRecord);
-            }
-        });
-        return list;
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public HisMedicalRecord getMedicalRecordData(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryHisWrapper(dataViewVO);
+            HisMedicalRecord hisMedicalRecord=this.getOne(hisQueryWrapper);
+            return hisMedicalRecord;
+        }catch (Exception e){
+            log.error(e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    public List<HisMedicalRecord> getMedicalRecordSupplement(DataViewVO dataViewVO){
+        try{
+            QueryWrapper hisQueryWrapper=queryHisWrapper(dataViewVO);
+            List<HisMedicalRecord> hisMedicalRecordList=this.baseMapper.selectList(hisQueryWrapper);
+            return hisMedicalRecordList;
+        }catch (Exception e){
+            log.error(e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * @Description:拼接查询条件
+     * @Author:liuqq
+     * @time: ${DATE} ${TIME}
+     **/
+    private QueryWrapper queryHisWrapper(DataViewVO dataViewVO){
+        //拼接HIS查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<HisMedicalRecord>();
+        if(StringUtil.isNotEmpty(dataViewVO.getRecId())){
+            queryWrapper.eq("REC_ID", dataViewVO.getRecId());
+        }
+        if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
+            queryWrapper.eq("HOSPITAL_ID", dataViewVO.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(dataViewVO.getBehospitalCode())){
+            queryWrapper.eq("BEHOSPITAL_CODE", dataViewVO.getBehospitalCode());
+        }
+        return queryWrapper;
     }
 }

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrAdmissionNoteMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrAdmissionNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrBloodResultMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrBloodResult;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrBloodResult;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrBloodTransfusionMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrBloodTransfusion;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrBloodTransfusion;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrConsultationApplyMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrConsultationApply;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationApply;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrConsultationNoteMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrConsultationNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrConsultationRecordMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrConsultationRecord;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationRecord;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrCrisisNoteMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrCrisisNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrCrisisNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrDeathDiscussionMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrDeathDiscussion;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDeathDiscussion;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrDeathNoteMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrDeathNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDeathNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrDifficultCaseMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrDifficultCase;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDifficultCase;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrFirstRecordMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrFirstRecord;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrFirstRecord;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrIllCriticallyMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrIllCritically;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrIllCritically;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrIllSeriouslMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrIllSeriousl;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrIllSeriousl;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrInformedConsentMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrInformedConsent;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrInformedConsent;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrLeaveHospitalMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrLeaveHospital;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrLeaveHospital;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrOperativeFirstRecordMapper.java

@@ -1,8 +1,8 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrOperativeFirstRecord;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrOperativeFirstRecord;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/his/HisBehospitalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper.his;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.his.HisBehospitalInfo;
+
+/**
+ * <p>
+ * 住院病历信息 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HisBehospitalInfoMapper extends BaseMapper<HisBehospitalInfo> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/his/HisDoctorAdviceMapper.java

@@ -0,0 +1,15 @@
+package com.lantone.data.mapper.his;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.his.HisDoctorAdvice;
+
+/**
+ * <p>
+ * 病人医嘱 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HisDoctorAdviceMapper extends BaseMapper<HisDoctorAdvice> {
+}

data-service/src/main/java/com/lantone/data/mapper/his/HisHomeDiagnoseInfoMapper.java

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

data-service/src/main/java/com/lantone/data/mapper/his/HisHomeOperationInfoMapper.java

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

data-service/src/main/java/com/lantone/data/mapper/his/HisHomePageMapper.java

@@ -0,0 +1,14 @@
+package com.lantone.data.mapper.his;
+
+import com.lantone.data.entity.his.HisHomePage;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HisHomePageMapper extends BaseMapper<HisHomePage> {
+}

data-service/src/main/java/com/lantone/data/mapper/his/HisMedicalRecordContentMapper.java

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

data-service/src/main/java/com/lantone/data/mapper/his/HisMedicalRecordMapper.java

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

data-service/src/main/java/com/lantone/data/mapper/his/VLtDeptInfoMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper.his;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.his.VLtDeptInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtDeptInfoMapper extends BaseMapper<VLtDeptInfo> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/his/VLtDoctorInfoMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper.his;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.his.VLtDoctorInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtDoctorInfoMapper extends BaseMapper<VLtDoctorInfo> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/his/VLtRecordTypeMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper.his;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.his.VLtRecordType;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtRecordTypeMapper extends BaseMapper<VLtRecordType> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrAdmissionNoteService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.StrAdmissionNote;
+
+/**
+ * <p>
+ * 入院记录 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-22
+ */
+public interface StrAdmissionNoteService extends IService<StrAdmissionNote> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrBloodResultService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.StrBloodResult;
+
+/**
+ * <p>
+ * 输血效果评价 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-22
+ */
+public interface StrBloodResultService extends IService<StrBloodResult> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrBloodTransfusionService.java

@@ -0,0 +1,15 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 输血记录 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-22
+ */
+public interface StrBloodTransfusionService extends IService<StrBloodTransfusion> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrConsultationApplyService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.StrConsultationApply;
+
+/**
+ * <p>
+ * 会诊申请单 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-22
+ */
+public interface StrConsultationApplyService extends IService<StrConsultationApply> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrConsultationNoteService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.StrConsultationNote;
+
+/**
+ * <p>
+ * 会诊单（申请和结果） 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-22
+ */
+public interface StrConsultationNoteService extends IService<StrConsultationNote> {
+
+}

data-service/src/main/java/com/lantone/data/service/dataStr/StrConsultationRecordService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.dataStr;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.StrConsultationRecord;
+
+/**
+ * <p>
+ * 会诊记录 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-11-13
+ */
+public interface StrConsultationRecordService extends IService<StrConsultationRecord> {
+
+}