业务对接接口梳理

data-service/pom.xml

@@ -17,6 +17,7 @@
         <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>
+        <aggregator.version>1.1.3</aggregator.version>
     </properties>
 
     <dependencies>
@@ -48,6 +49,20 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -68,6 +83,14 @@
         </dependency>
         <!-- mybatis-plus end -->
 
+        <!--多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
+
         <!-- springboot整合mybatis（核心就这一个） -->
         <!-- 注意顺序，这个一定要放在最下面 -->
         <dependency>
@@ -82,6 +105,18 @@
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>${druid.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.github.lvyahui8</groupId>
+            <artifactId>spring-boot-data-aggregator-starter</artifactId>
+            <version>${aggregator.version}</version>
+        </dependency>
+
+        <!--消息中心-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -94,22 +129,6 @@
             <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/core/KeyedNamed.java

@@ -0,0 +1,18 @@
+package com.lantone.data.core;
+
+/**
+ * @Description: 状态和名字基础接口
+ * @author: gaodm
+ * @time: 2018/9/3 16:13
+ */
+public interface KeyedNamed {
+    /**
+     * 状态值
+     */
+    int getKey();
+
+    /**
+     * 状态描述
+     */
+    String getName();
+}

data-service/src/main/java/com/lantone/data/core/KeyedString.java

@@ -0,0 +1,7 @@
+package com.lantone.data.core;
+
+public interface KeyedString {
+    String getKey();
+
+    String getName();
+}

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

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

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

@@ -0,0 +1,223 @@
+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-12
+ */
+public class BasHospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院名称
+     */
+    private String name;
+
+    /**
+     * 组织机构代码
+     */
+    private String code;
+
+    /**
+     * 医院名称拼音
+     */
+    private String spell;
+
+    /**
+     * 医院地址
+     */
+    private String address;
+
+    /**
+     * 状态：0.禁用1.启用
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 是否对接（0-不对接，1-对接）
+     */
+    private Integer connect;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Integer connect) {
+        this.connect = connect;
+    }
+
+    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;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "BasHospitalInfo{" +
+                "id=" + id +
+                ", name=" + name +
+                ", code=" + code +
+                ", spell=" + spell +
+                ", address=" + address +
+                ", status=" + status +
+                ", orderNo=" + orderNo +
+                ", connect=" + connect +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", remark=" + remark +
+                "}";
+    }
+}

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

@@ -0,0 +1,487 @@
+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_behospital_info")
+@Data
+public class BehospitalInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    @TableId(value = "behospital_code", type = IdType.INPUT)
+    private String behospitalCode;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别（男，女）
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 质控类型
+     */
+    private Long qcTypeId;
+
+    /**
+     * 病区编码
+     */
+    private String wardCode;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /**
+     * 住院科室ID
+     */
+    private String behDeptId;
+
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 床位号
+     */
+    private String bedCode;
+
+    /**
+     * 床位名称
+     */
+    private String bedName;
+
+    /**
+     * 医保类别
+     */
+    private String insuranceName;
+
+    /**
+     * 职业
+     */
+    private String jobType;
+
+    /**
+     * 入院时间
+     */
+    private Date behospitalDate;
+
+    /**
+     * 出院时间
+     */
+    private Date leaveHospitalDate;
+
+    /**
+     * 转入时间
+     */
+    private Date transInTime;
+
+    /**
+     * 转出时间
+     */
+    private Date transOutTime;
+
+    /**
+     * 疾病ICD编码
+     */
+    private String diagnoseIcd;
+
+    /**
+     * 疾病名称
+     */
+    private String diagnose;
+
+    /**
+     * 住院医生ID
+     */
+    private String behDoctorId;
+
+    /**
+     * 住院医生姓名
+     */
+    private String behDoctorName;
+
+    /**
+     * 主治医生ID
+     */
+    private String doctorId;
+
+    /**
+     * 主治医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 主任医生ID
+     */
+    private String directorDoctorId;
+
+    /**
+     * 主任医生姓名
+     */
+    private String directorDoctorName;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile;
+
+    /**
+     * 归档时间
+     */
+    private Date placefileDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    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 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 Long getQcTypeId() {
+        return qcTypeId;
+    }
+
+    public void setQcTypeId(Long qcTypeId) {
+        this.qcTypeId = qcTypeId;
+    }
+
+    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 getDiagnose() {
+        return diagnose;
+    }
+
+    public void setDiagnose(String diagnose) {
+        this.diagnose = diagnose;
+    }
+
+    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 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 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 getIsPlacefile() {
+        return isPlacefile;
+    }
+
+    public void setIsPlacefile(String isPlacefile) {
+        this.isPlacefile = isPlacefile;
+    }
+
+    public Date getPlacefileDate() {
+        return placefileDate;
+    }
+
+    public void setPlacefileDate(Date placefileDate) {
+        this.placefileDate = placefileDate;
+    }
+
+    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 "MedBehospitalInfo{" +
+                "behospitalCode=" + behospitalCode +
+                ", hospitalId=" + hospitalId +
+                ", name=" + name +
+                ", sex=" + sex +
+                ", birthday=" + birthday +
+                ", fileCode=" + fileCode +
+                ", qcTypeId=" + qcTypeId +
+                ", wardCode=" + wardCode +
+                ", wardName=" + wardName +
+                ", behDeptId=" + behDeptId +
+                ", behDeptName=" + behDeptName +
+                ", bedCode=" + bedCode +
+                ", bedName=" + bedName +
+                ", insuranceName=" + insuranceName +
+                ", jobType=" + jobType +
+                ", behospitalDate=" + behospitalDate +
+                ", leaveHospitalDate=" + leaveHospitalDate +
+                ", diagnoseIcd=" + diagnoseIcd +
+                ", diagnose=" + diagnose +
+                ", behDoctorId=" + behDoctorId +
+                ", behDoctorName=" + behDoctorName +
+                ", doctorId=" + doctorId +
+                ", doctorName=" + doctorName +
+                ", directorDoctorId=" + directorDoctorId +
+                ", directorDoctorName=" + directorDoctorName +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

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

@@ -0,0 +1,307 @@
+package com.lantone.data.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 危急值信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-06-02
+ */
+public class MedCrisisInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 记录类型
+     */
+    private String recType;
+
+    /**
+     * 危急值ID
+     */
+    private String crisisId;
+
+    /**
+     * 危急值名称
+     */
+    private String crisisName;
+
+    /**
+     * 开单科室ID
+     */
+    private String deptId;
+
+    /**
+     * 开单科室名称
+     */
+    private String deptName;
+
+    /**
+     * 开单医生ID
+     */
+    private String doctorId;
+
+    /**
+     * 开单医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 危急结果值
+     */
+    private String crisisValue;
+
+    /**
+     * 危急值描述
+     */
+    private String crisisDesc;
+
+    /**
+     * 危急值状态
+     */
+    private String crisisStatus;
+
+    /**
+     * 参考上限
+     */
+    private String crisisTopValue;
+
+    /**
+     * 参考下限
+     */
+    private String crisisLowerValue;
+
+    /**
+     * 送检时间
+     */
+    private Date sendDate;
+
+    /**
+     * 报告时间
+     */
+    private Date repDate;
+
+    /**
+     * 是否删除,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 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 getRecType() {
+        return recType;
+    }
+
+    public void setRecType(String recType) {
+        this.recType = recType;
+    }
+    public String getCrisisId() {
+        return crisisId;
+    }
+
+    public void setCrisisId(String crisisId) {
+        this.crisisId = crisisId;
+    }
+    public String getCrisisName() {
+        return crisisName;
+    }
+
+    public void setCrisisName(String crisisName) {
+        this.crisisName = crisisName;
+    }
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String 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 getCrisisValue() {
+        return crisisValue;
+    }
+
+    public void setCrisisValue(String crisisValue) {
+        this.crisisValue = crisisValue;
+    }
+    public String getCrisisDesc() {
+        return crisisDesc;
+    }
+
+    public void setCrisisDesc(String crisisDesc) {
+        this.crisisDesc = crisisDesc;
+    }
+    public String getCrisisStatus() {
+        return crisisStatus;
+    }
+
+    public void setCrisisStatus(String crisisStatus) {
+        this.crisisStatus = crisisStatus;
+    }
+    public String getCrisisTopValue() {
+        return crisisTopValue;
+    }
+
+    public void setCrisisTopValue(String crisisTopValue) {
+        this.crisisTopValue = crisisTopValue;
+    }
+    public String getCrisisLowerValue() {
+        return crisisLowerValue;
+    }
+
+    public void setCrisisLowerValue(String crisisLowerValue) {
+        this.crisisLowerValue = crisisLowerValue;
+    }
+    public Date getSendDate() {
+        return sendDate;
+    }
+
+    public void setSendDate(Date sendDate) {
+        this.sendDate = sendDate;
+    }
+    public Date getRepDate() {
+        return repDate;
+    }
+
+    public void setRepDate(Date repDate) {
+        this.repDate = repDate;
+    }
+    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 "MedCrisisInfo{" +
+            "recId=" + recId +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", recType=" + recType +
+            ", crisisId=" + crisisId +
+            ", crisisName=" + crisisName +
+            ", deptId=" + deptId +
+            ", deptName=" + deptName +
+            ", doctorId=" + doctorId +
+            ", doctorName=" + doctorName +
+            ", crisisValue=" + crisisValue +
+            ", crisisDesc=" + crisisDesc +
+            ", crisisStatus=" + crisisStatus +
+            ", crisisTopValue=" + crisisTopValue +
+            ", crisisLowerValue=" + crisisLowerValue +
+            ", sendDate=" + sendDate +
+            ", repDate=" + repDate +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

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

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

@@ -0,0 +1,245 @@
+package com.lantone.data.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-04
+ */
+public class MedLisResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告代码
+     */
+    private String itemCode;
+
+    /**
+     * 报告名称
+     */
+    private String itemName;
+
+    /**
+     * 检验结果
+     */
+    private String result;
+
+    /**
+     * 参考值
+     */
+    private String reference;
+
+    /**
+     * 最小参考值
+     */
+    private String referenceMin;
+
+    /**
+     * 最大参考值
+     */
+    private String referenceMax;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 异常标志
+     */
+    private String abnormal;
+
+    /**
+     * 异常颜色
+     */
+    private String color;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    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 getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
+    public String getReferenceMin() {
+        return referenceMin;
+    }
+
+    public void setReferenceMin(String referenceMin) {
+        this.referenceMin = referenceMin;
+    }
+    public String getReferenceMax() {
+        return referenceMax;
+    }
+
+    public void setReferenceMax(String referenceMax) {
+        this.referenceMax = referenceMax;
+    }
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+    public String getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(String abnormal) {
+        this.abnormal = abnormal;
+    }
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public 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 "MedLisResult{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", itemCode=" + itemCode +
+            ", itemName=" + itemName +
+            ", result=" + result +
+            ", reference=" + reference +
+            ", referenceMin=" + referenceMin +
+            ", referenceMax=" + referenceMax +
+            ", unit=" + unit +
+            ", abnormal=" + abnormal +
+            ", color=" + color +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

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

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

@@ -0,0 +1,258 @@
+package com.lantone.data.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-04
+ */
+public class MedPacsResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 报告单号
+     */
+    private String repNo;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 住院病人ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 报告名称
+     */
+    private String reptName;
+
+    /**
+     * 检查部位
+     */
+    private String part;
+
+    /**
+     * 检查所见
+     */
+    private String clinicSight;
+
+    /**
+     * 检查结果诊断
+     */
+    private String reptDiag;
+
+    /**
+     * 观察记录
+     */
+    private String remark;
+
+    /**
+     * 临床诊断
+     */
+    private String clinicDiag;
+
+    /**
+     * 申请医生
+     */
+    private String applyDoctor;
+
+    /**
+     * 审核医生
+     */
+    private String checkerDoctor;
+
+    /**
+     * 报告医生
+     */
+    private String reportDoctor;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getRepNo() {
+        return repNo;
+    }
+
+    public void setRepNo(String repNo) {
+        this.repNo = repNo;
+    }
+    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 getReptName() {
+        return reptName;
+    }
+
+    public void setReptName(String reptName) {
+        this.reptName = reptName;
+    }
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+    public String getClinicSight() {
+        return clinicSight;
+    }
+
+    public void setClinicSight(String clinicSight) {
+        this.clinicSight = clinicSight;
+    }
+    public String getReptDiag() {
+        return reptDiag;
+    }
+
+    public void setReptDiag(String reptDiag) {
+        this.reptDiag = reptDiag;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getClinicDiag() {
+        return clinicDiag;
+    }
+
+    public void setClinicDiag(String clinicDiag) {
+        this.clinicDiag = clinicDiag;
+    }
+    public String getApplyDoctor() {
+        return applyDoctor;
+    }
+
+    public void setApplyDoctor(String applyDoctor) {
+        this.applyDoctor = applyDoctor;
+    }
+    public String getCheckerDoctor() {
+        return checkerDoctor;
+    }
+
+    public void setCheckerDoctor(String checkerDoctor) {
+        this.checkerDoctor = checkerDoctor;
+    }
+    public String getReportDoctor() {
+        return reportDoctor;
+    }
+
+    public void setReportDoctor(String reportDoctor) {
+        this.reportDoctor = reportDoctor;
+    }
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public 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 "MedPacsResult{" +
+            "repNo=" + repNo +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", reptName=" + reptName +
+            ", part=" + part +
+            ", clinicSight=" + clinicSight +
+            ", reptDiag=" + reptDiag +
+            ", remark=" + remark +
+            ", clinicDiag=" + clinicDiag +
+            ", applyDoctor=" + applyDoctor +
+            ", checkerDoctor=" + checkerDoctor +
+            ", reportDoctor=" + reportDoctor +
+            ", deptName=" + deptName +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,193 @@
+package com.lantone.data.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-21
+ */
+@Data
+public class MedRecordType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类别ID
+     */
+    private String typeId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 类别名称
+     */
+    private String typeName;
+
+    /**
+     * 上级类别
+     */
+    private String parentTypeId;
+
+    /**
+     * 服务对象(全院、科室、个人)
+     */
+    private String objName;
+
+    /**
+     * 拼音
+     */
+    private String spell;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    private String remark;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+    public String getSpell() {
+        return spell;
+    }
+
+    public void setSpell(String spell) {
+        this.spell = spell;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    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 "MedRecordType{" +
+            "typeId=" + typeId +
+            ", hospitalId=" + hospitalId +
+            ", typeName=" + typeName +
+            ", parentTypeId=" + parentTypeId +
+            ", objName=" + objName +
+            ", spell=" + spell +
+            ", content=" + content +
+            ", remark=" + remark +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+        "}";
+    }
+}

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

@@ -0,0 +1,93 @@
+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_medical_record")
+@Data
+public class MedicalRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "rec_id",type = IdType.INPUT)
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 组织机构代码
+     */
+    private String orgCode;
+
+    /**
+     * 病历类别编号
+     */
+    private String recTypeId;
+
+    /**
+     * 模块id
+     */
+    private Long modeId;
+
+    /**
+     * 病历日期
+     */
+    private Date recDate;
+
+    /**
+     * 病历标题
+     */
+    private String recTitle;
+
+    /**
+     * 模板处理状态(0:未处理，1：已处理)
+     */
+    private Integer status;
+
+    /**
+     * 是否删除,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/MedicalRecordContent.java

@@ -0,0 +1,82 @@
+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.sql.Blob;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@TableName("med_medical_record_content")
+@Data
+public class MedicalRecordContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病历ID
+     */
+    @TableId(value = "rec_id",type = IdType.INPUT)
+    private String recId;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 文书内容（blob）
+     */
+    private Blob contentBlob;
+
+    /**
+     * 病历文本（文本）
+     */
+    private String contentText;
+
+    /**
+     * html文本信息
+     */
+    private String htmlText;
+
+    /**
+     * xml文本信息
+     */
+    private String xmlText;
+
+    /**
+     * 是否删除,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/ModelHospital.java

@@ -0,0 +1,158 @@
+package com.lantone.data.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-05-15
+ */
+@TableName("qc_model_hospital")
+public class ModelHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long hospitalId;
+
+    private String hospitalModelName;
+
+    private Long standModelId;
+
+    private String standModelName;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getHospitalModelName() {
+        return hospitalModelName;
+    }
+
+    public void setHospitalModelName(String hospitalModelName) {
+        this.hospitalModelName = hospitalModelName;
+    }
+    public Long getStandModelId() {
+        return standModelId;
+    }
+
+    public void setStandModelId(Long standModelId) {
+        this.standModelId = standModelId;
+    }
+    public String getStandModelName() {
+        return standModelName;
+    }
+
+    public void setStandModelName(String standModelName) {
+        this.standModelName = standModelName;
+    }
+    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;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "ModelHospital{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", hospitalModelName=" + hospitalModelName +
+            ", standModelId=" + standModelId +
+            ", standModelName=" + standModelName +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,210 @@
+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-05-27
+ */
+public class QcType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 质控类型名称
+     */
+    private String name;
+
+    /**
+     * 默认模版是否开启(0-否 1-是)
+     */
+    private Integer defaultModule;
+
+    /**
+     * 父类质控id
+     */
+    private String parentTypeId;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 科室ID
+     */
+    private String behDeptId;
+
+    /**
+     * 科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public Integer getDefaultModule() {
+        return defaultModule;
+    }
+
+    public void setDefaultModule(Integer defaultModule) {
+        this.defaultModule = defaultModule;
+    }
+    public String getParentTypeId() {
+        return parentTypeId;
+    }
+
+    public void setParentTypeId(String parentTypeId) {
+        this.parentTypeId = parentTypeId;
+    }
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+    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 getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+
+    @Override
+    public String toString() {
+        return "QcType{" +
+                "id=" + id +
+                ", hospitalId=" + hospitalId +
+                ", name=" + name +
+                ", defaultModule=" + defaultModule +
+                ", parentTypeId=" + parentTypeId +
+                ", sex=" + sex +
+                ", behDeptId=" + behDeptId +
+                ", behDeptName=" + behDeptName +
+                ", remark=" + remark +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                "}";
+    }
+}

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

@@ -1,8 +1,5 @@
 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;
 

data-service/src/main/java/com/lantone/data/enums/CacheKeyEnum.java

@@ -0,0 +1,92 @@
+package com.lantone.data.enums;
+
+import com.lantone.data.core.KeyedString;
+import lombok.Setter;
+
+public enum CacheKeyEnum implements KeyedString {
+    BEHOSPITAL_INFO("入院记录", "strAdmissionNote"),
+    BLOOD_RESULT("输血后效果评价", "strBloodResult"),
+    BLOOD_TRANSFUSION("输血/血制品病程记录", "strBloodTransfusion"),
+    PERIOD_CONCLUSION("阶段小结", "strPeriodConclusion"),
+    FIRST_RECORD("首次病程录","strFirstRecord"),
+    TRANSFER_IN_NOTE("转入记录", "strTransferInNote"),
+    TRANSFER_OUT_NOTE("转出记录", "strTransferOutNote"),
+    ILL_CRITICALLY("病危通知书", "strIllCritically"),
+    ILL_SERIOUSL("病重通知书", "strIllSeriousl"),
+    DIFFICULT_CASE("疑难病例讨论记录", "strDifficultCase"),
+    DEATH_NOTE("死亡记录", "strDeathNote"),
+    DEATH_DISCUSSION("死亡病例讨论记录", "strDeathDiscussion"),
+    WARD_RECORD("查房记录", "strWardRecord"),
+    OPERATIVE_FIRST_RECORD("术后首次病程及谈话记录", "strOperativeFirstRecord"),
+    PREOPERATIVE_DISCUSSION("术前讨论、术前小结", "strPreoperativeDiscussion"),
+    OPERATIVE_NOTE("手术记录", "strOperativeNote"),
+    RESCUE_NOTE("抢救记录", "strRescueNote"),
+    CRISIS_NOTE("危急值记录", "strCrisisNote"),
+    LEAVE_HOSPITAL("出院小结", "strLeaveHospital"),
+    CONSULTATION_APPLY("会诊申请单", "strConsultationApply"),
+    CONSULTATION_RESULT("会诊结果单", "strConsultationResult"),
+    CONSULTATION_NOTE("会诊单", "strConsultationNote"),
+    CONSULTATION_RECORD("会诊记录","strConsultationRecord");
+    /*
+    FIRST_RECORD(2, "aStrFirstRecordFacade"),
+    HOME_PAGE(6, "病案首页"),
+            (8, "医嘱信息"),
+            (9, "交接班记录"),
+            (10, "输血/血制品病程记录"),
+            (12, "麻醉记录"),
+            (13, "麻醉知情同意书"),
+            (14, "麻醉术前访视记录"),
+            (15, "麻醉术后访视记录"),
+            (16, "手术知情同意书"),
+    (20, "手术风险评估表"),
+    (21, "手术安全核查表"),
+    DATA_MODEL(33, "专科交接单"),
+    DATA_MODEL(34, "转科记录"),
+    DATA_MODEL(35, "病理检验送检单"),
+    DATA_MODEL(36, "自定义病程记录"),
+    DATA_MODEL(37, "病程信息"),
+    DATA_MODEL(52, "授权知情同意书"),
+    DATA_MODEL(53, "知情同意书"),
+    DATA_MODEL(54, "谈话告知书"),
+    DATA_MODEL(56, "日常病程录"),
+    OTHER(55, "其他"),
+    PACS_INTO(57, "检查信息"),
+    LIS_INFO(58, "检验信息"),
+    LIS_INFO(59, "有创操作"),
+    */
+
+    @Setter
+    private String key;
+
+    @Setter
+    private String name;
+
+    CacheKeyEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CacheKeyEnum getEnum(String key) {
+        for (CacheKeyEnum item : CacheKeyEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        CacheKeyEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

data-service/src/main/java/com/lantone/data/enums/IsDeleteEnum.java

@@ -0,0 +1,42 @@
+package com.lantone.data.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否，例如：是否删除
+ * @author: gaodm
+ * @time: 2018/9/3 16:01
+ */
+public enum IsDeleteEnum {
+
+    Y("Y", "是"),
+    N("N", "否");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    IsDeleteEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static IsDeleteEnum getEnum(String key) {
+        for (IsDeleteEnum item : IsDeleteEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        IsDeleteEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

data-service/src/main/java/com/lantone/data/enums/ModeIdEnum.java

@@ -0,0 +1,71 @@
+package com.lantone.data.enums;
+
+import com.lantone.data.core.KeyedNamed;
+import lombok.Setter;
+
+public enum ModeIdEnum implements KeyedNamed {
+    BEHOSPITAL_INFO(1, "入院记录"),
+    FIRST_RECORD(2, "首次病程录"),
+    DEATH_DISCUSSION(3, "死亡病例讨论记录"),
+    WARD_RECORD(4, "查房记录"),
+    LEAVE_HOSPITAL(5, "出院小结"),
+    HOME_PAGE(6, "病案首页"),
+    CONSULTATION_NOTE1(7, "会诊记录"),
+        BLOODNOTE(10, "输血/血制品病程记录"),
+    OPERATIVE_FRONT_SUM (11, "术前讨论、术前小结"),
+    OPERATIVE_AGREE_BOOK (16, "手术知情同意书"),
+    OPERATIVE_FIRST_NOTE(18, "术后首次病程及谈话记录"),
+OPERATIVE_SAFE_SURFACE (21, "手术安全核查表"),
+    DIFFICULT_CASE(19, "疑难病例讨论记录"),
+    OPERATIVE_NOTE(17, "手术记录"),
+    RESCUE_NOTE(22, "抢救记录"),
+    CRISIS_NOTE(23, "危急值记录"),
+    DEATH_NOTE(24, "死亡记录"),
+    ILL_CRITICALLY(25, "病危通知书"),
+    TRANSFER_IN_NOTE(26, "转入记录"),
+    TRANSFER_OUT_NOTE(27, "转出记录"),
+    PERIOD_CONCLUSION(28, "阶段小结"),
+    ILL_SERIOUSL(29, "病重通知书"),
+    CONSULTATION_APPLY(30, "会诊申请单"),
+    CONSULTATION_RESULT(31, "会诊结果单"),
+    DATA_MODEL(32, "输血后效果评价"),
+    OTHER(55, "其他"),
+    PACS_INTO(57, "检查信息"),
+    LIS_INFO(58, "检验信息"),
+    //LIS_INFO(59, "有创操作"),
+    CONSULTATION_NOTE(60, "会诊单");
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    ModeIdEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ModeIdEnum getEnum(int key) {
+        for (ModeIdEnum item : ModeIdEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        ModeIdEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

data-service/src/main/java/com/lantone/data/facade/ColumnFacade.java

@@ -1,20 +1,17 @@
 package com.lantone.data.facade;
 
-import com.alibaba.fastjson.JSON;
-import com.diagbot.dto.OutputInfo;
-import com.diagbot.dto.Response;
-import com.diagbot.enums.CacheKeyEnum;
-import com.diagbot.enums.ModeIdEnum;
-import com.diagbot.facade.QcClientFacade;
-import com.diagbot.facade.str.*;
-import com.diagbot.service.impl.ColumnServiceImpl;
-import com.diagbot.vo.QueryVo;
-import com.diagbot.vo.str.StrContentVO;
-import com.lantone.data.facade.data.MedAbnormalInfoFacade;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.ModeIdEnum;
+import com.lantone.data.facade.dataStr.*;
+import com.lantone.data.service.impl.dataStr.ColumnServiceImpl;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.structure.model.OutputInfo;
+import com.lantone.structure.model.vo.QueryVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.xml.ws.Response;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,8 +21,6 @@ import java.util.Map;
 public class ColumnFacade extends ColumnServiceImpl {
     @Autowired
     private QcClientFacade qcClientFacade;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     /**
      * 解析
@@ -52,7 +47,6 @@ public class ColumnFacade extends ColumnServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析","", JSON.toJSONString(queryVo),"",e.getMessage());
         }
 
     }
@@ -90,53 +84,53 @@ public class ColumnFacade extends ColumnServiceImpl {
      * @time: ${DATE} ${TIME}
      **/
     public void addWholeData(StrContentVO strContentVO){
-        String modelName=ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId()));
+        String modelName= ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId()));
         if("入院记录".equals(modelName)){
-            bStrAdmissionNoteFacade.dealData(strContentVO);
+            strAdmissionNoteFacade.dealData(strContentVO);
         }else if("首次病程录".equals(modelName)){
-            bStrFirstRecordFacade.dealData(strContentVO);
+            strFirstRecordFacade.dealData(strContentVO);
         }else if("输血后效果评价".equals(modelName)){
-            bStrBloodResultFacade.dealData(strContentVO);
+            strBloodResultFacade.dealData(strContentVO);
         }else if("输血/血制品病程记录".equals(modelName)){
-            bStrBloodTransfusionFacade.dealData(strContentVO);
+            strBloodTransfusionFacade.dealData(strContentVO);
         }else if("转入记录".equals(modelName)){
-            bStrTransferInNoteFacade.dealData(strContentVO);
+            strTransferInNoteFacade.dealData(strContentVO);
         }else if("转出记录".equals(modelName)){
-            bStrTransferOutNoteFacade.dealData(strContentVO);
+            strTransferOutNoteFacade.dealData(strContentVO);
         }else if("病危通知书".equals(modelName)){
-            bStrIllCriticallyFacade.dealData(strContentVO);
+            strIllCriticallyFacade.dealData(strContentVO);
         }else if("病重通知书".equals(modelName)){
-            bStrIllSeriouslFacade.dealData(strContentVO);
+            strIllSeriouslFacade.dealData(strContentVO);
         }else if("疑难病例讨论记录".equals(modelName)){
-            bStrDifficultCaseFacade.dealData(strContentVO);
+            strDifficultCaseFacade.dealData(strContentVO);
         }else if("死亡记录".equals(modelName)){
-            bStrDeathNoteFacade.dealData(strContentVO);
+            strDeathNoteFacade.dealData(strContentVO);
         }else if("死亡病例讨论记录".equals(modelName)){
-            bStrDeathDiscussionFacade.dealData(strContentVO);
+            strDeathDiscussionFacade.dealData(strContentVO);
         }else if("查房记录".equals(modelName)){
-            bStrWardRecordFacade.dealData(strContentVO);
+            strWardRecordFacade.dealData(strContentVO);
         }else if("术后首次病程及谈话记录".equals(modelName)){
-            bStrOperativeFirstRecordFacade.dealData(strContentVO);
+            strOperativeFirstRecordFacade.dealData(strContentVO);
         }else if("术前讨论、术前小结".equals(modelName)){
-            bStrPreoperativeDiscussionFacade.dealData(strContentVO);
+            strPreoperativeDiscussionFacade.dealData(strContentVO);
         }else if("手术记录".equals(modelName)){
-            bStrOperativeNoteFacade.dealData(strContentVO);
+            strOperativeNoteFacade.dealData(strContentVO);
         }else if("抢救记录".equals(modelName)){
-            bStrRescueNoteFacade.dealData(strContentVO);
+            strRescueNoteFacade.dealData(strContentVO);
         }else if("危急值记录".equals(modelName)){
-            bStrCrisisNoteFacade.dealData(strContentVO);
+            strCrisisNoteFacade.dealData(strContentVO);
         }else if("出院小结".equals(modelName)){
-            bStrLeaveHospitalFacade.dealData(strContentVO);
+            strLeaveHospitalFacade.dealData(strContentVO);
         }else if("会诊申请单".equals(modelName)){
-            bStrConsultationApplyFacade.dealData(strContentVO);
+            strConsultationApplyFacade.dealData(strContentVO);
         }else if("会诊结果单".equals(modelName)){
-            bStrConsultationResultFacade.dealData(strContentVO);
+            strConsultationResultFacade.dealData(strContentVO);
         }else if("会诊单".equals(modelName)){
-            bStrConsultationNoteFacade.dealData(strContentVO);
+            strConsultationNoteFacade.dealData(strContentVO);
         }else if ("会诊记录".equals(modelName)){
-            bStrConsultationRecordFacade.dealData(strContentVO);
+            strConsultationRecordFacade.dealData(strContentVO);
         } else if("阶段小结".equals(modelName)){
-            bStrPeriodConclusionFacade.dealData(strContentVO);
+            strPeriodConclusionFacade.dealData(strContentVO);
         }
     }
 
@@ -149,103 +143,102 @@ public class ColumnFacade extends ColumnServiceImpl {
     private void analysisData(String modelName,Map<String, Object> entityMap,Long hospitalId,String columnMap){
         try{
             if("入院记录".equals(modelName)){
-                bStrAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strAdmissionNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("首次病程录".equals(modelName)){
-                bStrFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("输血后效果评价".equals(modelName)){
-                bStrBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strBloodResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("输血/血制品病程记录".equals(modelName)){
-                bStrBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strBloodTransfusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("转入记录".equals(modelName)){
-                bStrTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strTransferInNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("转出记录".equals(modelName)){
-                bStrTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strTransferOutNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("病危通知书".equals(modelName)){
-                bStrIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strIllCriticallyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("病重通知书".equals(modelName)){
-                bStrIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strIllSeriouslFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("疑难病例讨论记录".equals(modelName)){
-                bStrDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strDifficultCaseFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("死亡记录".equals(modelName)){
-                bStrDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strDeathNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("死亡病例讨论记录".equals(modelName)){
-                bStrDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strDeathDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("查房记录".equals(modelName)){
-                bStrWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strWardRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("术后首次病程及谈话记录".equals(modelName)){
-                bStrOperativeFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strOperativeFirstRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("术前讨论、术前小结".equals(modelName)){
-                bStrPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strPreoperativeDiscussionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("手术记录".equals(modelName)){
-                bStrOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strOperativeNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("抢救记录".equals(modelName)){
-                bStrRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strRescueNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("危急值记录".equals(modelName)){
-                bStrCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strCrisisNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("出院小结".equals(modelName)){
-                bStrLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strLeaveHospitalFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊申请单".equals(modelName)){
-                bStrConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strConsultationApplyFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊结果单".equals(modelName)){
-                bStrConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strConsultationResultFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if("会诊单".equals(modelName)){
-                bStrConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strConsultationNoteFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }else if ("会诊记录".equals(modelName)){
-                bStrConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strConsultationRecordFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             } else if("阶段小结".equals(modelName)){
-                bStrPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
+                strPeriodConclusionFacade.dealData(columnMap,entityMap,Long.valueOf(hospitalId));
             }
             log.info(modelName+"---- 解析完成！");
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("数据解析异常", "",JSON.toJSONString(columnMap),"",e.getMessage());
         }
     }
 
     @Autowired
-    private BStrAdmissionNoteFacade bStrAdmissionNoteFacade;
+    private StrAdmissionNoteFacade strAdmissionNoteFacade;
     @Autowired
-    private BStrFirstRecordFacade bStrFirstRecordFacade;
+    private StrFirstRecordFacade strFirstRecordFacade;
     @Autowired
-    private BStrPeriodConclusionFacade bStrPeriodConclusionFacade;
+    private StrPeriodConclusionFacade strPeriodConclusionFacade;
     @Autowired
-    private BStrBloodResultFacade bStrBloodResultFacade;
+    private StrBloodResultFacade strBloodResultFacade;
     @Autowired
-    private BStrBloodTransfusionFacade bStrBloodTransfusionFacade;
+    private StrBloodTransfusionFacade strBloodTransfusionFacade;
     @Autowired
-    private BStrTransferInNoteFacade bStrTransferInNoteFacade;
+    private StrTransferInNoteFacade strTransferInNoteFacade;
     @Autowired
-    private BStrTransferOutNoteFacade bStrTransferOutNoteFacade;
+    private StrTransferOutNoteFacade strTransferOutNoteFacade;
     @Autowired
-    private BStrIllSeriouslFacade bStrIllSeriouslFacade;
+    private StrIllSeriouslFacade strIllSeriouslFacade;
     @Autowired
-    private BStrIllCriticallyFacade bStrIllCriticallyFacade;
+    private StrIllCriticallyFacade strIllCriticallyFacade;
     @Autowired
-    private BStrDifficultCaseFacade bStrDifficultCaseFacade;
+    private StrDifficultCaseFacade strDifficultCaseFacade;
     @Autowired
-    private BStrDeathNoteFacade bStrDeathNoteFacade;
+    private StrDeathNoteFacade strDeathNoteFacade;
     @Autowired
-    private BStrDeathDiscussionFacade bStrDeathDiscussionFacade;
+    private StrDeathDiscussionFacade strDeathDiscussionFacade;
     @Autowired
-    private BStrWardRecordFacade bStrWardRecordFacade;
+    private StrWardRecordFacade strWardRecordFacade;
     @Autowired
-    private BStrOperativeFirstRecordFacade bStrOperativeFirstRecordFacade;
+    private StrOperativeFirstRecordFacade strOperativeFirstRecordFacade;
     @Autowired
-    private BStrPreoperativeDiscussionFacade bStrPreoperativeDiscussionFacade;
+    private StrPreoperativeDiscussionFacade strPreoperativeDiscussionFacade;
     @Autowired
-    private BStrOperativeNoteFacade bStrOperativeNoteFacade;
+    private StrOperativeNoteFacade strOperativeNoteFacade;
     @Autowired
-    private BStrRescueNoteFacade bStrRescueNoteFacade;
+    private StrRescueNoteFacade strRescueNoteFacade;
     @Autowired
-    private BStrCrisisNoteFacade bStrCrisisNoteFacade;
+    private StrCrisisNoteFacade strCrisisNoteFacade;
     @Autowired
-    private BStrLeaveHospitalFacade bStrLeaveHospitalFacade;
+    private StrLeaveHospitalFacade strLeaveHospitalFacade;
     @Autowired
-    private BStrConsultationApplyFacade bStrConsultationApplyFacade;
+    private StrConsultationApplyFacade strConsultationApplyFacade;
     @Autowired
-    private BStrConsultationResultFacade bStrConsultationResultFacade;
+    private StrConsultationResultFacade strConsultationResultFacade;
     @Autowired
-    private BStrConsultationNoteFacade bStrConsultationNoteFacade;
+    private StrConsultationNoteFacade strConsultationNoteFacade;
     @Autowired
-    private BStrConsultationRecordFacade bStrConsultationRecordFacade;
+    private StrConsultationRecordFacade strConsultationRecordFacade;
 }

data-service/src/main/java/com/lantone/data/facade/DataFacade.java

@@ -1,4 +0,0 @@
-package com.lantone.data.facade;
-
-public class DataFacade {
-}

data-service/src/main/java/com/lantone/data/facade/ModelHospitalFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.data.facade;
+
+import com.lantone.data.service.impl.ModelHospitalServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-05-15 14:42
+ */
+@Component
+public class ModelHospitalFacade extends ModelHospitalServiceImpl {
+
+}

data-service/src/main/java/com/lantone/data/facade/QcTypeFacade.java

@@ -0,0 +1,15 @@
+package com.lantone.data.facade;
+
+import com.lantone.data.service.impl.QcTypeServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2018/11/23 11:37
+ */
+@Component
+public class QcTypeFacade extends QcTypeServiceImpl {
+
+
+}

data-service/src/main/java/com/lantone/data/facade/data/BehospitalInfoFacade.java

@@ -1,26 +1,22 @@
 package com.lantone.data.facade.data;
 
-import com.alibaba.fastjson.JSON;
+import ch.qos.logback.core.joran.util.beans.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.ABehospitalInfoDTO;
-import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.QcType;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.QcTypeFacade;
-import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.diagbot.vo.data.ADeleteFlagVO;
-import com.diagbot.vo.data.APlaceFileVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.BehospitalInfo;
+import com.lantone.data.entity.QcType;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.QcTypeFacade;
+import com.lantone.data.service.impl.BehospitalInfoServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DeleteFlagVO;
+import com.lantone.data.vo.PlaceFileVO;
+import com.lantone.data.vo.data.BehospitalInfoVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -33,67 +29,45 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     private BehospitalInfoServiceImpl behospitalInfoService;
     @Autowired
     private QcTypeFacade qcTypeFacade;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 通过接口更新病人住院记录信息
-     * @param list
+     * @param
      * @return
      */
-    public RespDTO<List<ABehospitalInfoDTO>> executeBehospital(List<ABehospitalInfoVO> list) {
+    public RespDTO executeBehospital(BehospitalInfoVO behospitalInfoVO) {
         try {
-            if(list!=null && list.size()>0) {
-                //循环验证数据有效性
-                for (ABehospitalInfoVO behospitalInfo:list) {
-                    if("".equals(behospitalInfo.getBehospitalCode())) {
-                        return RespDTO.onError("请输入病人住院编码!");
-                    }else if(behospitalInfo.getHospitalId()==null){
-                        return RespDTO.onError("请输入医院编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptId())){
-                        return RespDTO.onError("请输入住院科室编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptName())){
-                        return RespDTO.onError("请输入住院科室名称!");
-                    }
-                }
-
-                List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
-                list.stream().forEach(s->{
-                    BehospitalInfo behospitalInfo=new BehospitalInfo();
-                    BeanUtil.copyProperties(s,behospitalInfo);
-                    if(StringUtil.isNotBlank(s.getBirthday())) {
-                        behospitalInfo.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                    }
-                    if(StringUtil.isNotBlank(s.getLeaveHospitalDate())) {
-                        behospitalInfo.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
-                    }
-                    if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                        behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
-                    }
-                    if(StringUtil.isNotBlank(s.getPlacefileDate())){
-                        behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(s.getPlacefileDate()));
-                    }
-                    behospitalInfoList.add(behospitalInfo);
-                });
+            if("".equals(behospitalInfoVO.getBehospitalCode())) {
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(behospitalInfoVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if("".equals(behospitalInfoVO.getBehDeptId())){
+                return RespDTO.onError("请输入住院科室编码!");
+            }else if("".equals(behospitalInfoVO.getBehDeptName())){
+                return RespDTO.onError("请输入住院科室名称!");
+            }
+            List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
+            BehospitalInfo behospitalInfo=new BehospitalInfo();
+            BeanUtil.copyProperties(behospitalInfoVO,behospitalInfo);
+            if(StringUtil.isNotBlank(behospitalInfoVO.getBirthday())) {
+                behospitalInfo.setBirthday(DateUtil.parseDate(behospitalInfoVO.getBirthday()));
+            }
+            if(StringUtil.isNotBlank(behospitalInfoVO.getLeaveHospitalDate())) {
+                behospitalInfo.setLeaveHospitalDate(DateUtil.parseDateTime(behospitalInfoVO.getLeaveHospitalDate()));
+            }
+            if(StringUtil.isNotBlank(behospitalInfoVO.getBehospitalDate())){
+                behospitalInfo.setBehospitalDate(DateUtil.parseDateTime(behospitalInfoVO.getBehospitalDate()));
+            }
+            if(StringUtil.isNotBlank(behospitalInfoVO.getPlacefileDate())){
+                behospitalInfo.setPlacefileDate(DateUtil.parseDateTime(behospitalInfoVO.getPlacefileDate()));
+            }
+            behospitalInfoList.add(behospitalInfo);
 
-                execute(behospitalInfoList);
+            execute(behospitalInfoList);
 
-                if(logSwitch){
-                    behospitalInfoList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-正常","", JSON.toJSONString(list),"","");
-                    });
-                }
-                return RespDTO.onSuc("操作正常！");
-            }else{
-                return RespDTO.onError("未接收到数据!");
-            }
+            return RespDTO.onSuc("操作正常！");
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-异常","", JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -159,58 +133,55 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO deleteFlagVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+            if(StringUtil.isEmpty(deleteFlagVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
-            }else if(aDeleteFlagVO.getHospitalId()==null){
+            }else if(deleteFlagVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
             }else {
                 UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
-                updateWrapper.eq("behospital_code", aDeleteFlagVO.getBehospitalCode());
-                updateWrapper.eq("hospital_id", aDeleteFlagVO.getHospitalId());
-                updateWrapper.eq("is_deleted",IsDeleteEnum.N);
+                updateWrapper.eq("behospital_code", deleteFlagVO.getBehospitalCode());
+                updateWrapper.eq("hospital_id", deleteFlagVO.getHospitalId());
+                updateWrapper.eq("is_deleted", IsDeleteEnum.N);
                 updateWrapper.set("is_deleted",IsDeleteEnum.Y);
                 updateWrapper.set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);
-                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除",JSON.toJSONString(aDeleteFlagVO),"","删除成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
 
-    public RespDTO placeFileFlag(APlaceFileVO aPlaceFileVO){
+    public RespDTO placeFileFlag(PlaceFileVO placeFileVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isBlank(aPlaceFileVO.getBehospitalCode())){
+            if(StringUtil.isBlank(placeFileVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
-            }else if(aPlaceFileVO.getHospitalId()==null){
+            }else if(placeFileVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
             }else{
                 UpdateWrapper<BehospitalInfo> updateWrapper=new UpdateWrapper<>();
-                updateWrapper.eq("behospital_code", aPlaceFileVO.getBehospitalCode());
-                updateWrapper.eq("hospital_id", aPlaceFileVO.getHospitalId());
+                updateWrapper.eq("behospital_code", placeFileVO.getBehospitalCode());
+                updateWrapper.eq("hospital_id", placeFileVO.getHospitalId());
                 updateWrapper.eq("is_deleted",IsDeleteEnum.N);
-                if("0".equals(aPlaceFileVO.getPlaceState())){
+                if("0".equals(placeFileVO.getPlaceState())){
                     //取消归档为运行病历
                     updateWrapper.set("is_placefile","0");
-                }else if("1".equals(aPlaceFileVO.getPlaceState())){
+                }else if("1".equals(placeFileVO.getPlaceState())){
                     //归档为终末病历
                     updateWrapper.set("is_placefile","1");
                 }
-                updateWrapper.set("placefile_date",aPlaceFileVO.getPlaceFileDate().isEmpty()?DateUtil.formatDateTime(DateUtil.now()):DateUtil.parseDateTime(aPlaceFileVO.getPlaceFileDate()));
+                updateWrapper.set("placefile_date",placeFileVO.getPlaceFileDate().isEmpty()?DateUtil.formatDateTime(DateUtil.now()):DateUtil.parseDateTime(placeFileVO.getPlaceFileDate()));
                 updateWrapper.set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院登记-归档","",JSON.toJSONString(aPlaceFileVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

data-service/src/main/java/com/lantone/data/facade/data/DoctorAdviceFacade.java

@@ -1,50 +1,40 @@
 package com.lantone.data.facade.data;
 
-import com.alibaba.fastjson.JSON;
 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.DoctorAdvice;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.DoctorAdviceServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ADeleteFlagVO;
-import com.diagbot.vo.data.ADoctorAdviceVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.DoctorAdvice;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.DoctorAdviceServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DeleteFlagVO;
+import com.lantone.data.vo.data.DoctorAdviceVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 
 @Component
-public class DoctorAdviceFacade extends DoctorAdviceServiceImpl{
+public class DoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
     @Autowired
     @Qualifier("doctorAdviceServiceImpl")
     private DoctorAdviceServiceImpl doctorAdviceService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 数据引擎-通过接口更新医生医嘱信息
      * @param list
      * @return
      */
-    public RespDTO executeDoctorAdvice(List<ADoctorAdviceVO> list) {
+    public RespDTO executeDoctorAdvice(List<DoctorAdviceVO> list) {
         try {
             if(list!=null && list.size()>0){
                 //循环验证数据有效性
-                for (ADoctorAdviceVO doctorAdvice:list) {
+                for (DoctorAdviceVO doctorAdvice:list) {
                     if("".equals(doctorAdvice.getDoctorAdviceId())) {
                         return RespDTO.onError("请输入病人医嘱编码!");
                     }else if(doctorAdvice.getHospitalId()==null){
@@ -67,18 +57,12 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl{
                     doctorAdviceList.add(doctorAdvice);
                 });
                 execute(doctorAdviceList);
-                if(logSwitch){
-                    doctorAdviceList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-正常","", JSON.toJSONString(list),"","");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-异常","", JSON.toJSONString(list),"",e.getMessage());
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -110,7 +94,7 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl{
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
             if(StringUtil.isEmpty(aDeleteFlagVO.getDoctorAdviceId())) {
@@ -129,11 +113,9 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new DoctorAdvice(),updateWrapper);
-                //aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病人住院医嘱-删除","",JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

data-service/src/main/java/com/lantone/data/facade/data/HomePageFacade.java

@@ -1,19 +1,19 @@
 package com.lantone.data.facade.data;
 
-import com.alibaba.fastjson.JSON;
 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.dto.data.AHomePageDTO;
-import com.diagbot.entity.HomePage;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.BehospitalInfoFacade;
-import com.diagbot.service.impl.HomePageServiceImpl;
-import com.diagbot.util.*;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.HomePage;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.HomePageServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DeleteFlagVO;
+import com.lantone.data.vo.data.HomeDiagnoseVO;
+import com.lantone.data.vo.data.HomeOperationVO;
+import com.lantone.data.vo.data.HomePageIngVO;
+import com.lantone.data.vo.data.HomePageVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-public class HomePageFacade extends HomePageServiceImpl{
+public class HomePageFacade extends HomePageServiceImpl {
 
     @Autowired
     @Qualifier("homePageServiceImpl")
@@ -59,10 +59,10 @@ public class HomePageFacade extends HomePageServiceImpl{
      * @param aHomePageIngVO
      * @return
      */
-    public RespDTO<Map<String, Object>> executeHomePageIng(AHomePageIngVO aHomePageIngVO){
+    public RespDTO<Map<String, Object>> executeHomePageIng(HomePageIngVO aHomePageIngVO){
         if(aHomePageIngVO.getHomePages()!=null && aHomePageIngVO.getHomePages().size()>0){
             //验证数据有效性
-            for (AHomePageVO aHomePageVO:aHomePageIngVO.getHomePages()) {
+            for (HomePageVO aHomePageVO:aHomePageIngVO.getHomePages()) {
                 if("".equals(aHomePageVO.getHomePageId())) {
                     return RespDTO.onError("请输入病案首页编号!");
                 }else if(aHomePageVO.getHospitalId()==null){
@@ -72,7 +72,7 @@ public class HomePageFacade extends HomePageServiceImpl{
                 }
                 //出院诊断
                 if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
-                    for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
+                    for (HomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
                         if("".equals(aHomeDiagnoseVO.getHomePageId())) {
                             return RespDTO.onError("出院诊断未输入病案首页编号!");
                         }else if(aHomeDiagnoseVO.getHospitalId()==null){
@@ -85,7 +85,7 @@ public class HomePageFacade extends HomePageServiceImpl{
 
                 //住院手术
                 if(aHomePageVO.getOperations()!=null && aHomePageVO.getOperations().size()>0){
-                    for (AHomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
+                    for (HomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
                         if("".equals(aHomeOperationVO.getHomePageId())) {
                             return RespDTO.onError("住院手术未输入病案首页编号!");
                         }else if(aHomeOperationVO.getHospitalId()==null){
@@ -115,7 +115,7 @@ public class HomePageFacade extends HomePageServiceImpl{
      * 更新数据到数据库
      * @param aHomePageIngVO
      */
-    private void updateHomePageIng(AHomePageIngVO aHomePageIngVO){
+    private void updateHomePageIng(HomePageIngVO aHomePageIngVO){
         try {
             List<HomePage> homePageList=Lists.newArrayList();
             aHomePageIngVO.getHomePages().stream().forEach(s->{
@@ -141,13 +141,13 @@ public class HomePageFacade extends HomePageServiceImpl{
      * @param aHomePageIngVO
      * @return
      */
-    private RespDTO<Map<String, Object>> homePageIng(AHomePageIngVO aHomePageIngVO){
+    private RespDTO<Map<String, Object>> homePageIng(HomePageIngVO aHomePageIngVO){
         String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
         Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
         Long modeId=Long.valueOf("6");//病案首页默认为6
         if(aHomePageIngVO.getDockModeType().equals("0")){
             Map<String,Object> map=new HashMap<String,Object>();
-            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
+            List<HomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
             map.put("homePages",homePageDtoList);
             return RespDTO.onSuc(map);
         }else if(aHomePageIngVO.getDockModeType().equals("1")){
@@ -191,10 +191,10 @@ public class HomePageFacade extends HomePageServiceImpl{
      * @param list
      * @return
      */
-    public RespDTO<List<AHomePageDTO>> executeHomePage(List<AHomePageVO> list) {
+    public RespDTO<List<HomePageDTO>> executeHomePage(List<HomePageVO> list) {
         if(list!=null && list.size()>0){
             //循环验证数据有效性
-            for (AHomePageVO aHomePageVO:list) {
+            for (HomePageVO aHomePageVO:list) {
                 if("".equals(aHomePageVO.getHomePageId())) {
                     return RespDTO.onError("请输入病案首页编号!");
                 }else if(aHomePageVO.getHospitalId()==null){
@@ -216,7 +216,7 @@ public class HomePageFacade extends HomePageServiceImpl{
                 homePageList.add(homePage);
             });
             execute(homePageList);
-            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
+            List<HomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,HomePageDTO.class);
             return RespDTO.onSuc(homePageDtoList);
         }else{
             return RespDTO.onError("未接收到数据!");
@@ -259,7 +259,7 @@ public class HomePageFacade extends HomePageServiceImpl{
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
             if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {

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

@@ -1,8 +1,12 @@
 package com.lantone.data.facade.dataStr;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import com.lantone.data.entity.dataStr.StrAdmissionNote;
+import com.lantone.data.enums.IsDeleteEnum;
 import com.lantone.data.facade.ColumnFacade;
 import com.lantone.data.service.impl.dataStr.StrAdmissionNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.StrContentVO;
 import com.lantone.data.vo.dataStr.StrAdmissionNoteVO;
@@ -75,7 +79,7 @@ public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
      **/
     public void dealData(String columnMap, Map<String, Object> entityMap, Long hospitalId) throws Exception {
         StrAdmissionNote strAdmissionNote = new StrAdmissionNote();
-        AStrAdmissionNoteVO strAdmissionNoteVO = (AStrAdmissionNoteVO) MapUtil.mapToObject(entityMap, AStrAdmissionNoteVO.class);
+        StrAdmissionNoteVO strAdmissionNoteVO = (StrAdmissionNoteVO) MapUtil.mapToObject(entityMap, StrAdmissionNoteVO.class);
         BeanUtils.copyProperties(strAdmissionNoteVO, strAdmissionNote);
         strAdmissionNote.setHospitalId(hospitalId);//医院编码
 
@@ -133,22 +137,12 @@ public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
                 List<StrAdmissionNote> strAdmissionNoteList=initData(list);
                 execute(strAdmissionNoteList);
 
-                if(logSwitch){
-                    strAdmissionNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-入院记录-正常", s.getRecId(), JSON.toJSONString(list), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-入院记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
 

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

@@ -1,28 +1,21 @@
 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.StrBloodResult;
-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.StrBloodResultServiceImpl;
-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.AStrBloodResultVO;
-import com.diagbot.vo.str.StrBloodResultVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrBloodResult;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrBloodResultServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrBloodResultVO;
+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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -42,10 +35,6 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
     private StrBloodResultServiceImpl strBloodResultService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -179,7 +168,7 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
     }
 
     private List<StrBloodResult> initData(List<StrBloodResultVO> list) throws Exception{
-        List<StrBloodResult> tList=Lists.newArrayList();
+        List<StrBloodResult> tList= Lists.newArrayList();
         for (StrBloodResultVO s:list) {
             StrBloodResult t=new StrBloodResult();
             BeanUtils.copyProperties(s,t);

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

@@ -1,28 +1,24 @@
 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.StrBloodTransfusion;
-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.StrBloodTransfusionServiceImpl;
-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.AStrBloodTransfusionVO;
-import com.diagbot.vo.str.StrBloodTransfusionVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrBloodTransfusion;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrBloodTransfusionServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrBloodTransfusionVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -42,10 +38,6 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
     private StrBloodTransfusionServiceImpl strBloodTransfusionService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -94,7 +86,7 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrBloodTransfusion strBloodTransfusion=new StrBloodTransfusion();
         try {
-            AStrBloodTransfusionVO strBloodTransfusionVO=(AStrBloodTransfusionVO) MapUtil.mapToObject(entityMap, AStrBloodTransfusionVO.class);
+            StrBloodTransfusionVO strBloodTransfusionVO=(StrBloodTransfusionVO) MapUtil.mapToObject(entityMap, StrBloodTransfusionVO.class);
             BeanUtils.copyProperties(strBloodTransfusionVO,strBloodTransfusion);
             strBloodTransfusion.setHospitalId(hospitalId);//医院编码
             strBloodTransfusion.setStartTime(DateUtil.parseDateTime(strBloodTransfusionVO.getStartTime()));
@@ -119,7 +111,6 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血记录", strBloodTransfusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -158,22 +149,12 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
                 List<StrBloodTransfusion> strBloodTransfusionList= initData(list);
                 execute(strBloodTransfusionList);
 
-                if(logSwitch){
-                    strBloodTransfusionList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血/血制品病程记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-输血/血制品病程记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -200,7 +181,7 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_TRANSFUSION.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrConsultationApply;
-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.StrConsultationApplyServiceImpl;
-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.AStrConsultationApplyVO;
-import com.diagbot.vo.str.StrConsultationApplyVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationApply;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrConsultationApplyServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrConsultationApplyVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl
     private StrConsultationApplyServiceImpl strConsultationApplyService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationApply strConsultationApply=new StrConsultationApply();
         try {
-            AStrConsultationApplyVO strConsultationApplyVO=(AStrConsultationApplyVO) MapUtil.mapToObject(entityMap, AStrConsultationApplyVO.class);
+            StrConsultationApplyVO strConsultationApplyVO=(StrConsultationApplyVO) MapUtil.mapToObject(entityMap, StrConsultationApplyVO.class);
             BeanUtils.copyProperties(strConsultationApplyVO,strConsultationApply);
             strConsultationApply.setHospitalId(hospitalId);//医院编码
 
@@ -114,7 +106,6 @@ public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊申请单",strConsultationApply.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -153,22 +144,12 @@ public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl
                 List<StrConsultationApply> strConsultationApplyList= initData(list);
                 execute(strConsultationApplyList);
 
-                if(logSwitch){
-                    strConsultationApplyList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊申请单-正常", s.getRecId(), JSON.toJSONString(list), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊申请单-异常", s.getRecId(), JSON.toJSONString(s), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -198,7 +179,7 @@ public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_APPLY.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrConsultationNote;
-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.StrConsultationNoteServiceImpl;
-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.AStrConsultationNoteVO;
-import com.diagbot.vo.str.StrConsultationNoteVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrConsultationNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrConsultationNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
     private StrConsultationNoteServiceImpl strConsultationNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -48,7 +40,7 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
             s.setEn(NamingStrategy.underlineToCamel(s.getEn()));
         });
 
-        Map<String, String> columnMap=EntityUtil.makeMapWithKeyValue(list,"ch","en");
+        Map<String, String> columnMap= EntityUtil.makeMapWithKeyValue(list,"ch","en");
         Boolean flag=columnFacade.createColumn(columnMap,"strConsultationNote");
 
         //Map<String, String> map=columnFacade.getColumn("strConsultationNote");
@@ -89,7 +81,7 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationNote strConsultationNote=new StrConsultationNote();
         try {
-            AStrConsultationNoteVO strConsultationNoteVO=(AStrConsultationNoteVO) MapUtil.mapToObject(entityMap, AStrConsultationNoteVO.class);
+            StrConsultationNoteVO strConsultationNoteVO=(StrConsultationNoteVO) MapUtil.mapToObject(entityMap, StrConsultationNoteVO.class);
             BeanUtils.copyProperties(strConsultationNoteVO,strConsultationNote);
             strConsultationNote.setHospitalId(hospitalId);//医院编码
 
@@ -115,7 +107,6 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊单（申请和结果）",strConsultationNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -154,22 +145,12 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
                 List<StrConsultationNote> strConsultationNoteList= initData(list);
                 execute(strConsultationNoteList);
 
-                if(logSwitch){
-                    strConsultationNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊单（申请和结果）-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-            list.forEach(s->{
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊单（申请和结果）-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-            });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -199,7 +180,7 @@ public class StrConsultationNoteFacade extends StrConsultationNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrConsultationRecord;
-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.StrConsultationRecordServiceImpl;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.AStrConsultationRecordVO;
-import com.diagbot.vo.str.StrConsultationRecordVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationRecord;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrConsultationRecordServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrConsultationRecordVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrConsultationRecordFacade extends StrConsultationRecordServiceImp
     private StrConsultationRecordServiceImpl strConsultationRecordService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,16 +81,16 @@ public class StrConsultationRecordFacade extends StrConsultationRecordServiceImp
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationRecord strConsultationRecord=new StrConsultationRecord();
         try {
-            AStrConsultationRecordVO AStrConsultationRecordVO=(AStrConsultationRecordVO) MapUtil.mapToObject(entityMap, AStrConsultationRecordVO.class);
-            BeanUtils.copyProperties(AStrConsultationRecordVO,strConsultationRecord);
+            StrConsultationRecordVO strConsultationRecordVO=(StrConsultationRecordVO) MapUtil.mapToObject(entityMap, StrConsultationRecordVO.class);
+            BeanUtils.copyProperties(strConsultationRecordVO,strConsultationRecord);
             strConsultationRecord.setHospitalId(hospitalId);//医院编码
 
-            strConsultationRecord.setRecordDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecordDate()));//病历日期recordDate
-            strConsultationRecord.setBehospitalDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getBehospitalDate()));//入院日期behospital_date
-            strConsultationRecord.setApplyDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getApplyDate()));//申请日期apply_date
-            strConsultationRecord.setConsultationDate(DateUtil.parseDate(AStrConsultationRecordVO.getConsultationArriveDate()));//会诊时间consultation_date
-            strConsultationRecord.setRecDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getRecDate()));//记录时间rec_date
-            strConsultationRecord.setAuditDate(DateUtil.parseDateTime(AStrConsultationRecordVO.getAuditDate()));//审核时间audit_date
+            strConsultationRecord.setRecordDate(DateUtil.parseDateTime(strConsultationRecordVO.getRecordDate()));//病历日期recordDate
+            strConsultationRecord.setBehospitalDate(DateUtil.parseDateTime(strConsultationRecordVO.getBehospitalDate()));//入院日期behospital_date
+            strConsultationRecord.setApplyDate(DateUtil.parseDateTime(strConsultationRecordVO.getApplyDate()));//申请日期apply_date
+            //strConsultationRecord.setConsultationDate(DateUtil.parseDate(strConsultationRecordVO.getConsultationArriveDate()));//会诊时间consultation_date
+            strConsultationRecord.setRecDate(DateUtil.parseDateTime(strConsultationRecordVO.getRecDate()));//记录时间rec_date
+            strConsultationRecord.setAuditDate(DateUtil.parseDateTime(strConsultationRecordVO.getAuditDate()));//审核时间audit_date
 
             strConsultationRecord.setWholeData(columnMap);
             //判断数据库中是否存在，不存在insert
@@ -115,7 +107,6 @@ public class StrConsultationRecordFacade extends StrConsultationRecordServiceImp
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊记录）",strConsultationRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -154,22 +145,12 @@ public class StrConsultationRecordFacade extends StrConsultationRecordServiceImp
                 List<StrConsultationRecord> strConsultationRecordList= initData(list);
                 execute(strConsultationRecordList);
 
-                if(logSwitch){
-                    strConsultationRecordList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -199,7 +180,7 @@ public class StrConsultationRecordFacade extends StrConsultationRecordServiceImp
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_RECORD.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrConsultationResult;
-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.StrConsultationResultServiceImpl;
-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.AStrConsultationResultVO;
-import com.diagbot.vo.str.StrConsultationResultVO;
-import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrConsultationResult;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrConsultationResultServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrConsultationResultVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -42,10 +38,6 @@ public class StrConsultationResultFacade extends StrConsultationResultServiceImp
     private StrConsultationResultServiceImpl strConsultationResultService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -94,7 +86,7 @@ public class StrConsultationResultFacade extends StrConsultationResultServiceImp
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrConsultationResult strConsultationResult=new StrConsultationResult();
         try {
-            AStrConsultationResultVO strConsultationResultVO=(AStrConsultationResultVO) MapUtil.mapToObject(entityMap, AStrConsultationResultVO.class);
+            StrConsultationResultVO strConsultationResultVO=(StrConsultationResultVO) MapUtil.mapToObject(entityMap, StrConsultationResultVO.class);
             BeanUtils.copyProperties(strConsultationResultVO,strConsultationResult);
             strConsultationResult.setHospitalId(hospitalId);//医院编码
 
@@ -120,7 +112,6 @@ public class StrConsultationResultFacade extends StrConsultationResultServiceImp
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("会诊结果单",strConsultationResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -159,22 +150,12 @@ public class StrConsultationResultFacade extends StrConsultationResultServiceImp
                 List<StrConsultationResult> strConsultationResultList= initData(list);
                 execute(strConsultationResultList);
 
-                if(logSwitch){
-                    strConsultationResultList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊结果单-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-会诊结果单-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -204,7 +185,7 @@ public class StrConsultationResultFacade extends StrConsultationResultServiceImp
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CONSULTATION_RESULT.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrCrisisNote;
-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.StrCrisisNoteServiceImpl;
-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.AStrCrisisNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrCrisisNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrCrisisNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrCrisisNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrCrisisNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,11 +33,6 @@ public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
     private StrCrisisNoteServiceImpl strCrisisNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -88,7 +79,7 @@ public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrCrisisNote strCrisisNote=new StrCrisisNote();
         try {
-            AStrCrisisNoteVO strCrisisNoteVO=(AStrCrisisNoteVO) MapUtil.mapToObject(entityMap, AStrCrisisNoteVO.class);
+            StrCrisisNoteVO strCrisisNoteVO=(StrCrisisNoteVO) MapUtil.mapToObject(entityMap, StrCrisisNoteVO.class);
             BeanUtils.copyProperties(strCrisisNoteVO,strCrisisNote);
             strCrisisNote.setHospitalId(hospitalId);//医院编码
 
@@ -113,7 +104,6 @@ public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("危急值记录",strCrisisNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -152,22 +142,12 @@ public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
                 List<StrCrisisNote> strCrisisNoteList= initData(list);
                 execute(strCrisisNoteList);
 
-                if(logSwitch){
-                    strCrisisNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-危急值记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-危急值记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -191,7 +171,7 @@ public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.CRISIS_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrDeathDiscussion;
-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.StrDeathDiscussionServiceImpl;
-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.AStrDeathDiscussionVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrDeathDiscussionVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDeathDiscussion;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrDeathDiscussionServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrDeathDiscussionVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -194,7 +191,7 @@ public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.DEATH_DISCUSSION.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrDeathNote;
-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.StrDeathNoteServiceImpl;
-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.AStrDeathNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrDeathNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDeathNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrDeathNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrDeathNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,10 +34,6 @@ public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
     private StrDeathNoteServiceImpl strDeathNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +82,7 @@ public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDeathNote strDeathNote=new StrDeathNote();
         try {
-            AStrDeathNoteVO strDeathNoteVO=(AStrDeathNoteVO) MapUtil.mapToObject(entityMap, AStrDeathNoteVO.class);
+            StrDeathNoteVO strDeathNoteVO=(StrDeathNoteVO) MapUtil.mapToObject(entityMap, StrDeathNoteVO.class);
             BeanUtils.copyProperties(strDeathNoteVO,strDeathNote);
             strDeathNote.setHospitalId(hospitalId);//医院编码
 
@@ -114,7 +107,6 @@ public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡记录", strDeathNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -153,22 +145,12 @@ public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
                 List<StrDeathNote> strDeathNoteList= initData(list);
                 execute(strDeathNoteList);
 
-                if(logSwitch){
-                    strDeathNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -192,7 +174,7 @@ public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.DEATH_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrDifficultCase;
-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.StrDifficultCaseServiceImpl;
-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.AStrDifficultCaseVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrDifficultCaseVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrDifficultCase;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrDifficultCaseServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrDifficultCaseVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -30,17 +26,13 @@ import java.util.List;
 import java.util.Map;
 
 @Component
-public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
+public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl {
 
     @Autowired
     @Qualifier("strDifficultCaseServiceImpl")
     private StrDifficultCaseServiceImpl strDifficultCaseService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDifficultCase medDifficult=new StrDifficultCase();
         try {
-            AStrDifficultCaseVO medDifficultVO=(AStrDifficultCaseVO) MapUtil.mapToObject(entityMap, AStrDifficultCaseVO.class);
+            StrDifficultCaseVO medDifficultVO=(StrDifficultCaseVO) MapUtil.mapToObject(entityMap, StrDifficultCaseVO.class);
             BeanUtils.copyProperties(medDifficultVO,medDifficult);
             medDifficult.setHospitalId(hospitalId);//医院编码
             medDifficult.setRecDate(DateUtil.parseDateTime(medDifficultVO.getRecDate()));
@@ -111,8 +103,7 @@ public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
             }
 
         }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("疑难病例讨论记录",medDifficult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
+            log.error("疑难病例讨论记录"+e.getMessage(),e);
         }
 
     }
@@ -151,22 +142,12 @@ public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
                 List<StrDifficultCase> strDifficultCaseList= initData(list);
                 execute(strDifficultCaseList);
 
-                if(logSwitch){
-                    strDifficultCaseList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-疑难病例讨论记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-疑难病例讨论记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -190,7 +171,7 @@ public class StrDifficultCaseFacade extends StrDifficultCaseServiceImpl{
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.DIFFICULT_CASE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrFirstRecord;
-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.StrFirstRecordServiceImpl;
-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.AStrFirstRecordVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrFirstRecordVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrFirstRecord;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrFirstRecordServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrFirstRecordVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
     private StrFirstRecordServiceImpl strFirstRecordService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrFirstRecord strFirstRecord=new StrFirstRecord();
         try {
-            AStrFirstRecordVO strFirstRecordVO=(AStrFirstRecordVO) MapUtil.mapToObject(entityMap, AStrFirstRecordVO.class);
+            StrFirstRecordVO strFirstRecordVO=(StrFirstRecordVO) MapUtil.mapToObject(entityMap, StrFirstRecordVO.class);
             BeanUtils.copyProperties(strFirstRecordVO,strFirstRecord);
             strFirstRecord.setHospitalId(hospitalId);//医院编码
 
@@ -112,7 +104,6 @@ public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("首次病程录", strFirstRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -151,22 +142,12 @@ public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
                 List<StrFirstRecord> strFirstRecordList= initData(list);
                 execute(strFirstRecordList);
 
-                if(logSwitch){
-                    strFirstRecordList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-首次病程录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-首次病程录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -187,7 +168,7 @@ public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.FIRST_RECORD.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrIllCritically;
-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.StrIllCriticallyServiceImpl;
-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.AStrIllCriticallyVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrIllCriticallyVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrIllCritically;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrIllCriticallyServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrIllCriticallyVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,10 +34,6 @@ public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
     private StrIllCriticallyServiceImpl strIllCriticallyService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +82,7 @@ public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrIllCritically strIllCritically=new StrIllCritically();
         try {
-            AStrIllCriticallyVO strIllCriticallyVO=(AStrIllCriticallyVO) MapUtil.mapToObject(entityMap, AStrIllCriticallyVO.class);
+            StrIllCriticallyVO strIllCriticallyVO=(StrIllCriticallyVO) MapUtil.mapToObject(entityMap, StrIllCriticallyVO.class);
             BeanUtils.copyProperties(strIllCriticallyVO,strIllCritically);
             strIllCritically.setHospitalId(hospitalId);//医院编码
             strIllCritically.setPatientSignDate(DateUtil.parseDateTime(strIllCriticallyVO.getPatientSignDate()));
@@ -111,7 +104,6 @@ public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病危通知单",strIllCritically.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -150,22 +142,12 @@ public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
                 List<StrIllCritically> strIllCriticallyList= initData(list);
                 execute(strIllCriticallyList);
 
-                if(logSwitch){
-                    strIllCriticallyList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病危通知单-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病危通知单-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -186,7 +168,7 @@ public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.ILL_CRITICALLY.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrIllSeriousl;
-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.StrIllSeriouslServiceImpl;
-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.AStrIllSeriouslVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrIllSeriouslVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrIllSeriousl;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrIllSeriouslServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrIllSeriouslVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,10 +34,6 @@ public class StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
     private StrIllSeriouslServiceImpl strIllSeriouslService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +82,7 @@ public class StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrIllSeriousl strIllSeriousl=new StrIllSeriousl();
         try {
-            AStrIllSeriouslVO strIllSeriouslVO=(AStrIllSeriouslVO) MapUtil.mapToObject(entityMap, AStrIllSeriouslVO.class);
+            StrIllSeriouslVO strIllSeriouslVO=(StrIllSeriouslVO) MapUtil.mapToObject(entityMap, StrIllSeriouslVO.class);
             BeanUtils.copyProperties(strIllSeriouslVO,strIllSeriousl);
             strIllSeriousl.setHospitalId(hospitalId);//医院编码
             strIllSeriousl.setPatientSignDate(DateUtil.parseDateTime(strIllSeriouslVO.getPatientSignDate()));
@@ -111,7 +104,6 @@ public class StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", strIllSeriousl.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -150,22 +142,12 @@ public class StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
                 List<StrIllSeriousl> strIllSeriouslList= initData(list);
                 execute(strIllSeriouslList);
 
-                if(logSwitch){
-                    strIllSeriouslList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病重通知单-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-病重通知单-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -186,7 +168,7 @@ public class StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.ILL_SERIOUSL.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrInformedConsent;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
-import com.diagbot.service.impl.StrInformedConsentServiceImpl;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrInformedConsentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrInformedConsent;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrInformedConsentServiceImpl;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrInformedConsentVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -33,10 +30,6 @@ public class StrInformedConsentFacade extends StrInformedConsentServiceImpl {
     private StrInformedConsentServiceImpl strInformedConsentService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -99,7 +92,6 @@ public class StrInformedConsentFacade extends StrInformedConsentServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", strInformedConsent.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -138,22 +130,12 @@ public class StrInformedConsentFacade extends StrInformedConsentServiceImpl {
                 List<StrInformedConsent> strInformedConsentList= initData(list);
                 execute(strInformedConsentList);
 
-                if(logSwitch){
-                    strInformedConsentList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-知情同意书-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-知情同意书-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }

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

@@ -1,28 +1,24 @@
 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.StrLeaveHospital;
-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.StrLeaveHospitalServiceImpl;
-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.AStrLeaveHospitalVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrLeaveHospitalVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrLeaveHospital;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrLeaveHospitalServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrLeaveHospitalVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
     private StrLeaveHospitalServiceImpl strLeaveHospitalService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrLeaveHospital strLeaveHospital=new StrLeaveHospital();
         try {
-            AStrLeaveHospitalVO strLeaveHospitalVO=(AStrLeaveHospitalVO) MapUtil.mapToObject(entityMap, AStrLeaveHospitalVO.class);
+            StrLeaveHospitalVO strLeaveHospitalVO=(StrLeaveHospitalVO) MapUtil.mapToObject(entityMap, StrLeaveHospitalVO.class);
             BeanUtils.copyProperties(strLeaveHospitalVO,strLeaveHospital);
             strLeaveHospital.setHospitalId(hospitalId);//医院编码
 
@@ -114,7 +106,6 @@ public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("出院小结",strLeaveHospital.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -153,22 +144,12 @@ public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
                 List<StrLeaveHospital> strLeaveHospitalList= initData(list);
                 execute(strLeaveHospitalList);
 
-                if(logSwitch){
-                    strLeaveHospitalList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-出院小结-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-出院小结-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -195,7 +176,7 @@ public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.LEAVE_HOSPITAL.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrOperativeFirstRecord;
-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.StrOperativeFirstRecordServiceImpl;
-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.AStrOperativeFirstRecordVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrOperativeFirstRecordVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrOperativeFirstRecord;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrOperativeFirstRecordServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrOperativeFirstRecordVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServic
     private StrOperativeFirstRecordServiceImpl strOperativeFirstRecordService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -88,7 +80,7 @@ public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServic
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrOperativeFirstRecord strOperativeFirstRecord=new StrOperativeFirstRecord();
         try {
-            AStrOperativeFirstRecordVO strOperativeFirstRecordVO=(AStrOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, AStrOperativeFirstRecordVO.class);
+            StrOperativeFirstRecordVO strOperativeFirstRecordVO=(StrOperativeFirstRecordVO) MapUtil.mapToObject(entityMap, StrOperativeFirstRecordVO.class);
             BeanUtils.copyProperties(strOperativeFirstRecordVO,strOperativeFirstRecord);
             strOperativeFirstRecord.setHospitalId(hospitalId);//医院编码
 
@@ -114,7 +106,6 @@ public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServic
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术后首程",strOperativeFirstRecord.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -153,22 +144,12 @@ public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServic
                 List<StrOperativeFirstRecord> strOperativeFirstRecordList= initData(list);
                 execute(strOperativeFirstRecordList);
 
-                if(logSwitch){
-                    strOperativeFirstRecordList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术后首程-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术后首程-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -198,7 +179,7 @@ public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServic
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.OPERATIVE_FIRST_RECORD.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrOperativeNote;
-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.StrOperativeNoteServiceImpl;
-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.AStrOperativeNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrOperativeNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrOperativeNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrOperativeNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrOperativeNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
     private StrOperativeNoteServiceImpl strOperativeNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrOperativeNote strOperativeNote=new StrOperativeNote();
         try {
-            AStrOperativeNoteVO strOperativeNoteVO=(AStrOperativeNoteVO) MapUtil.mapToObject(entityMap, AStrOperativeNoteVO.class);
+            StrOperativeNoteVO strOperativeNoteVO=(StrOperativeNoteVO) MapUtil.mapToObject(entityMap, StrOperativeNoteVO.class);
             BeanUtils.copyProperties(strOperativeNoteVO,strOperativeNote);
             strOperativeNote.setHospitalId(hospitalId);//医院编码
 
@@ -115,7 +107,6 @@ public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("手术记录", strOperativeNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -154,22 +145,12 @@ public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
                 List<StrOperativeNote> strOperativeNoteList= initData(list);
                 execute(strOperativeNoteList);
 
-                if(logSwitch){
-                    strOperativeNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-手术记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-手术记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -199,7 +180,7 @@ public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.OPERATIVE_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrPeriodConclusion;
-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.StrPeriodConclusionServiceImpl;
-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.AStrPeriodConclusionVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrPeriodConclusionVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrPeriodConclusion;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrPeriodConclusionServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrPeriodConclusionVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -37,10 +34,6 @@ public class StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
     private StrPeriodConclusionServiceImpl strPeriodConclusionService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +82,7 @@ public class StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrPeriodConclusion strPeriodConclusion=new StrPeriodConclusion();
         try {
-            AStrPeriodConclusionVO strPeriodConclusionVO=(AStrPeriodConclusionVO) MapUtil.mapToObject(entityMap, AStrPeriodConclusionVO.class);
+            StrPeriodConclusionVO strPeriodConclusionVO=(StrPeriodConclusionVO) MapUtil.mapToObject(entityMap, StrPeriodConclusionVO.class);
             BeanUtils.copyProperties(strPeriodConclusionVO,strPeriodConclusion);
             strPeriodConclusion.setHospitalId(hospitalId);//医院编码
 
@@ -112,7 +105,6 @@ public class StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("阶段小结",strPeriodConclusion.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -151,22 +143,12 @@ public class StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
                 List<StrPeriodConclusion> strPeriodConclusionList= initData(list);
                 execute(strPeriodConclusionList);
 
-                if(logSwitch){
-                    strPeriodConclusionList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-阶段小结-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-阶段小结-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -187,7 +169,7 @@ public class StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.PERIOD_CONCLUSION.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrPreoperativeDiscussion;
-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.StrPreoperativeDiscussionServiceImpl;
-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.AStrPreoperativeDiscussionVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrPreoperativeDiscussionVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrPreoperativeDiscussion;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrPreoperativeDiscussionServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrPreoperativeDiscussionVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionSe
     private StrPreoperativeDiscussionServiceImpl strPreoperativeDiscussionService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionSe
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrPreoperativeDiscussion strPreoperativeDiscussion=new StrPreoperativeDiscussion();
         try {
-            AStrPreoperativeDiscussionVO strPreoperativeDiscussionVO=(AStrPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, AStrPreoperativeDiscussionVO.class);
+            StrPreoperativeDiscussionVO strPreoperativeDiscussionVO=(StrPreoperativeDiscussionVO) MapUtil.mapToObject(entityMap, StrPreoperativeDiscussionVO.class);
             BeanUtils.copyProperties(strPreoperativeDiscussionVO,strPreoperativeDiscussion);
             strPreoperativeDiscussion.setHospitalId(hospitalId);//医院编码
 
@@ -113,7 +105,6 @@ public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionSe
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("术前讨论小结",strPreoperativeDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -152,22 +143,12 @@ public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionSe
                 List<StrPreoperativeDiscussion> strPreoperativeDiscussionList= initData(list);
                 execute(strPreoperativeDiscussionList);
 
-                if(logSwitch){
-                    strPreoperativeDiscussionList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术前讨论小结-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-术前讨论小结-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -191,7 +172,7 @@ public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionSe
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.PREOPERATIVE_DISCUSSION.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrRescueNote;
-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.StrRescueNoteServiceImpl;
-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.AStrRescueNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrRescueNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrRescueNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrRescueNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrRescueNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
     private StrRescueNoteServiceImpl strRescueNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrRescueNote strRescueNote=new StrRescueNote();
         try {
-            AStrRescueNoteVO strRescueNoteVO=(AStrRescueNoteVO) MapUtil.mapToObject(entityMap, AStrRescueNoteVO.class);
+            StrRescueNoteVO strRescueNoteVO=(StrRescueNoteVO) MapUtil.mapToObject(entityMap, StrRescueNoteVO.class);
             BeanUtils.copyProperties(strRescueNoteVO,strRescueNote);
             strRescueNote.setHospitalId(hospitalId);//医院编码
 
@@ -114,7 +106,6 @@ public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("抢救记录", strRescueNote.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -153,22 +144,12 @@ public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
                 List<StrRescueNote> strRescueNoteList= initData(list);
                 execute(strRescueNoteList);
 
-                if(logSwitch){
-                    strRescueNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-抢救记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-抢救记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -195,7 +176,7 @@ public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.RESCUE_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,24 +1,21 @@
 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.StrTalkInform;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
-import com.diagbot.facade.data.ColumnFacade;
-import com.diagbot.service.impl.StrTalkInformServiceImpl;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrTalkInformVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTalkInform;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrTalkInformServiceImpl;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrTalkInformVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -32,10 +29,6 @@ public class StrTalkInformFacade extends StrTalkInformServiceImpl {
     private StrTalkInformServiceImpl strTalkInformService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -100,7 +93,6 @@ public class StrTalkInformFacade extends StrTalkInformServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病重通知单", strTalkInform.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -139,22 +131,12 @@ public class StrTalkInformFacade extends StrTalkInformServiceImpl {
                 List<StrTalkInform> strTalkInformList= initData(list);
                 execute(strTalkInformList);
 
-                if(logSwitch){
-                    strTalkInformList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-告知书记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-告知书记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }

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

@@ -1,24 +1,21 @@
 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.StrTransferInNote;
-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.StrTransferInNoteServiceImpl;
-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.AStrTransferInNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrTransferInNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTransferInNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrTransferInNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrTransferInNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -190,7 +187,7 @@ public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.TRANSFER_IN_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,23 @@
 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.StrTransferOutNote;
-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.StrTransferOutNoteServiceImpl;
-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.AStrTransferOutNoteVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrTransferOutNoteVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTransferOutNote;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrTransferOutNoteServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrTransferOutNoteVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +32,6 @@ public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
     private StrTransferOutNoteServiceImpl strTransferOutNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +80,7 @@ public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrTransferOutNote strTransferOutNote=new StrTransferOutNote();
         try {
-            AStrTransferOutNoteVO strTransferOutNoteVO=(AStrTransferOutNoteVO) MapUtil.mapToObject(entityMap, AStrTransferOutNoteVO.class);
+            StrTransferOutNoteVO strTransferOutNoteVO=(StrTransferOutNoteVO) MapUtil.mapToObject(entityMap, StrTransferOutNoteVO.class);
             BeanUtils.copyProperties(strTransferOutNoteVO,strTransferOutNote);
             strTransferOutNote.setHospitalId(hospitalId);//医院编码
             strTransferOutNote.setTransferInDate(DateUtil.parseDateTime(strTransferOutNoteVO.getTransferInDate()));
@@ -111,7 +102,6 @@ public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转出记录",strTransferOutNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -149,22 +139,12 @@ public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
                 //初始、格式化数据
                 List<StrTransferOutNote> strTransferOutNoteList= initData(list);
                 execute(strTransferOutNoteList);
-                if(logSwitch){
-                    strTransferOutNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转出记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转出记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -188,7 +168,7 @@ public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.TRANSFER_OUT_NOTE.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -1,28 +1,24 @@
 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.StrWardRecord;
-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.StrWardRecordServiceImpl;
-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.AStrWardRecordVO;
-import com.diagbot.vo.str.StrContentVO;
-import com.diagbot.vo.str.StrWardRecordVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrWardRecord;
+import com.lantone.data.enums.CacheKeyEnum;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.service.impl.dataStr.StrWardRecordServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.EntityUtil;
+import com.lantone.data.util.MapUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.StrContentVO;
+import com.lantone.data.vo.dataStr.StrWardRecordVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -37,10 +33,6 @@ public class StrWardRecordFacade extends StrWardRecordServiceImpl {
     private StrWardRecordServiceImpl strWardRecordService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -89,7 +81,7 @@ public class StrWardRecordFacade extends StrWardRecordServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrWardRecord strWardRecord=new StrWardRecord();
         try {
-            AStrWardRecordVO strWardRecordVO=(AStrWardRecordVO) MapUtil.mapToObject(entityMap, AStrWardRecordVO.class);
+            StrWardRecordVO strWardRecordVO=(StrWardRecordVO) MapUtil.mapToObject(entityMap, StrWardRecordVO.class);
             BeanUtils.copyProperties(strWardRecordVO,strWardRecord);
             strWardRecord.setHospitalId(hospitalId);//医院编码
 
@@ -113,7 +105,6 @@ public class StrWardRecordFacade extends StrWardRecordServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("查房记录", strWardRecord.getRecId(),JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -152,22 +143,12 @@ public class StrWardRecordFacade extends StrWardRecordServiceImpl {
                 List<StrWardRecord> strWardRecordList= initData(list);
                 execute(strWardRecordList);
 
-                if(logSwitch){
-                    strWardRecordList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-查房记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-查房记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }
@@ -191,7 +172,7 @@ public class StrWardRecordFacade extends StrWardRecordServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.WARD_RECORD.getName());
             Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+            Map<String, Object> wholeMap= MapUtil.objcetKeyConvert(columnMap,entityMap);
             t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }

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

@@ -2,19 +2,16 @@ 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 com.lantone.data.entity.BehospitalInfo;
+import com.lantone.data.entity.his.HisBehospitalInfo;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.data.BehospitalInfoFacade;
+import com.lantone.data.facade.his.HisBehospitalInfoFacade;
+import com.lantone.data.service.impl.BehospitalInfoServiceImpl;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.StringUtil;
+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;

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

@@ -2,7 +2,7 @@ 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.service.impl.DoctorAdviceServiceImpl;
 import com.lantone.data.vo.DataViewVO;
 import com.lantone.structure.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;

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

@@ -2,15 +2,15 @@ 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 com.lantone.data.entity.HomeDiagnoseInfo;
+import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.his.HisHomeDiagnoseInfoFacade;
+import com.lantone.data.service.impl.HomeDiagnoseInfoServiceImpl;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.StringUtil;
+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;

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

@@ -2,15 +2,15 @@ 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 com.lantone.data.entity.HomeOperationInfo;
+import com.lantone.data.entity.his.HisHomeOperationInfo;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.his.HisHomeOperationInfoFacade;
+import com.lantone.data.service.impl.HomeOperationInfoServiceImpl;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.StringUtil;
+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;

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

@@ -2,18 +2,16 @@ 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 com.lantone.data.entity.HomePage;
+import com.lantone.data.entity.his.HisHomePage;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.data.BehospitalInfoFacade;
+import com.lantone.data.facade.his.HisHomePageFacade;
+import com.lantone.data.service.impl.HomePageServiceImpl;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.StringUtil;
+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;

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

@@ -2,20 +2,16 @@ 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.entity.MedicalRecord;
+import com.lantone.data.entity.his.HisMedicalRecord;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.data.BehospitalInfoFacade;
+import com.lantone.data.facade.his.HisMedicalRecordFacade;
+import com.lantone.data.service.impl.MedicalRecordServiceImpl;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.StringUtil;
 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;

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

@@ -1,11 +1,11 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.DataViewVO;
+import com.lantone.data.entity.his.HisBehospitalInfo;
+import com.lantone.data.service.impl.his.HisBehospitalInfoServiceImpl;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

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

@@ -1,10 +1,10 @@
 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.util.StringUtil;
-import com.diagbot.vo.data.DataViewVO;
+import com.lantone.data.entity.his.HisDoctorAdvice;
+import com.lantone.data.service.impl.his.HisDoctorAdviceServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -2,11 +2,11 @@ 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.util.StringUtil;
-import com.diagbot.vo.data.DataViewVO;
+import com.lantone.data.entity.HomeDiagnoseInfo;
+import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.service.impl.his.HisHomeDiagnoseInfoServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -1,11 +1,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.util.StringUtil;
-import com.diagbot.vo.data.DataViewVO;
+import com.lantone.data.entity.his.HisHomeOperationInfo;
+import com.lantone.data.facade.data.HomeOperationInfoFacade;
+import com.lantone.data.service.impl.his.HisHomeOperationInfoServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -1,11 +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.util.StringUtil;
-import com.diagbot.vo.data.DataViewVO;
+import com.lantone.data.entity.HomePage;
+import com.lantone.data.entity.his.HisHomePage;
+import com.lantone.data.service.impl.his.HisHomePageServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -2,22 +2,23 @@ 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 com.lantone.data.entity.MedicalRecord;
+import com.lantone.data.entity.his.HisMedicalRecord;
+import com.lantone.data.entity.his.HisMedicalRecordContent;
+import com.lantone.data.service.impl.his.HisMedicalRecordContentServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.data.BehospitalInfoVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 @Component
 public class HisMedicalRecordContentFacade extends HisMedicalRecordContentServiceImpl {
-    public List<List<HisMedicalRecordContent>> getHisMedicalRecordContentData(List<ABehospitalInfoVO> aBehospitalInfoVO) {
+
+    public List<List<HisMedicalRecordContent>> getHisMedicalRecordContentData(List<BehospitalInfoVO> behospitalInfoVO) {
         List<List<HisMedicalRecordContent>> list = Lists.newLinkedList();
-        aBehospitalInfoVO.stream().forEach(s -> {
+        behospitalInfoVO.stream().forEach(s -> {
             List<HisMedicalRecordContent> hisMedicalRecordContent = this.baseMapper.selectList(new QueryWrapper<HisMedicalRecordContent>()
                     .eq("behospital_code", s.getBehospitalCode())
                     .eq("hospital_id", s.getHospitalId()));

data-service/src/main/java/com/lantone/data/mapper/BasDeptInfoMapper.java

@@ -0,0 +1,19 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.BasDeptInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 医院科室信息 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-27
+ */
+public interface BasDeptInfoMapper extends BaseMapper<BasDeptInfo> {
+
+    void updateBatchByKey(List<BasDeptInfo> list);
+}

data-service/src/main/java/com/lantone/data/mapper/BasDoctorInfoMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.BasDoctorInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-17
+ */
+public interface BasDoctorInfoMapper extends BaseMapper<BasDoctorInfo> {
+
+    public void updateBatchByKey(List<BasDoctorInfo> list) throws Exception;
+
+}

data-service/src/main/java/com/lantone/data/mapper/BasHospitalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.BasHospitalInfo;
+
+/**
+ * <p>
+ * 医院信息表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-12
+ */
+public interface BasHospitalInfoMapper extends BaseMapper<BasHospitalInfo> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/BehospitalInfoMapper.java

@@ -0,0 +1,24 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.BehospitalInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 住院病历信息 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
+    /**
+     * 根据两个主键-批量修改
+     *
+     * @param list
+     */
+    public void updateBatchByKey(List<BehospitalInfo> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/DoctorAdviceMapper.java

@@ -0,0 +1,19 @@
+package com.lantone.data.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.DoctorAdvice;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 病人医嘱 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface DoctorAdviceMapper extends BaseMapper<DoctorAdvice> {
+    public void updateBatchByKey(List<DoctorAdvice> list);
+}

data-service/src/main/java/com/lantone/data/mapper/HomeDiagnoseInfoMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.HomeDiagnoseInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HomeDiagnoseInfoMapper extends BaseMapper<HomeDiagnoseInfo> {
+
+    public void updateBatchByKey(List<HomeDiagnoseInfo> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/HomeOperationInfoMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.HomeOperationInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HomeOperationInfoMapper extends BaseMapper<HomeOperationInfo> {
+
+    public void updateBatchByKey(List<HomeOperationInfo> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/HomePageMapper.java

@@ -0,0 +1,24 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.HomePage;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface HomePageMapper extends BaseMapper<HomePage> {
+
+    /**
+     * 根据病案首页编码、医院编码、病人住院ID-批量更新
+     * @param list
+     */
+    public void updateBatchByKey(List<HomePage> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/LogInfoMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.LogInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-12-31
+ */
+public interface LogInfoMapper extends BaseMapper<LogInfo> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/MedCrisisInfoMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.MedCrisisInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 危急值信息 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-06-02
+ */
+public interface MedCrisisInfoMapper extends BaseMapper<MedCrisisInfo> {
+
+    public void updateBatchByKey(List<MedCrisisInfo> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/MedLisInfoMapper.java

@@ -0,0 +1,36 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExamineInfoDTO;
+import com.diagbot.dto.ExamineSonInfoDTO;
+import com.diagbot.entity.MedLisInfo;
+import com.diagbot.vo.ExamineInfoVO;
+import com.diagbot.vo.ExamineSonInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-07-28
+ */
+public interface MedLisInfoMapper extends BaseMapper<MedLisInfo> {
+    Map<String, Object> getTime(@Param("behospitalCode") String behospitalCode);
+
+    List<String> getBadExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos);
+
+    IPage<ExamineInfoDTO> getExamineInfo(@Param("examineInfoVO") ExamineInfoVO examineInfoVO, @Param("infos") Set<String> infos,@Param("badCheckInfo") List<String> badCheckInfo);
+
+    List<String> getInfo(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
+
+    IPage<ExamineSonInfoDTO> getExamineSonInfo(@Param("examineSonInfoVO") ExamineSonInfoVO examineSonInfoVO, @Param("infos") Set<String> infos);
+
+    void updateBatchByKey(List<MedLisInfo> list);
+}

data-service/src/main/java/com/lantone/data/mapper/MedLisResultMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.BehospitalInfo;
+import com.lantone.data.entity.MedLisResult;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-04
+ */
+public interface MedLisResultMapper extends BaseMapper<MedLisResult> {
+
+    void updateBatchByKey(List<MedLisResult> list);
+}

data-service/src/main/java/com/lantone/data/mapper/MedPacsInfoMapper.java

@@ -0,0 +1,32 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckInfoDTO;
+import com.diagbot.entity.MedPacsInfo;
+import com.diagbot.vo.CheckInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author cy
+ * @since 2020-09-04
+ */
+public interface MedPacsInfoMapper extends BaseMapper<MedPacsInfo> {
+
+    Map<String,Object> getTime(@Param("behospitalCode") String behospitalCode);
+
+
+    IPage<CheckInfoDTO> getCheckInfo(@Param("checkInfoVO") CheckInfoVO checkInfoVO, @Param("infos") Set<String> infos);
+
+    List<String> getInfo(@Param("hospitalId") Long hospitalId, @Param("behospitalCode") String behospitalCode);
+
+    void updateBatchByKey(List<MedPacsInfo> list);
+}

data-service/src/main/java/com/lantone/data/mapper/MedPacsResultMapper.java

@@ -0,0 +1,19 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.BehospitalInfo;
+import com.lantone.data.entity.MedPacsResult;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-08-04
+ */
+public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
+    void updateBatchByKey(List<MedPacsResult> list);
+}

data-service/src/main/java/com/lantone/data/mapper/MedicalRecordContentMapper.java

@@ -0,0 +1,20 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.MedicalRecordContent;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface MedicalRecordContentMapper extends BaseMapper<MedicalRecordContent> {
+
+    public void updateBatchByKey(List<MedicalRecordContent> list);
+
+}

data-service/src/main/java/com/lantone/data/mapper/MedicalRecordMapper.java

@@ -0,0 +1,19 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.MedicalRecord;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
+
+    public void updateBatchByKey(List<MedicalRecord> list);
+}

data-service/src/main/java/com/lantone/data/mapper/ModelHospitalMapper.java

@@ -0,0 +1,16 @@
+package com.lantone.data.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.data.entity.ModelHospital;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-05-15
+ */
+public interface ModelHospitalMapper extends BaseMapper<ModelHospital> {
+
+}

data-service/src/main/java/com/lantone/data/mapper/QcTypeMapper.java

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

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrOperativeNoteMapper.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.StrOperativeNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrOperativeNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrPeriodConclusionMapper.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.StrPeriodConclusion;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrPeriodConclusion;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrPreoperativeDiscussionMapper.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.StrPreoperativeDiscussion;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrPreoperativeDiscussion;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrRescueNoteMapper.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.StrRescueNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrRescueNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrTalkInformMapper.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.StrTalkInform;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTalkInform;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.dataStr;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.StrTotalInfo;
+import com.lantone.data.entity.dataStr.StrTotalInfo;
 
 /**
  * <p>

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrTransferInNoteMapper.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.StrTransferInNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTransferInNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrTransferOutNoteMapper.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.StrTransferOutNote;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrTransferOutNote;
 
 import java.util.List;
 

data-service/src/main/java/com/lantone/data/mapper/dataStr/StrWardRecordMapper.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.StrWardRecord;
+import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.entity.dataStr.StrWardRecord;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisBehospitalInfo;
+import com.lantone.data.entity.his.HisBehospitalInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisDoctorAdvice;
+import com.lantone.data.entity.his.HisDoctorAdvice;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisHomeOperationInfo;
+import com.lantone.data.entity.his.HisHomeOperationInfo;
 
 /**
  * <p>

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

@@ -1,5 +1,6 @@
 package com.lantone.data.mapper.his;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lantone.data.entity.his.HisHomePage;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisMedicalRecordContent;
+import com.lantone.data.entity.his.HisMedicalRecordContent;
 
 /**
  * <p>

data-service/src/main/java/com/lantone/data/service/BasDeptInfoService.java

@@ -0,0 +1,15 @@
+package com.lantone.data.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.BasDeptInfo;
+
+/**
+ * <p>
+ * 医院科室信息 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-04-27
+ */
+public interface BasDeptInfoService extends IService<BasDeptInfo> {
+}

data-service/src/main/java/com/lantone/data/service/data/BasDoctorInfoService.java

@@ -1,7 +1,7 @@
-package com.lantone.data.service.data;
+package com.lantone.data.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.BasDoctorInfo;
+import com.lantone.data.entity.BasDoctorInfo;
 
 /**
  * <p>