内容调整

data-service/pom.xml

@@ -18,13 +18,73 @@
         <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>
+        <swagger.version>2.9.2</swagger.version>
+        <fastjson.version>1.2.62</fastjson.version>
+        <hutool-all.version>5.4.0</hutool-all.version>
+        <spring-cloud.version>Hoxton.SR5</spring-cloud.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- 开启web-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+            <!--<scope>provided</scope>-->
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool-all.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
@@ -56,6 +116,45 @@
             <scope>compile</scope>
         </dependency>
 
+
+        <!--swagger-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+
+
+        <!-- mybatisplus 代码生成器所依赖的jar包 包括3种不同类型的模板依赖-->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.29</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ibeetl</groupId>
+            <artifactId>beetl</artifactId>
+            <version>3.0.13.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!--消息中心-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
+
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -63,14 +162,19 @@
             <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
             <version>${mybatis-plus-boot-starter.version}</version>
-        </dependency>
+        </dependency>-->
         <!-- mybatis-plus end -->
 
-
+        <!-- 阿里巴巴druid数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
+        </dependency>
 
         <!-- springboot整合mybatis（核心就这一个） -->
         <!-- 注意顺序，这个一定要放在最下面 -->
@@ -80,20 +184,41 @@
             <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
-        <!--消息中心-->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.3.1</version>
         </dependency>
+
+        <!-- oracle数据库依赖 依赖 -->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>${ojdbc6.version}</version>
+        </dependency>
+
+        <!-- mysql数据库依赖 依赖 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
+
         <dependency>
             <groupId>io.github.lvyahui8</groupId>
-            <artifactId>spring-boot-data-aggregator-core</artifactId>
+            <artifactId>spring-boot-data-aggregator-starter</artifactId>
             <version>1.1.3</version>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.3.1</version>
+            <groupId>io.github.lvyahui8</groupId>
+            <artifactId>spring-boot-data-aggregator-core</artifactId>
+            <version>1.1.3</version>
         </dependency>
     </dependencies>
 

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

@@ -1,19 +1,22 @@
 package com.lantone;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableEurekaClient
 @EnableFeignClients({ "com.lantone.data.client" })
+@ConfigurationPropertiesScan
+@MapperScan("com.lantone.data.mapper")
 public class DataServiceApplication{
 
     public static void main(String[] args) {

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

@@ -1,12 +1,15 @@
 package com.lantone.data.aggregate;
 
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.his.VLtBehospitalInfo;
 import com.lantone.data.facade.dataView.ViewBehospitalInfoFacade;
 import com.lantone.data.facade.dataView.ViewDoctorAdviceFacade;
 import com.lantone.data.facade.dataView.ViewHomePageFacade;
 import com.lantone.data.facade.dataView.ViewMRecordFacade;
 import com.lantone.data.vo.DataViewVO;
-import com.lantone.structure.dto.RespDTO;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

data-service/src/main/java/com/lantone/data/config/RedisConfigurer.java

@@ -0,0 +1,202 @@
+package com.lantone.data.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettucePoolingClientConfiguration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+
+@Configuration
+@EnableCaching
+@Slf4j
+public class RedisConfigurer extends CachingConfigurerSupport {
+
+    @Value("${spring.redis.database.cache}")
+    private String databaseCache;
+    @Value("${spring.redis.database.token}")
+    private String databaseMr;
+    @Value("${spring.redis.host}")
+    private String host;
+    @Value("${spring.redis.password}")
+    private String password;
+    @Value("${spring.redis.port}")
+    private int port;
+    @Value("${spring.redis.timeout}")
+    private int timeout;
+    @Value("${spring.redis.lettuce.pool.max-active}")
+    private int maxActive;
+    @Value("${spring.redis.lettuce.pool.max-idle}")
+    private int maxIdle;
+    @Value("${spring.redis.lettuce.pool.max-wait}")
+    private long maxWaitMillis;
+    @Value("${spring.redis.lettuce.pool.min-idle}")
+    private int minIdle;
+
+    @Autowired
+    @Qualifier("factoryForCache")
+    private LettuceConnectionFactory lettuceConnectionFactory;
+
+    @Bean
+    public GenericObjectPoolConfig getRedisConfig() {
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+        poolConfig.setMaxTotal(maxActive);
+        poolConfig.setMaxIdle(maxIdle);
+        poolConfig.setMaxWaitMillis(maxWaitMillis);
+        poolConfig.setMinIdle(minIdle);
+        return poolConfig;
+    }
+
+    @Bean
+    @Override
+    public CacheManager cacheManager() {
+        RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
+                // 设置 key为string序列化
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                // 设置value为json序列化
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(getSerializer()))
+                // 不缓存空值
+                .disableCachingNullValues();
+        RedisCacheManager cacheManager = RedisCacheManager.builder(lettuceConnectionFactory)
+                .cacheDefaults(redisCacheConfiguration)
+                .transactionAware()
+                .build();
+        cacheManager.afterPropertiesSet();
+        log.info("RedisCacheManager config success");
+        return cacheManager;
+    }
+
+    @Bean(name = "springSessionDefaultRedisSerializer")
+    public GenericJackson2JsonRedisSerializer getGenericJackson2JsonRedisSerializer() {
+        return new GenericJackson2JsonRedisSerializer();
+    }
+
+    /**
+     * 缓存使用的redis
+     *
+     * @return
+     */
+    @Bean("factoryForCache")
+    @Primary
+    public LettuceConnectionFactory redisConnectionFactory() {
+        return getRedisConnectionFactory(Integer.valueOf(databaseCache));
+    }
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        return getRedisTemplate(lettuceConnectionFactory);
+    }
+
+    private Jackson2JsonRedisSerializer getSerializer() {
+        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jackson2JsonRedisSerializer.setObjectMapper(om);
+        return jackson2JsonRedisSerializer;
+    }
+
+    @Bean
+    @Override
+    public KeyGenerator keyGenerator() {
+        //  设置自动key的生成规则，配置spring boot的注解，进行方法级别的缓存
+        // 使用：进行分割，可以很多显示出层级关系
+        // 这里其实就是new了一个KeyGenerator对象
+        return (target, method, params) -> {
+            StringBuilder sb = new StringBuilder();
+            sb.append(target.getClass().getName());
+            sb.append(":");
+            sb.append(method.getName());
+            for (Object obj : params) {
+                sb.append(":" + String.valueOf(obj));
+            }
+            String rsToUse = String.valueOf(sb);
+            log.info("自动生成Redis Key -> [{}]", rsToUse);
+            return rsToUse;
+        };
+    }
+
+    /**
+     * Token使用的redis
+     *
+     * @return
+     */
+    @Bean("factoryForToken")
+    public LettuceConnectionFactory redisConnectionFactoryForToken() {
+        return getRedisConnectionFactory(Integer.valueOf(databaseMr));
+    }
+
+    @Bean(name = "redisTemplateForToken")
+    public RedisTemplate<String, Object> redisTemplateForToken(@Qualifier("factoryForToken") LettuceConnectionFactory factory) {
+        return getRedisTemplate(factory);
+    }
+
+    /**
+     * 表字段和注释使用的redis
+     *
+     * @return
+     */
+    @Bean("factoryForTable")
+    public LettuceConnectionFactory redisConnectionFactoryForTable() {
+        return getRedisConnectionFactory(Integer.valueOf(databaseMr));
+    }
+
+    @Bean(name = "redisTemplateForTable")
+    public RedisTemplate<String, Object> redisTemplateForTable(@Qualifier("factoryForTable") LettuceConnectionFactory factory) {
+        return getRedisTemplate(factory);
+    }
+
+
+    private LettuceConnectionFactory getRedisConnectionFactory(Integer database) {
+        RedisStandaloneConfiguration connection = new RedisStandaloneConfiguration();
+        connection.setHostName(host);
+        connection.setPort(port);
+        connection.setPassword(password);
+        connection.setDatabase(database);
+        GenericObjectPoolConfig poolConfig = getRedisConfig();
+        LettuceClientConfiguration builder = LettucePoolingClientConfiguration.builder()
+                .commandTimeout(Duration.ofMillis(timeout))
+                .poolConfig(poolConfig)
+                .shutdownTimeout(Duration.ZERO)
+                .build();
+        LettuceConnectionFactory factory = new LettuceConnectionFactory(connection, builder);
+        return factory;
+    }
+
+    private RedisTemplate<String, Object> getRedisTemplate(LettuceConnectionFactory factory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(factory);
+
+        // value值的序列化
+        redisTemplate.setValueSerializer(getSerializer());
+        redisTemplate.setHashValueSerializer(getSerializer());
+        // key的序列化采用StringRedisSerializer
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+        redisTemplate.afterPropertiesSet();
+        return redisTemplate;
+    }
+}
+ 

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

@@ -0,0 +1,28 @@
+package com.lantone.data.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/15 12:24
+ */
+@Getter
+@Setter
+public class AnalyzeRunDTO {
+    //得分
+    private BigDecimal scoreRes;
+    //等级
+    private String level;
+    //缺陷总数
+    private Long num;
+    //缺陷总扣分
+    private BigDecimal numScore;
+    // 缺陷条目
+    private List<MsgDTO> msgDTOList = new ArrayList<>();
+}

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

@@ -0,0 +1,65 @@
+package com.lantone.data.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/14 13:07
+ */
+@Getter
+@Setter
+public class MsgDTO {
+    //明细主键
+    private Long id;
+    //得分
+    private BigDecimal score;
+    //提示信息
+    private String msg;
+    // 控费标识(1：是控费条目，2：不是控费条目)
+    private Integer drgs;
+    // 质控形式(1：形式质控，2：内涵质控)
+    private Integer type;
+    //提示信息
+    private String code;
+    //提示信息
+    private String info;
+    //标准提示信息
+    private String standardMsg;
+    // 操作类型(1：新增，2：删除，3：修改)
+    private Integer optType;
+    // 初始类型(1：机器，2：人工)
+    private Integer gradeType;
+    //单项否决
+    private String isReject;
+    //模块名称
+    private String modelName;
+    //模块id
+    private String modelId;
+    //模块ID
+    private Long casesId;
+    //模块分数
+    private BigDecimal casesScore;
+    // 条目ID
+    private Long casesEntryId;
+    // 记录创建时间
+    private Date gmtCreate;
+    // 记录修改时间,如果时间是1970年则表示纪录未修改
+    private Date gmtModified;
+    // 记录修改人id
+    private String modifier;
+    // 记录修改人姓名
+    private String linkman;
+    // 逻辑删除标志位
+    private String isDeleted;
+    // 缺陷说明
+    private String explainInfo;
+    // 条目id对应页面数据的key值
+    private List<Long> pageKeyList = new ArrayList<>();
+}

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

@@ -0,0 +1,32 @@
+package com.lantone.data.dto;
+
+import java.io.Serializable;
+
+public class RespDTO<T> implements Serializable {
+    
+    public String code = "0";
+    public String msg = "";
+    public T data;
+
+    public static RespDTO onSuc(Object data) {
+        RespDTO resp = new RespDTO();
+        resp.data = data;
+        return resp;
+    }
+
+    public static RespDTO onError(String errMsg) {
+        RespDTO resp = new RespDTO();
+        resp.code = "-1";
+        resp.msg = errMsg;
+        return resp;
+    }
+
+    @Override
+    public String toString() {
+        return "RespDTO{" +
+                "code=" + code +
+                ", error='" + msg + '\'' +
+                ", data=" + data +
+                '}';
+    }
+}

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

@@ -1,31 +1,25 @@
 package com.lantone.data.facade;
 
-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;
 
 @Slf4j
 @Component
 public class ColumnFacade extends ColumnServiceImpl {
-    @Autowired
+   /* @Autowired
     private QcClientFacade qcClientFacade;
 
-    /**
+    *//**
      * 解析
      * @param queryVo
-     */
+     *//*
     public void analyseRec(QueryVo queryVo) {
         try {
             Response<OutputInfo> resp=qcClientFacade.analyseField(queryVo);
@@ -51,11 +45,11 @@ public class ColumnFacade extends ColumnServiceImpl {
 
     }
 
-    /**
+    *//**
      * @Description:解析his传输过来的wholeData
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
-     **/
+     **//*
     public void analyseWholeData(StrContentVO strContentVO) throws Exception{
         //调用解析接口
         Response<OutputInfo> resp=null;
@@ -76,7 +70,7 @@ public class ColumnFacade extends ColumnServiceImpl {
                 });
             });
         }
-    }
+    }*/
 
     /**
      * @Description: 不解析时，先入库

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.lantone.data.entity.BasDeptInfo;
 import com.lantone.data.service.impl.BasDeptInfoServiceImpl;
+import com.lantone.data.util.BeanUtil;
 import com.lantone.data.vo.data.BasDeptInfoVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,11 +27,11 @@ public class BasDeptInfoFacade extends BasDeptInfoServiceImpl {
      * @param list
      * @return
      */
-    public RespDTO<List<BasDeptInfoDTO>> executeDept(List<BasDeptInfoVO> list) {
+    public RespDTO executeDept(List<BasDeptInfoVO> list) {
         try{
             if(list!=null && list.size()>0){
                 List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
-                basDeptInfoList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+                basDeptInfoList= BeanUtil.listCopyTo(list,BasDeptInfo.class);
 
                 //循环验证数据有效性
                 for (BasDeptInfo basDeptInfo:basDeptInfoList) {

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

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.lantone.data.entity.BasDoctorInfo;
 import com.lantone.data.service.impl.BasDoctorInfoServiceImpl;
+import com.lantone.data.util.BeanUtil;
 import com.lantone.data.util.RedisUtil;
 import com.lantone.data.vo.data.BasDoctorInfoVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,28 +21,22 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Autowired
     @Qualifier("basDoctorInfoServiceImpl")
     private BasDoctorInfoServiceImpl basDoctorInfoService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     private static final String DOCTORS = "doctors::";
 
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private VisibleIdCreater visibleIdCreater;
 
     /**
      * 从接口接收医生信息
      * @param list
      * @return
      */
-    public RespDTO<List<BasDoctorInfoDTO>> executeDoctor(List<BasDoctorInfoVO> list) {
+    public RespDTO executeDoctor(List<BasDoctorInfoVO> list) {
         try {
             if(list!=null && list.size()>0){
                 List<BasDoctorInfo> basDoctorInfoList=Lists.newArrayList();
-                basDoctorInfoList=BeanUtil.listCopyTo(list,BasDoctorInfo.class);
+                basDoctorInfoList= BeanUtil.listCopyTo(list,BasDoctorInfo.class);
                 //循环验证数据有效性
                 for (BasDoctorInfo basDoctorInfo:basDoctorInfoList) {
                     if("".equals(basDoctorInfo.getDoctorId())) {
@@ -51,28 +46,23 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
                     }
                 }
 
-                //execute(basDoctorInfoList);
+                execute(basDoctorInfoList);
 
-                String mrId = visibleIdCreater.getNextId(9).toString();
+                /*String mrId = visibleIdCreater.getNextId(9).toString();
                 Boolean flag=redisUtil.setFlag(DOCTORS+mrId,basDoctorInfoList);
 
-                if(logSwitch){
-                    basDoctorInfoList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("医生信息-正常","", JSON.toJSONString(list),"","");
-                    });
-                }
                 if(flag){
                     return RespDTO.onSuc("操作正常！");
                 }else{
                     return RespDTO.onError(DOCTORS+"数据存储到REDIS异常!");
                 }
-                //return RespDTO.onSuc("操作正常！");
+                */
+                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("数据处理异常，详情查看日志表");
         }
     }

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

@@ -1,6 +1,5 @@
 package com.lantone.data.facade.data;
 
-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.google.common.collect.Lists;
@@ -9,12 +8,13 @@ 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.BeanUtil;
 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 com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;

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

@@ -6,11 +6,12 @@ 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.BeanUtil;
 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 com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;

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

@@ -1,64 +1,48 @@
 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.dto.data.AHomeDiagnoseDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
-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.AHomeDiagnoseVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.HomeDiagnoseInfo;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.HomeDiagnoseInfoServiceImpl;
+import com.lantone.data.util.BeanUtil;
+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 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 HomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
+public class HomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
 
     @Autowired
     @Qualifier("homeDiagnoseInfoServiceImpl")
     private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 数据引擎-通过接口更新病案首页诊断
      * @param list
      * @return
      */
-    public RespDTO<List<AHomeDiagnoseDTO>> executeHomeDiagnose(List<AHomeDiagnoseVO> list) {
+    public RespDTO executeHomeDiagnose(List<HomeDiagnoseVO> list) {
         try{
             if(list!=null && list.size()>0){
                 List<HomeDiagnoseInfo> homeDiagnoseList=Lists.newArrayList();
-                homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
+                homeDiagnoseList= BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
                 execute(homeDiagnoseList);
-                if(logSwitch){
-                    homeDiagnoseList.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("数据处理异常，详情查看日志表");
         }
 
@@ -93,7 +77,7 @@ public class HomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
             if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
@@ -116,7 +100,6 @@ public class HomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                 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/HomeOperationInfoFacade.java

@@ -3,17 +3,16 @@ 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.HomeOperationInfo;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
-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.AHomeOperationVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.HomeOperationInfo;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.HomeOperationInfoServiceImpl;
+import com.lantone.data.util.BeanUtil;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DeleteFlagVO;
+import com.lantone.data.vo.data.HomeOperationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,24 +22,18 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
+public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
 
     @Autowired
     @Qualifier("homeOperationInfoServiceImpl")
     private HomeOperationInfoServiceImpl homeOperationInfoService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 终末质控-通过接口更新病案首页手术
      * @param list
      * @return
      */
-    public RespDTO executeHomeOperation(List<AHomeOperationVO> list) {
+    public RespDTO executeHomeOperation(List<HomeOperationVO> list) {
         try {
             List<HomeOperationInfo> homeOperationList=Lists.newArrayList();
             if(list!=null && list.size()>0){
@@ -51,18 +44,12 @@ public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                     homeOperationList.add(homeOperationInfo);
                 });
                 execute(homeOperationList);
-                if(logSwitch){
-                    homeOperationList.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("数据处理异常，详情查看日志表");
         }
     }
@@ -97,7 +84,7 @@ public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
             if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
@@ -116,11 +103,9 @@ public class HomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new HomeOperationInfo(),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

@@ -3,17 +3,20 @@ package com.lantone.data.facade.data;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.AnalyzeRunDTO;
 import com.lantone.data.entity.HomePage;
 import com.lantone.data.enums.IsDeleteEnum;
 import com.lantone.data.service.impl.HomePageServiceImpl;
+import com.lantone.data.util.BeanUtil;
 import com.lantone.data.util.DateUtil;
 import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.AnalyzeRunVO;
 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 com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,10 +35,10 @@ public class HomePageFacade extends HomePageServiceImpl {
     private HomePageServiceImpl homePageService;
 
     @Autowired
-    private com.diagbot.facade.data.AHomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
+    private HomeDiagnoseInfoFacade aHomeDiagnoseInfoFacade;
 
     @Autowired
-    private com.diagbot.facade.data.AHomeOperationInfoFacade aHomeOperationInfoFacade;
+    private HomeOperationInfoFacade aHomeOperationInfoFacade;
 
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
@@ -43,17 +46,12 @@ public class HomePageFacade extends HomePageServiceImpl {
     @Autowired
     private ReadProperties readProperties;
 
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
     @Value("${log_switch.enable}")
     private boolean logSwitch;
 
     @Value("${xml_analyse.enable}")
     private boolean xmlAnalyse;
 
-    private TZDBConn tzDBConn = new TZDBConn();
-
     /**
      * 运行质控-验证数据有效性
      * @param aHomePageIngVO
@@ -132,7 +130,6 @@ public class HomePageFacade extends HomePageServiceImpl {
             execute(homePageList);
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
         }
     }
 
@@ -281,7 +278,6 @@ public class HomePageFacade extends HomePageServiceImpl {
                 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/LogInfoFacade.java

@@ -1,6 +1,6 @@
 package com.lantone.data.facade.data;
 
-import com.diagbot.service.impl.LogInfoServiceImpl;
+import com.lantone.data.service.impl.LogInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
 @Component

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

@@ -1,28 +0,0 @@
-package com.lantone.data.facade.data;
-
-import com.diagbot.entity.MedAbnormalInfo;
-import com.diagbot.service.impl.MedAbnormalInfoServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Component
-public class MedAbnormalInfoFacade extends MedAbnormalInfoServiceImpl {
-    /**
-     * 接口日志记录
-     *
-     * @param paramIn
-     * @param paramOut
-     * @param remark
-     */
-    public void saveAbnormalInfo(String moduleName, String recId, String paramIn, String paramOut, String remark) {
-        MedAbnormalInfo medAbnormalInfo = new MedAbnormalInfo();
-        medAbnormalInfo.setModuleName(moduleName);
-        medAbnormalInfo.setRecId(recId);
-        medAbnormalInfo.setParamIn(paramIn);
-        medAbnormalInfo.setParamOut(paramOut);
-        medAbnormalInfo.setRamark(remark);
-        medAbnormalInfo.setGmtCreate(new Date());
-        this.save(medAbnormalInfo);
-    }
-}

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

@@ -1,15 +1,10 @@
 package com.lantone.data.facade.data;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AMedCrisisDTO;
-import com.diagbot.entity.MedCrisisInfo;
-import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.vo.data.AMedCrisisVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.MedCrisisInfo;
+import com.lantone.data.util.BeanUtil;
+import com.lantone.data.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.lantone.data.entity.MedRecordType;
 import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.util.BeanUtil;
 import com.lantone.data.vo.data.MedicalRecordTypeVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -19,8 +20,6 @@ public class MedRecordTypeFacade extends MedRecordTypeServiceImpl {
     @Autowired
     @Qualifier("medRecordTypeServiceImpl")
     private MedRecordTypeServiceImpl medRecordTypeService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
     /**
      * 数据引擎-通过接口更新病人住院记录信息
@@ -41,7 +40,7 @@ public class MedRecordTypeFacade extends MedRecordTypeServiceImpl {
             }
             List<MedRecordType> medRecordTypeList=Lists.newArrayList();
             List<MedicalRecordTypeDTO> medRecordTypeDtoList=Lists.newArrayList();
-            medRecordTypeList=BeanUtil.listCopyTo(list,MedRecordType.class);
+            medRecordTypeList= BeanUtil.listCopyTo(list,MedRecordType.class);
             medRecordTypeDtoList=BeanUtil.listCopyTo(list,MedicalRecordTypeDTO.class);
             execute(medRecordTypeList);
             return RespDTO.onSuc(medRecordTypeDtoList);

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

@@ -1,20 +1,17 @@
 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.dto.data.AMedicalRecordContentDTO;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-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.AMedicalRecordContentVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.MedicalRecordContent;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.MedicalRecordContentServiceImpl;
+import com.lantone.data.util.BeanUtil;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DeleteFlagVO;
+import com.lantone.data.vo.data.MedicalRecordContentVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,39 +21,22 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl{
+public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl {
 
     @Qualifier("medicalRecordContentServiceImpl")
     @Autowired
     private MedicalRecordContentServiceImpl medicalRecordContentService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天的病历详细记录
-     */
-    public void executeMrRecordContent() {
-        //String sql="select * from mr_mrcontent  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select BLJLID,BLJLNR from mr_mrcontent  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<MedicalRecordContent> mrContentList = tzDBConn.getMedicalRecordContent(sql);
-        execute(mrContentList);
-    }
 
     /**
      * 数据引擎-通过接口更新病历内容
      * @param list
      * @return
      */
-    public RespDTO<List<AMedicalRecordContentDTO>> executeMrRecordContent(List<AMedicalRecordContentVO> list) {
+    public RespDTO executeMrRecordContent(List<MedicalRecordContentVO> list) {
         if(list!=null && list.size()>0) {
-            List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
-            List<AMedicalRecordContentDTO> mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
+            List<MedicalRecordContent> mrContentList= BeanUtil.listCopyTo(list,MedicalRecordContent.class);
             execute(mrContentList);
-            return RespDTO.onSuc(mrContentDtoList);
+            return RespDTO.onSuc("操作正常！");
         }else{
             return RespDTO.onError("未接收到数据!");
         }
@@ -83,7 +63,6 @@ public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl{
                     }
                     }catch (Exception e){
                         log.error(e.getMessage(),e);
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",s.getRecId(), JSON.toJSONString(mrContentList),"",e.getMessage());
                     }
                 });
             }
@@ -98,7 +77,7 @@ public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl{
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(DeleteFlagVO aDeleteFlagVO){
         try {
             //验证数据是否存在
             if (StringUtil.isEmpty(aDeleteFlagVO.getRecId())) {
@@ -118,7 +97,6 @@ public class MedicalRecordContentFacade extends MedicalRecordContentServiceImpl{
                 return RespDTO.onSuc(flag);
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("文书内容",aDeleteFlagVO.getRecId(),JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

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

@@ -3,21 +3,24 @@ 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.RecordContentDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.AMedicalRecordDTO;
-import com.diagbot.entity.*;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.ModeIdEnum;
-import com.diagbot.facade.*;
-import com.diagbot.service.impl.MedicalRecordServiceImpl;
-import com.diagbot.util.*;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.MedrecVo;
-import com.diagbot.vo.QueryVo;
-import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.AnalyzeRunDTO;
+import com.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.*;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.enums.ModeIdEnum;
+import com.lantone.data.facade.ModelHospitalFacade;
+import com.lantone.data.facade.QcTypeFacade;
+import com.lantone.data.service.impl.MedicalRecordServiceImpl;
+import com.lantone.data.util.*;
+import com.lantone.data.vo.AnalyzeRunVO;
+import com.lantone.data.vo.ColumnContentVO;
+import com.lantone.data.vo.HisDataDealVO;
+import com.lantone.data.vo.data.MedicalRecordContentVO;
+import com.lantone.data.vo.data.MedicalRecordVO;
+import com.lantone.data.vo.data.MrContentVO;
+import com.lantone.structure.model.vo.MedrecVo;
+import com.lantone.structure.model.vo.QueryVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -76,10 +79,10 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
      * @param list
      * @return
      */
-    public RespDTO<List<AMedicalRecordDTO>> executeMrRecord(List<AMedicalRecordVO> list) {
+    public RespDTO executeMrRecord(List<MedicalRecordVO> list) {
         if (list != null && list.size() > 0) {
             //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : list) {
+            for (MedicalRecordVO aMedicalRecordVO : list) {
                 if ("".equals(aMedicalRecordVO.getRecId())) {
                     return RespDTO.onError("请输入文书序号!");
                 } else if (aMedicalRecordVO.getHospitalId() == null) {
@@ -99,7 +102,6 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
             });
             execute(medicalRecordList);
 
-            List<AMedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(list, AMedicalRecordDTO.class);
             return RespDTO.onSuc("操作成功!");
         } else {
             return RespDTO.onError("未接收到数据!");
@@ -137,13 +139,13 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
                             }
                         }
 
-                        List<AMedicalRecordContentVO> contents = BeanUtil.listCopyTo(medicalRecordContentList, AMedicalRecordContentVO.class);
-                        AMedicalRecordVO aMedicalRecordVO = new AMedicalRecordVO();
+                        List<MedicalRecordContentVO> contents = BeanUtil.listCopyTo(medicalRecordContentList, AMedicalRecordContentVO.class);
+                        MedicalRecordVO aMedicalRecordVO = new MedicalRecordVO();
                         BeanUtil.copyProperties(medicalRecord, aMedicalRecordVO);
                         aMedicalRecordVO.setContents(contents);
-                        List<AMedicalRecordVO> records = Lists.newArrayList();
+                        List<MedicalRecordVO> records = Lists.newArrayList();
                         records.add(aMedicalRecordVO);
-                        AMrContentVO aMrContentVO = new AMrContentVO();
+                        MrContentVO aMrContentVO = new MrContentVO();
                         aMrContentVO.setRecords(records);
                         splicingParam(aMrContentVO);
                     }
@@ -179,16 +181,16 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
      *
      * @param aMrContentVO
      */
-    public void splicingParam(AMrContentVO aMrContentVO) {
+    public void splicingParam(MrContentVO aMrContentVO) {
 
             try {
                 QueryVo queryVo = new QueryVo();
                 List<MedrecVo> medreclist = Lists.newArrayList();
 
-                List<AColumnContentVO> content = Lists.newArrayList();
+                List<ColumnContentVO> content = Lists.newArrayList();
                 aMrContentVO.getRecords().stream().forEach(s -> {
                     queryVo.setHospitalId(s.getHospitalId().toString());
-                    queryVo.setCid(basHospitalInfoFacade.getHosCode(s.getHospitalId()));
+                    //queryVo.setCid(basHospitalInfoFacade.getHosCode(s.getHospitalId()));
                     Long modeId ;
                     if (null == s.getModeId()) {
                         modeId = initModeId(s.getHospitalId(), s.getRecTypeId());
@@ -197,7 +199,7 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
                     }
                     s.getContents().stream().forEach(item -> {
                         //拼接入参用于结构化解析
-                        AColumnContentVO aColumnContentVO = new AColumnContentVO();
+                        ColumnContentVO aColumnContentVO = new ColumnContentVO();
                         aColumnContentVO.setModeId(modeId);
                         aColumnContentVO.setStandModelName(ModeIdEnum.getName(Integer.parseInt(modeId.toString())));
                         aColumnContentVO.setRecId(s.getRecId());
@@ -212,7 +214,7 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
                     List<Map<String, Object>> returnData = new ArrayList<>();
                     String keyNname = ModeIdEnum.getName(Integer.parseInt(modeId.toString()));
                     Map<String, List<Map<String, Object>>> returnMap = new HashMap<>();
-                    for (AColumnContentVO aColumnContentVO : content) {
+                    for (ColumnContentVO aColumnContentVO : content) {
                         try {
                             Map<String, Object> objectMap = MapUtil.objectToMap(aColumnContentVO);
                             returnData.add(objectMap);
@@ -230,10 +232,9 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
                 });
                 queryVo.setMedrec(medreclist);
 
-                columnFacade.analyseRec(queryVo);
+                //columnFacade.analyseRec(queryVo);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
-                aMedAbnormalInfoFacade.saveAbnormalInfo("参数拼接", "", JSON.toJSONString(aMrContentVO), "", e.getMessage());
             }
         }
 
@@ -244,10 +245,10 @@ public class MedicalRecordFacade extends MedicalRecordServiceImpl {
      * @param aMrContentVO
      * @return
      */
-    public RespDTO<Map<String, Object>> executeMrRecordIng(AMrContentVO aMrContentVO) {
+    public RespDTO<Map<String, Object>> executeMrRecordIng(MrContentVO aMrContentVO) {
         if (aMrContentVO.getRecords() != null && aMrContentVO.getRecords().size() > 0) {
             //循环验证数据有效性
-            for (AMedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
+            for (MedicalRecordVO aMedicalRecordVO : aMrContentVO.getRecords()) {
                 if ("".equals(aMedicalRecordVO.getRecId())) {
                     return RespDTO.onError("请输入文书序号!");
                 } else if (aMedicalRecordVO.getHospitalId() == null) {

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

@@ -2,16 +2,17 @@ package com.lantone.data.facade.dataStr;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrAdmissionNote;
+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.StrAdmissionNoteServiceImpl;
 import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.MapUtil;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.StrContentVO;
 import com.lantone.data.vo.dataStr.StrAdmissionNoteVO;
-import com.lantone.structure.dto.RespDTO;
-import com.lantone.structure.util.MapUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -174,9 +175,9 @@ public class StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
                 t.setAuditDate(DateUtil.parseDateTime(s.getAuditDate()));//审核时间
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BEHOSPITAL_INFO.getName());
-            Map<String, Object> entityMap=MapUtil.objectToMap(s);
+            Map<String, Object> entityMap= MapUtil.objectToMap(s);
             Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
-            t.setWholeData(JSON.toJSONString(wholeMap));
+            //t.setWholeData(JSON.toJSONString(wholeMap));
             strAdmissionNoteList.add(t);
         }
         return strAdmissionNoteList;

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

@@ -1,18 +1,20 @@
 package com.lantone.data.facade.dataStr;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrBloodResult;
+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.StrBloodResultServiceImpl;
 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.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;
@@ -81,7 +83,7 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrBloodResult strBloodResult=new StrBloodResult();
         try {
-            AStrBloodResultVO strBloodResultVO=(AStrBloodResultVO) MapUtil.mapToObject(entityMap, AStrBloodResultVO.class);
+            StrBloodResultVO strBloodResultVO=(StrBloodResultVO) MapUtil.mapToObject(entityMap, StrBloodResultVO.class);
             BeanUtils.copyProperties(strBloodResultVO,strBloodResult);
             strBloodResult.setHospitalId(hospitalId);//医院编码
             strBloodResult.setAuditDate(DateUtil.parseDateTime(strBloodResultVO.getAuditDate()));//审核时间
@@ -103,7 +105,6 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("输血效果评价",strBloodResult.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -147,22 +148,12 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
                 List<StrBloodResult> strBloodResultList= initData(list);
                 execute(strBloodResultList);
 
-                if(logSwitch){
-                    strBloodResultList.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("数据处理异常，详情查看日志表");
         }
     }
@@ -183,7 +174,7 @@ public class StrBloodResultFacade extends StrBloodResultServiceImpl {
             }
             Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_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/StrBloodTransfusionFacade.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrBloodTransfusion;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;
@@ -216,7 +216,6 @@ public class StrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-入院记录","", JSON.toJSONString(list),"",e.getMessage());
         }
     }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrConsultationApply;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrConsultationNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrConsultationRecord;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrConsultationResult;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -6,10 +6,13 @@ package com.lantone.data.facade.dataStr;
  * @time: ${DATE} ${TIME}
  **/
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.ModelHospital;
 import com.lantone.data.entity.dataStr.StrTotalInfo;
 import com.lantone.data.facade.ColumnFacade;
+import com.lantone.data.facade.ModelHospitalFacade;
 import com.lantone.data.vo.StrContentVO;
-import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,9 +23,6 @@ import java.util.Date;
 @Component
 public class StrContentFacade {
 
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -53,7 +53,7 @@ public class StrContentFacade {
                     //是否进行xml、html、json解析为标准结构化
                     if(xmlAnalyse){
                         //解析时，调用解析接口
-                        columnFacade.analyseWholeData(strContentVO);
+                        //columnFacade.analyseWholeData(strContentVO);
                     }else{
                         //不解析时，只存储入库
                         columnFacade.addWholeData(strContentVO);
@@ -66,13 +66,9 @@ public class StrContentFacade {
                     strTotalInfoFacade.save(strTotalInfo);
                 }
 
-                if(logSwitch){
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-文书-正常", strContentVO.getRecId(), JSON.toJSONString(strContentVO), "", ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())));
-                }
                 return RespDTO.onSuc("操作正常！");
             }
         }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-文书-异常", ModeIdEnum.getName(Integer.parseInt(strContentVO.getModelId())), JSON.toJSONString(strContentVO), "", e.getMessage());
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrCrisisNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrDeathDiscussion;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrDeathNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrDifficultCase;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;
@@ -172,7 +172,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);
-            t.setWholeData(JSON.toJSONString(wholeMap));
+            //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }
         return tList;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrFirstRecord;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrIllCritically;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrIllSeriousl;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrInformedConsent;
 import com.lantone.data.enums.IsDeleteEnum;
 import com.lantone.data.facade.ColumnFacade;
@@ -12,7 +13,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrLeaveHospital;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrOperativeFirstRecord;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrOperativeNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrPeriodConclusion;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrPreoperativeDiscussion;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrRescueNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrTalkInform;
 import com.lantone.data.enums.IsDeleteEnum;
 import com.lantone.data.facade.ColumnFacade;
@@ -12,7 +13,6 @@ 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;

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

@@ -1,5 +1,6 @@
 package com.lantone.data.facade.dataStr;
 
+import com.lantone.data.service.impl.dataStr.StrTotalInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
 @Component

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrTransferInNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,11 +16,9 @@ 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;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

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

@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrTransferOutNote;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -14,7 +15,6 @@ 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;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.google.common.collect.Lists;
 import com.lantone.data.dto.ColumnZhAndChDTO;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.dataStr.StrWardRecord;
 import com.lantone.data.enums.CacheKeyEnum;
 import com.lantone.data.enums.IsDeleteEnum;
@@ -15,7 +16,6 @@ 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;
@@ -173,7 +173,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);
-            t.setWholeData(JSON.toJSONString(wholeMap));
+            //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }
         return tList;

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

@@ -2,6 +2,7 @@ package com.lantone.data.facade.dataView;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.entity.BehospitalInfo;
 import com.lantone.data.entity.QcType;
 import com.lantone.data.entity.his.VLtBehospitalInfo;
@@ -13,7 +14,6 @@ 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/ViewDoctorAdviceFacade.java

@@ -1,9 +1,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.lantone.data.dto.RespDTO;
+import com.lantone.data.entity.DoctorAdvice;
 import com.lantone.data.entity.his.VLtDoctorAdvice;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.his.VLtDoctorAdviceFacade;
 import com.lantone.data.service.impl.DoctorAdviceServiceImpl;
+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;
@@ -17,7 +24,7 @@ import java.util.List;
 public class ViewDoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
     @Autowired
-    private ViewDoctorAdviceFacade hisDoctorAdviceFacade;
+    private VLtDoctorAdviceFacade hisDoctorAdviceFacade;
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表

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

@@ -2,12 +2,12 @@ package com.lantone.data.facade.dataView;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.entity.his.VLtDoctorInfo;
-import com.diagbot.service.impl.his.VLtDoctorInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RedisUtil;
+import com.lantone.data.entity.BasDoctorInfo;
+import com.lantone.data.entity.his.VLtDoctorInfo;
+import com.lantone.data.service.impl.his.VLtDoctorInfoServiceImpl;
+import com.lantone.data.util.BeanUtil;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.lantone.data.entity.HomeDiagnoseInfo;
 import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
 import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.his.VLtHomeDiagnoseInfoFacade;
 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 com.lantone.data.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,7 @@ import java.util.List;
 public class ViewHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
 
     @Autowired
-    private ViewHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
+    private VLtHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表

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

@@ -10,7 +10,7 @@ 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 com.lantone.data.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/ViewHomePageFacade.java

@@ -2,15 +2,18 @@ package com.lantone.data.facade.dataView;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.lantone.data.dto.AnalyzeRunDTO;
 import com.lantone.data.entity.HomePage;
 import com.lantone.data.entity.his.VLtHomePage;
 import com.lantone.data.enums.IsDeleteEnum;
 import com.lantone.data.facade.data.BehospitalInfoFacade;
+import com.lantone.data.facade.his.VLtHomePageFacade;
 import com.lantone.data.service.impl.HomePageServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.AnalyzeRunVO;
 import com.lantone.data.vo.DataViewVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +28,7 @@ import java.util.Map;
 @Slf4j
 public class ViewHomePageFacade extends HomePageServiceImpl {
     @Autowired
-    private ViewHomePageFacade hisHomePageFacade;
+    private VLtHomePageFacade hisHomePageFacade;
     @Autowired
     private ViewHomeDiagnoseInfoFacade viewHomeDiagnoseInfoFacade;
     @Autowired
@@ -69,7 +72,7 @@ public class ViewHomePageFacade extends HomePageServiceImpl {
         analyzeRunVO.setBehospitalCode(hisHomePage.getBehospitalCode());
         analyzeRunVO.setHospitalId(hisHomePage.getHospitalId());
         analyzeRunVO.setModeId(6L);
-        AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+        AnalyzeRunDTO analyzeRunDTO =new AnalyzeRunDTO();
         Map<String, Object> map = new HashMap<String, Object>();
         if (analyzeRunDTO.getMsgDTOList().size() > 0) {
             map.put("analyze", analyzeRunDTO.getMsgDTOList());

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

@@ -2,12 +2,12 @@ package com.lantone.data.facade.dataView;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.entity.MedicalRecord;
-import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.entity.his.HisMedicalRecord;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
-import com.diagbot.util.StringUtil;
+import com.lantone.data.entity.MedicalRecord;
+import com.lantone.data.entity.MedicalRecordContent;
+import com.lantone.data.entity.his.VLtMedicalRecord;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.service.impl.MedicalRecordContentServiceImpl;
+import com.lantone.data.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -18,13 +18,10 @@ import java.util.Date;
 @Slf4j
 public class ViewMRecordContentFacade extends MedicalRecordContentServiceImpl {
 
-    public void addMrecordContent(HisMedicalRecord hisMedicalRecord){
+    public void addMrecordContent(VLtMedicalRecord vLtMedicalRecord){
         try{
-            MedicalRecord vo=new MedicalRecord();
-            BeanUtils.copyProperties(hisMedicalRecord,vo);
-
             MedicalRecordContent contentVo=new MedicalRecordContent();
-            BeanUtils.copyProperties(hisMedicalRecord,contentVo);
+            BeanUtils.copyProperties(vLtMedicalRecord,contentVo);
             //判断我方数据是否有记录
             MedicalRecordContent mRecordContent=this.getOne(queryWrapper(contentVo));
             if(mRecordContent!=null){

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

@@ -2,15 +2,19 @@ package com.lantone.data.facade.dataView;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.lantone.data.dto.AnalyzeRunDTO;
 import com.lantone.data.entity.MedicalRecord;
+import com.lantone.data.entity.ModelHospital;
 import com.lantone.data.entity.his.VLtMedicalRecord;
 import com.lantone.data.enums.IsDeleteEnum;
-import com.lantone.data.facade.data.BehospitalInfoFacade;
+import com.lantone.data.facade.ModelHospitalFacade;
+import com.lantone.data.facade.his.VLtMedicalRecordFacade;
 import com.lantone.data.service.impl.MedicalRecordServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.AnalyzeRunVO;
 import com.lantone.data.vo.DataViewVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +29,7 @@ import java.util.Map;
 @Slf4j
 public class ViewMRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
-    private ViewMRecordFacade hisMedicalRecordFacade;
+    private VLtMedicalRecordFacade hisMedicalRecordFacade;
 
     @Autowired
     private ModelHospitalFacade modelHospitalFacade;
@@ -33,9 +37,6 @@ public class ViewMRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
     private ViewMRecordContentFacade viewMRecordContentFacade;
 
-    @Autowired
-    private BehospitalInfoFacade behospitalInfoFacade;
-
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
@@ -75,7 +76,8 @@ public class ViewMRecordFacade extends MedicalRecordServiceImpl {
         analyzeRunVO.setBehospitalCode(VLtMedicalRecord.getBehospitalCode());
         analyzeRunVO.setHospitalId(VLtMedicalRecord.getHospitalId());
         analyzeRunVO.setModeId(initModeId);
-        AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+        //AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+        AnalyzeRunDTO analyzeRunDTO =new AnalyzeRunDTO();
         Map<String, Object> map = new HashMap<String, Object>();
         if (analyzeRunDTO.getMsgDTOList().size() > 0) {
             map.put("analyze", analyzeRunDTO.getMsgDTOList());

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

@@ -1,13 +1,12 @@
 package com.lantone.data.facade.dataView;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.his.VLtRecordType;
-import com.diagbot.service.impl.his.VLtRecordTypeServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RedisUtil;
+import com.lantone.data.entity.BasDeptInfo;
+import com.lantone.data.entity.his.VLtRecordType;
+import com.lantone.data.service.impl.his.VLtRecordTypeServiceImpl;
+import com.lantone.data.util.BeanUtil;
+import com.lantone.data.util.ListUtil;
+import com.lantone.data.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -38,7 +37,7 @@ public class ViewRecordTypeFacade extends VLtRecordTypeServiceImpl {
             redisUtil.delete(keys);
 
             //将新获取的数据进行存储
-            List<BasDeptInfo> deptList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+            List<BasDeptInfo> deptList= BeanUtil.listCopyTo(list,BasDeptInfo.class);
             Boolean flag=redisUtil.setIfAbsent(RECORD_TYPE, JSON.toJSONString(deptList));
         }
     }

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

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

data-service/src/main/java/com/lantone/data/service/impl/BasHospitalInfoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.lantone.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.BasHospitalInfo;
-import com.diagbot.mapper.BasHospitalInfoMapper;
-import com.diagbot.service.BasHospitalInfoService;
+import com.lantone.data.entity.BasHospitalInfo;
+import com.lantone.data.mapper.BasHospitalInfoMapper;
+import com.lantone.data.service.BasHospitalInfoService;
 import org.springframework.stereotype.Service;
 
 /**

data-service/src/main/java/com/lantone/data/task/DataViewTask.java

@@ -1,6 +1,5 @@
 package com.lantone.data.task;
 
-import com.google.common.collect.Lists;
 import com.lantone.data.annotation.MrqcLog;
 import com.lantone.data.entity.BasDeptInfo;
 import com.lantone.data.entity.BasDoctorInfo;
@@ -13,8 +12,7 @@ import com.lantone.data.facade.dataView.ViewDoctorInfoFacade;
 import com.lantone.data.facade.dataView.ViewRecordTypeFacade;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.RedisUtil;
-import com.lantone.data.util.StringUtil;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

data-service/src/main/java/com/lantone/data/util/RedisUtil.java

@@ -1,7 +1,6 @@
 package com.lantone.data.util;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
+import com.nimbusds.oauth2.sdk.util.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;

data-service/src/main/java/com/lantone/data/vo/AnalyzeRunVO.java

@@ -0,0 +1,27 @@
+package com.lantone.data.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2020/4/13 18:31
+ */
+@Data
+public class AnalyzeRunVO {
+    // 病历id
+    @NotBlank(message = "behospitalCode不能为空")
+    private String behospitalCode;
+    // 医院ID
+    @NotNull(message = "hospitalId不能为空")
+    private Long hospitalId;
+    // 模块id
+    private Long modeId;
+    // 归档字段
+    private String isPlacefile = "0";
+
+    private Integer NeedGroup = 0;
+}

data-service/src/main/java/com/lantone/data/vo/data/HomePageVO.java

@@ -716,5 +716,5 @@ public class HomePageVO {
     /**
      * 手术情况
      */
-    private List<com.diagbot.vo.data.AHomeOperationVO> operations;
+    private List<HomeOperationVO> operations;
 }

data-service/src/main/java/com/lantone/data/vo/data/MedRecInVO.java

@@ -1,12 +1,13 @@
 package com.lantone.data.vo.data;
 
+import com.lantone.data.vo.ContentVO;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class MedRecInVO {
-    private List<com.diagbot.vo.data.AContentVO> medrec;
+    private List<ContentVO> medrec;
     private String cid;//医院简称，具体询问大数据部
     private Long hospitalId;
 

data-service/src/main/java/com/lantone/data/vo/data/MedicalRecordVO.java

@@ -49,5 +49,5 @@ public class MedicalRecordVO {
     /**
      * 病历内容
      */
-    private List<com.diagbot.vo.data.AMedicalRecordContentVO> contents;
+    private List<MedicalRecordContentVO> contents;
 }

data-service/src/main/java/com/lantone/data/vo/data/MrContentVO.java

@@ -15,7 +15,7 @@ public class MrContentVO {
 
     private String title;
 
-    private List<com.diagbot.vo.data.AMedicalRecordVO> records;
+    private List<MedicalRecordVO> records;
 
     private Map<String, Object> content;
 }

data-service/src/main/java/com/lantone/data/web/DataController.java

@@ -7,7 +7,7 @@ import com.lantone.data.vo.HisDataDealVO;
 import com.lantone.data.vo.HisDataImportVO;
 import com.lantone.data.vo.PlaceFileVO;
 import com.lantone.data.vo.data.*;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -106,20 +107,20 @@ public class DataController {
 
     @ApiOperation(value = "运行质控-评分-文书信息")
     @PostMapping("/sendMrRecordIng")
-    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody AMrContentVO aMrContentVO) {
-        return aMedicalRecordFacade.executeMrRecordIng(aMrContentVO);
+    public RespDTO<Map<String, Object>> sendMrRecordIng(@Valid @RequestBody MrContentVO aMrContentVO) {
+        return medicalRecordFacade.executeMrRecordIng(aMrContentVO);
     }
 
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")
     @PostMapping("/sendPatientInfo")
-    public RespDTO<List<BehospitalInfoDTO>> sendPatientInfo(@RequestBody List<BehospitalInfoVO> list) {
-        return aBehospitalInfoFacade.executeBehospital(list);
+    public RespDTO sendPatientInfo(@RequestBody List<BehospitalInfoVO> list) {
+        return behospitalInfoFacade.executeBehospital(list);
     }
 
     @ApiOperation(value = "数据引擎-获取医院医生医嘱信息")
     @PostMapping("/sendDoctorAdvice")
     public RespDTO<List<DoctorAdviceDTO>> sendDoctorAdvice(@RequestBody List<DoctorAdviceVO> list) {
-        return aDoctorAdviceFacade.executeDoctorAdvice(list);
+        return doctorAdviceFacade.executeDoctorAdvice(list);
     }
 
     @ApiOperation(value = "运行质控-获取病案首页")

data-service/src/main/java/com/lantone/data/web/DataStrController.java

@@ -1,9 +1,9 @@
 package com.lantone.data.web;
 
+import com.lantone.data.dto.RespDTO;
 import com.lantone.data.facade.dataStr.*;
 import com.lantone.data.vo.StrContentVO;
 import com.lantone.data.vo.dataStr.*;
-import com.lantone.structure.dto.RespDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

data-service/src/main/java/com/lantone/data/web/DataViewController.java

@@ -6,7 +6,7 @@ import com.lantone.data.facade.dataView.ViewDoctorAdviceFacade;
 import com.lantone.data.facade.dataView.ViewHomePageFacade;
 import com.lantone.data.facade.dataView.ViewMRecordFacade;
 import com.lantone.data.vo.DataViewVO;
-import com.lantone.structure.dto.RespDTO;
+import com.lantone.data.dto.RespDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

data-service/src/main/resources/bootstrap.yml

@@ -1,50 +1,7 @@
-server:
-  port: 5858
-
 spring:
   application:
     name: data-service
-  cloud:
-    config:
-      discovery:
-        enabled: true
-        service-id: config-center
   profiles:
     active: local
-  servlet:
-    multipart:
-      max-request-size: 1MB
-      max-file-size: 1MB
-
-eureka:
-  client:
-    service-url:
-      defaultZone: http://${eureka-addr:localhost}:${eureka-port:6751}/eureka/
-
-logging:
-  config: classpath:logback-spring.xml
-  level:
-    root: ${log-level:info}
-  file:
-    path: /logs/data-service
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
-  endpoint:
-    health:
-      show-details: always
-
-feign:
-  okhttp:
-    enabled: true
-
-ribbon:
-  ConnectTimeout: 3000 #服务请求连接超时时间（毫秒）
-  ReadTimeout: 3000 #服务请求处理超时时间（毫秒）
-
-swagger.title: 业务对接中心
-swagger.des: 业务对接中心相关接口文档
-swagger.version: 0.0.1-SNAPSHOT
+  main:
+    allow-bean-definition-overriding: true

data-service/src/main/resources/data-service-local.yml

@@ -0,0 +1,199 @@
+server:
+  port: 5858
+  max-http-header-size: 10MB
+
+hystrix:
+  threadpool:
+    default:
+      coreSize: 200 #并发执行的最大线程数，默认10
+      maxQueueSize: 200 #BlockingQueue的最大队列数
+      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
+  command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          strategy: SEMAPHORE
+          semaphore:
+            maxConcurrentRequests: 2000
+          thread:
+            timeoutInMilliseconds: 20000
+
+ribbon:
+  ReadTimeout: 20000
+  ConnectTimeout: 20000
+  MaxAutoRetries: 0
+  MaxAutoRetriesNextServer: 1
+
+feign:
+  hystrix:
+    enabled: true
+  #开启Feign请求压缩
+  compression:
+    response:
+      enabled: true
+  httpclient:
+    enabled: false
+  okhttp:
+    enabled: true
+    max-connections: 1000 # 默认值
+    max-connections-per-route: 250 # 默认值
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: bus-refresh,health,info,hystrix.stream
+      cors:
+        allowed-origins: "*"
+        allowed-methods: "*"
+  endpoint:
+    health:
+      show-details: always
+
+# 驱动配置信息
+spring:
+  datasource:
+    dynamic:
+      primary: master
+      druid:
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: false
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: false
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+
+        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.133:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: Lant0ne@2022
+          druid:
+            initial-size: 5
+        slave:
+          driver-class-name: oracle.jdbc.driver.OracleDriver
+          platform: oracle
+          url: jdbc:oracle:thin:@192.168.2.102:1521/orcl
+          username: lqq_test
+          password: oracle
+          druid:
+            initial-size: 5
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+
+  cloud:
+    stream:
+      bindings:
+        outputMrqcLog:
+          destination: mrqcLog
+        inputMrqcLog:
+          destination: mrqcLog
+          group: mrqcLogReceiveGroup
+
+  #mq
+  rabbitmq:
+    host: 192.168.2.236
+    port: 5672
+    username: lantone
+    password: lantone
+    publisher-confirms: true
+    virtual-host: /
+
+  #redis
+  redis:
+    database:
+      cache: 8 # cache索引
+      token: 8 # Token索引
+    host: 192.168.2.237  #Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: emrais # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
+  servlet:
+    multipart:
+      max-request-size: 2048MB
+
+#mybatis
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*Mapper.xml,classpath:/mapper/his/*Mapper.xml
+  #实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: com.diagbot.entity
+  global-config:
+    #刷新mapper 调试神器
+    db-config:
+      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+      id-type: id_worker
+      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+      field-strategy: not_empty
+      #驼峰下划线转换
+      column-underline: true
+      #数据库大写下划线转换
+      #capital-mode: true
+      #刷新mapper 调试神器
+      refresh-mapper: true
+      #逻辑删除配置
+      logic-delete-value: 0
+      logic-not-delete-value: 1
+      #自定义填充策略接口实现
+      #meta-object-handler: com.baomidou.springboot.xxx
+      #自定义SQL注入器
+      #sql-injector: com.baomidou.springboot.xxx
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+
+io.github.lvyahui8.spring:
+  base-packages: com.lantone.data.aggregate
+  thread-number: 12
+
+myhost: localhost
+oath.self.address: http://${myhost}:${server.port}
+
+swagger.show: true

pom.xml

@@ -122,14 +122,7 @@
             <dependency>
                 <groupId>io.github.lvyahui8</groupId>
                 <artifactId>spring-boot-data-aggregator-starter</artifactId>
-                <version>${aggregator.version}</version>
-            </dependency>
-
-            <!--多数据源-->
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-                <version>3.3.1</version>
+                <version>${lombok.version}</version>
             </dependency>
 
             <!-- mybatisplus 代码生成器所依赖的jar包 包括3种不同类型的模板依赖-->