业务对接接口梳理

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

@@ -0,0 +1,144 @@
+# 驱动配置信息
+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.diagbot.aggregate
+  thread-number: 12
+
+myhost: localhost
+oath.self.address: http://${myhost}:${server.port}
+
+swagger.show: true

data-service/pom.xml

@@ -56,19 +56,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.62</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
-        </dependency>
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -83,12 +70,6 @@
         </dependency>
         <!-- mybatis-plus end -->
 
-        <!--多数据源-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.3.1</version>
-        </dependency>
 
 
         <!-- springboot整合mybatis（核心就这一个） -->
@@ -99,23 +80,20 @@
             <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
-        <!-- 阿里巴巴druid数据库连接池 -->
+        <!--消息中心-->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.github.lvyahui8</groupId>
-            <artifactId>spring-boot-data-aggregator-starter</artifactId>
-            <version>${aggregator.version}</version>
+            <artifactId>spring-boot-data-aggregator-core</artifactId>
+            <version>1.1.3</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>
     </dependencies>
 

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

@@ -1,14 +1,19 @@
 package com.lantone;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 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.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class, DruidDataSourceAutoConfigure.class })
 @EnableEurekaClient
-@EnableFeignClients
+@EnableFeignClients({ "com.lantone.data.client" })
 public class DataServiceApplication{
 
     public static void main(String[] args) {

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

@@ -1,15 +1,12 @@
 package com.lantone.data.aggregate;
 
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.his.HisBehospitalInfo;
-import com.diagbot.facade.dataView.VLtBehospitalInfoFacade;
-import com.diagbot.facade.dataView.VLtDoctorAdviceFacade;
-import com.diagbot.facade.dataView.VLtHomePageFacade;
-import com.diagbot.facade.dataView.VLtMedicalRecordFacade;
-import com.diagbot.vo.data.DataViewVO;
-import io.github.lvyahui8.spring.annotation.DataConsumer;
-import io.github.lvyahui8.spring.annotation.DataProvider;
-import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -19,17 +16,17 @@ import java.util.List;
 public class ViewSupplementAggregate {
 
     @Autowired
-    private VLtBehospitalInfoFacade vLtBehospitalInfoFacade;
+    private ViewBehospitalInfoFacade viewBehospitalInfoFacade;
     @Autowired
-    private VLtDoctorAdviceFacade vLtDoctorAdviceFacade;
+    private ViewDoctorAdviceFacade viewDoctorAdviceFacade;
     @Autowired
-    private VLtMedicalRecordFacade vLtMedicalRecordFacade;
+    private ViewMRecordFacade viewMRecordFacade;
     @Autowired
-    private VLtHomePageFacade vLtHomePageFacade;
+    private ViewHomePageFacade viewHomePageFacade;
 
     @DataProvider("viewDataSupplement")
     public RespDTO ViewDataSupplement(@InvokeParameter("dataViewVO") DataViewVO dataViewVO,
-                                      @InvokeParameter("beHospitalInfoList") List<HisBehospitalInfo> beHospitalInfoList,
+                                      @InvokeParameter("beHospitalInfoList") List<VLtBehospitalInfo> beHospitalInfoList,
                                       @DataConsumer("getBehospitalInfoData") RespDTO getBehospitalInfoData,
                                       @DataConsumer("getDoctorAdviceData") RespDTO getDoctorAdviceData,
                                       @DataConsumer("getMedicalRecordData") RespDTO getMedicalRecordData,
@@ -52,22 +49,22 @@ public class ViewSupplementAggregate {
     }
 
     @DataProvider("getBehospitalInfoData")
-    public RespDTO getBehospitalInfoData(@InvokeParameter("beHospitalInfoList") List<HisBehospitalInfo> beHospitalInfoList){
-        return vLtBehospitalInfoFacade.getBehospitalInfoData(beHospitalInfoList);
+    public RespDTO getBehospitalInfoData(@InvokeParameter("beHospitalInfoList") List<VLtBehospitalInfo> beHospitalInfoList){
+        return viewBehospitalInfoFacade.getBehospitalInfoData(beHospitalInfoList);
     }
 
     @DataProvider("getDoctorAdviceData")
     public RespDTO getDoctorAdviceData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO) {
-        return vLtDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
+        return viewDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
     }
 
     @DataProvider("getMedicalRecordData")
     public RespDTO getMedicalRecordData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO){
-        return vLtMedicalRecordFacade.getMedicalRecordSupplement(dataViewVO);
+        return viewMRecordFacade.getMedicalRecordSupplement(dataViewVO);
     }
 
     @DataProvider("getHomePageData")
     public RespDTO getHomePageData(@InvokeParameter("dataViewVO") DataViewVO dataViewVO){
-        return vLtHomePageFacade.getHomePageSupplement(dataViewVO);
+        return viewHomePageFacade.getHomePageSupplement(dataViewVO);
     }
 }

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * @since 2021-09-28
  */
 @TableName("V_LT_BEHOSPITAL_INFO")
-public class HisBehospitalInfo implements Serializable {
+public class VLtBehospitalInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,5 +1,8 @@
 package com.lantone.data.entity.his;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -12,7 +15,7 @@ import java.util.Date;
  * @since 2021-09-28
  */
 @TableName("V_LT_DOCTOR_ADVICE")
-public class HisDoctorAdvice implements Serializable {
+public class VLtDoctorAdvice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * @since 2021-09-28
  */
 @TableName("V_LT_HOME_DIAGNOSE_INFO")
-public class HisHomeDiagnoseInfo implements Serializable {
+public class VLtHomeDiagnoseInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * @since 2021-09-28
  */
 @TableName("V_LT_HOME_OPERATION_INFO")
-public class HisHomeOperationInfo implements Serializable {
+public class VLtHomeOperationInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * @since 2021-09-28
  */
 @TableName("V_LT_HOME_PAGE")
-public class HisHomePage implements Serializable {
+public class VLtHomePage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -15,7 +15,7 @@ import java.util.Date;
  * @since 2021-09-28
  */
 @TableName("V_LT_MEDICAL_RECORD")
-public class HisMedicalRecord implements Serializable {
+public class VLtMedicalRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * @since 2021-09-28
  */
 @TableName("HIS_MEDICAL_RECORD_CONTENT")
-public class HisMedicalRecordContent implements Serializable {
+public class VLtMedicalRecordContent implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,15 +1,11 @@
 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.ABasDeptInfoDTO;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.service.impl.BasDeptInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.ABasDeptInfoVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.BasDeptInfo;
+import com.lantone.data.service.impl.BasDeptInfoServiceImpl;
+import com.lantone.data.vo.data.BasDeptInfoVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,42 +15,18 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class BasDeptInfoFacade extends BasDeptInfoServiceImpl{
+public class BasDeptInfoFacade extends BasDeptInfoServiceImpl {
 
     @Autowired
     @Qualifier("basDeptInfoServiceImpl")
     private BasDeptInfoServiceImpl basDeptInfoService;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 同步前一天科室的信息
-     */
-    public void executeDept() {
-        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
-        execute(basDeptInfoList);
-    }
-
-    /**
-     * 同步历史数据
-     */
-    public void executeDeptPast(){
-        String sql="select * from hi_deptinfo where cjcxrq>=dateadd(day,-1,getdate()) and cjcxrq<=getdate()";
-        List<BasDeptInfo> basDeptInfoList = tzDBConn.getDeptInfo(sql);
-        execute(basDeptInfoList);
-    }
 
     /**
      * 通过接口同步数据
      * @param list
      * @return
      */
-    public RespDTO<List<ABasDeptInfoDTO>> executeDept(List<ABasDeptInfoVO> list) {
+    public RespDTO<List<BasDeptInfoDTO>> executeDept(List<BasDeptInfoVO> list) {
         try{
             if(list!=null && list.size()>0){
                 List<BasDeptInfo> basDeptInfoList=Lists.newArrayList();
@@ -72,18 +44,12 @@ public class BasDeptInfoFacade extends BasDeptInfoServiceImpl{
                 }
                 execute(basDeptInfoList);
 
-                if(logSwitch){
-                    basDeptInfoList.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("数据处理异常，详情查看日志表");
         }
     }

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

@@ -1,15 +1,12 @@
 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.ABasDoctorInfoDTO;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.idc.VisibleIdCreater;
-import com.diagbot.service.impl.BasDoctorInfoServiceImpl;
-import com.diagbot.util.*;
-import com.diagbot.vo.data.ABasDoctorInfoVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.BasDoctorInfo;
+import com.lantone.data.service.impl.BasDoctorInfoServiceImpl;
+import com.lantone.data.util.RedisUtil;
+import com.lantone.data.vo.data.BasDoctorInfoVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,8 +25,6 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Value("${log_switch.enable}")
     private boolean logSwitch;
 
-    private TZDBConn tzDBConn = new TZDBConn();
-
     private static final String DOCTORS = "doctors::";
 
     @Autowired
@@ -37,29 +32,12 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Autowired
     private VisibleIdCreater visibleIdCreater;
 
-    /**
-     * 同步历史数据
-     */
-    public void executeDoctorPast() {
-        String sql="select * from gi_userinfo";
-        List<BasDoctorInfo> basDeptInfoList = tzDBConn.getBasDoctorInfo(sql);
-        execute(basDeptInfoList);
-
-    }
-    /**
-     * 同步前一天医生信息
-     */
-    public void executeDoctor() {
-        String sql="select * from gi_userinfo";
-        List<BasDoctorInfo> basDeptInfoList = tzDBConn.getBasDoctorInfo(sql);
-        execute(basDeptInfoList);
-    }
     /**
      * 从接口接收医生信息
      * @param list
      * @return
      */
-    public RespDTO<List<ABasDoctorInfoDTO>> executeDoctor(List<ABasDoctorInfoVO> list) {
+    public RespDTO<List<BasDoctorInfoDTO>> executeDoctor(List<BasDoctorInfoVO> list) {
         try {
             if(list!=null && list.size()>0){
                 List<BasDoctorInfo> basDoctorInfoList=Lists.newArrayList();

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

@@ -1,22 +1,15 @@
 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.MedLisResult;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedLisResultServiceImpl;
-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.AMedLisResultVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.MedLisResult;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.util.DateUtil;
+import com.lantone.data.util.StringUtil;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -27,11 +20,6 @@ public class MedLisResultFacade extends MedLisResultServiceImpl {
     @Autowired
     @Qualifier("medLisResultServiceImpl")
     private MedLisResultServiceImpl medLisResultServiceImpl;
-    @Autowired
-    private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 同步前一天
@@ -116,7 +104,7 @@ public class MedLisResultFacade extends MedLisResultServiceImpl {
                 UpdateWrapper<MedLisResult> updateWrapper=new UpdateWrapper<>();
                 updateWrapper.eq("rep_no", aDeleteFlagVO.getRepNo())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                        .eq("is_deleted",IsDeleteEnum.N)
+                        .eq("is_deleted", IsDeleteEnum.N)
                         .set("is_deleted",IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
 

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

@@ -1,16 +1,11 @@
 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.AMedicalRecordTypeDTO;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.service.impl.MedRecordTypeServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.TZDBConn;
-import com.diagbot.vo.data.AMedicalRecordTypeVO;
 import com.google.common.collect.Lists;
+import com.lantone.data.entity.MedRecordType;
+import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.vo.data.MedicalRecordTypeVO;
+import com.lantone.structure.dto.RespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -27,26 +22,15 @@ public class MedRecordTypeFacade extends MedRecordTypeServiceImpl {
     @Autowired
     private MedAbnormalInfoFacade aMedAbnormalInfoFacade;
 
-    private TZDBConn tzDBConn = new TZDBConn();
-
-    /**
-     * 终末质控-同步前一天变更的模板类型
-     */
-    public void executeMRType() {
-        //String sql="select * from ar_medirecclass where SFZFPB='1'";
-        String sql="select * from ar_medirecclass where SFZFPB='1' and cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23))";
-        List<MedRecordType> medRecordTypeList = tzDBConn.getMedicalRecordType(sql);
-        execute(medRecordTypeList);
-    }
     /**
      * 数据引擎-通过接口更新病人住院记录信息
      * @param list
      * @return
      */
-    public RespDTO<List<AMedicalRecordTypeDTO>> executeMRType(List<AMedicalRecordTypeVO> list) {
+    public RespDTO<List<MedicalRecordTypeDTO>> executeMRType(List<MedicalRecordTypeVO> list) {
         if(list!=null && list.size()>0){
             //循环验证数据有效性
-            for (AMedicalRecordTypeVO medRecordType:list) {
+            for (MedicalRecordTypeVO medRecordType:list) {
                 if("".equals(medRecordType.getTypeId())) {
                     return RespDTO.onError("请输入文书类型编码!");
                 }else if(medRecordType.getHospitalId()==null){
@@ -56,9 +40,9 @@ public class MedRecordTypeFacade extends MedRecordTypeServiceImpl {
                 }
             }
             List<MedRecordType> medRecordTypeList=Lists.newArrayList();
-            List<AMedicalRecordTypeDTO> medRecordTypeDtoList=Lists.newArrayList();
+            List<MedicalRecordTypeDTO> medRecordTypeDtoList=Lists.newArrayList();
             medRecordTypeList=BeanUtil.listCopyTo(list,MedRecordType.class);
-            medRecordTypeDtoList=BeanUtil.listCopyTo(list,AMedicalRecordTypeDTO.class);
+            medRecordTypeDtoList=BeanUtil.listCopyTo(list,MedicalRecordTypeDTO.class);
             execute(medRecordTypeList);
             return RespDTO.onSuc(medRecordTypeDtoList);
         }else{
@@ -75,7 +59,7 @@ public class MedRecordTypeFacade extends MedRecordTypeServiceImpl {
                     MedRecordType mrType = this.getOne(new QueryWrapper<MedRecordType>()
                             .eq("type_id", s.getTypeId())
                             .eq("hospital_id", s.getHospitalId())
-                            .eq("is_deleted",IsDeleteEnum.N), false);
+                            .eq("is_deleted", IsDeleteEnum.N), false);
                     if (mrType != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);

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

@@ -33,10 +33,6 @@ public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
     private StrDeathDiscussionServiceImpl strDeathDiscussionService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -85,7 +81,7 @@ public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrDeathDiscussion strDeathDiscussion=new StrDeathDiscussion();
         try {
-            AStrDeathDiscussionVO strDeathDiscussionVO=(AStrDeathDiscussionVO) MapUtil.mapToObject(entityMap, AStrDeathDiscussionVO.class);
+            StrDeathDiscussionVO strDeathDiscussionVO=(StrDeathDiscussionVO) MapUtil.mapToObject(entityMap, StrDeathDiscussionVO.class);
             BeanUtils.copyProperties(strDeathDiscussionVO,strDeathDiscussion);
             strDeathDiscussion.setHospitalId(hospitalId);//医院编码
 
@@ -110,7 +106,6 @@ public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("死亡病例讨论记录",strDeathDiscussion.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -149,22 +144,12 @@ public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
                 List<StrDeathDiscussion> strDeathDiscussionList= Lists.newArrayList();
                 execute(strDeathDiscussionList);
 
-                if(logSwitch){
-                    strDeathDiscussionList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡病例讨论记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-死亡病例讨论记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }

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

@@ -34,10 +34,6 @@ public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
     private StrTransferInNoteServiceImpl strTransferInNoteService;
     @Autowired
     private ColumnFacade columnFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Value("${log_switch.enable}")
-    private boolean logSwitch;
 
     public void getColumnZhAndCh(){
         List<ColumnZhAndChDTO> list=this.baseMapper.getColumnZhAndCh();
@@ -86,7 +82,7 @@ public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
     public void dealData(String columnMap,Map<String, Object> entityMap,Long hospitalId){
         StrTransferInNote strTransferInNote=new StrTransferInNote();
         try {
-            AStrTransferInNoteVO strTransferInNoteVO=(AStrTransferInNoteVO) MapUtil.mapToObject(entityMap, AStrTransferInNoteVO.class);
+            StrTransferInNoteVO strTransferInNoteVO=(StrTransferInNoteVO) MapUtil.mapToObject(entityMap, StrTransferInNoteVO.class);
             BeanUtils.copyProperties(strTransferInNoteVO,strTransferInNote);
             strTransferInNote.setHospitalId(hospitalId);//医院编码
             strTransferInNote.setTransferInDate(DateUtil.parseDateTime(strTransferInNoteVO.getTransferInDate()));
@@ -109,7 +105,6 @@ public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
 
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("转入记录",strTransferInNote.getRecId(), JSON.toJSONString(entityMap),"",e.getMessage());
         }
 
     }
@@ -148,22 +143,12 @@ public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
                 List<StrTransferInNote> strTransferInNoteList= initData(list);
                 execute(strTransferInNoteList);
 
-                if(logSwitch){
-                    strTransferInNoteList.forEach(s->{
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转入记录-正常", s.getRecId(), JSON.toJSONString(s), "", "");
-                    });
-                }
                 return RespDTO.onSuc("操作正常！");
             }else{
                 return RespDTO.onError("未接收到数据!");
             }
         }catch (Exception e){
             log.error(e.getMessage(),e);
-            if(list!=null && list.size()>0) {
-                list.forEach(s->{
-                    aMedAbnormalInfoFacade.saveAbnormalInfo("结构化-转入记录-异常", s.getRecId(), JSON.toJSONString(list), "", e.getMessage());
-                });
-            }
             return RespDTO.onError("数据处理异常，详情查看日志表");
         }
     }

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

@@ -3,10 +3,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.lantone.data.entity.BehospitalInfo;
-import com.lantone.data.entity.his.HisBehospitalInfo;
+import com.lantone.data.entity.QcType;
+import com.lantone.data.entity.his.VLtBehospitalInfo;
 import com.lantone.data.enums.IsDeleteEnum;
+import com.lantone.data.facade.QcTypeFacade;
 import com.lantone.data.facade.data.BehospitalInfoFacade;
-import com.lantone.data.facade.his.HisBehospitalInfoFacade;
+import com.lantone.data.facade.his.VLtBehospitalInfoFacade;
 import com.lantone.data.service.impl.BehospitalInfoServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
@@ -25,12 +27,12 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
-public class VLtBehospitalInfoFacade extends BehospitalInfoServiceImpl {
+public class ViewBehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
     @Autowired
-    private HisBehospitalInfoFacade hisBehospitalInfoFacade;
+    private VLtBehospitalInfoFacade hisBehospitalInfoFacade;
     @Autowired
     private QcTypeFacade qcTypeFacade;
 
@@ -48,7 +50,7 @@ public class VLtBehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 return RespDTO.onError("住院登记病历号为空！！");
             }
             //从his视图中获取数据
-            List<HisBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
+            List<VLtBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
             if(ListUtil.isNotEmpty(list)){
                 list.stream().forEach(s->{
                     BehospitalInfo vo = new BehospitalInfo();
@@ -115,9 +117,9 @@ public class VLtBehospitalInfoFacade extends BehospitalInfoServiceImpl {
     public RespDTO hisDataSupplement(DataViewVO dataViewVO){
         try {
             //从his视图中获取数据
-            List<HisBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
+            List<VLtBehospitalInfo> list=hisBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
             //将所有病历号组成list集合
-            List<String> beHospitalCodeList=list.stream().map(HisBehospitalInfo::getBehospitalCode).collect(Collectors.toList());
+            List<String> beHospitalCodeList=list.stream().map(VLtBehospitalInfo::getBehospitalCode).collect(Collectors.toList());
             Map<String, Object> invokeParams = new HashMap<>();
             invokeParams.put("beHospitalCodeList", beHospitalCodeList);
             invokeParams.put("beHospitalInfoList", list);
@@ -136,10 +138,10 @@ public class VLtBehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO getBehospitalInfoData(List<HisBehospitalInfo> HisBehospitalInfoList){
+    public RespDTO getBehospitalInfoData(List<VLtBehospitalInfo> VLtBehospitalInfoList){
         try {
-            if (ListUtil.isNotEmpty(HisBehospitalInfoList)) {
-                HisBehospitalInfoList.stream().forEach(s -> {
+            if (ListUtil.isNotEmpty(VLtBehospitalInfoList)) {
+                VLtBehospitalInfoList.stream().forEach(s -> {
                     BehospitalInfo vo = new BehospitalInfo();
                     BeanUtils.copyProperties(s, vo);
                     vo.setHospitalId(Integer.toUnsignedLong(s.getHospitalId()));

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

@@ -1,7 +1,6 @@
 package com.lantone.data.facade.dataView;
 
-import com.lantone.data.entity.his.HisDoctorAdvice;
-import com.lantone.data.facade.his.HisDoctorAdviceFacade;
+import com.lantone.data.entity.his.VLtDoctorAdvice;
 import com.lantone.data.service.impl.DoctorAdviceServiceImpl;
 import com.lantone.data.vo.DataViewVO;
 import com.lantone.structure.dto.RespDTO;
@@ -15,10 +14,10 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class VLtDoctorAdviceFacade extends DoctorAdviceServiceImpl {
+public class ViewDoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
     @Autowired
-    private HisDoctorAdviceFacade hisDoctorAdviceFacade;
+    private ViewDoctorAdviceFacade hisDoctorAdviceFacade;
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
@@ -31,7 +30,7 @@ public class VLtDoctorAdviceFacade extends DoctorAdviceServiceImpl {
                 return RespDTO.onError("住院医嘱病历号为空！！");
             }
             //从his视图中获取数据
-            List<HisDoctorAdvice> list=hisDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
+            List<VLtDoctorAdvice> list=hisDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
             if(ListUtil.isNotEmpty(list)){
                 list.stream().forEach(s->{
                     DoctorAdvice vo=new DoctorAdvice();

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

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Set;
 
 @Component
-public class VLtDoctorInfoFacade extends VLtDoctorInfoServiceImpl {
+public class ViewDoctorInfoFacade extends VLtDoctorInfoServiceImpl {
 
     @Autowired
     RedisUtil redisUtil;

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

@@ -3,9 +3,8 @@ 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.entity.HomeDiagnoseInfo;
-import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
 import com.lantone.data.enums.IsDeleteEnum;
-import com.lantone.data.facade.his.HisHomeDiagnoseInfoFacade;
 import com.lantone.data.service.impl.HomeDiagnoseInfoServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
@@ -21,10 +20,10 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class VLtHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
+public class ViewHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
 
     @Autowired
-    private HisHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
+    private ViewHomeDiagnoseInfoFacade hisHomeDiagnoseInfoFacade;
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
@@ -41,9 +40,9 @@ public class VLtHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
                 return RespDTO.onError("病历号为空！！");
             }
 
-            List<HisHomeDiagnoseInfo> hisHomeDiagnoseList=hisHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+            List<VLtHomeDiagnoseInfo> hisHomeDiagnoseList=hisHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
             if(ListUtil.isNotEmpty(hisHomeDiagnoseList)){
-                for (HisHomeDiagnoseInfo hisHomeDiagnose:hisHomeDiagnoseList) {
+                for (VLtHomeDiagnoseInfo hisHomeDiagnose:hisHomeDiagnoseList) {
                     HomeDiagnoseInfo vo=new HomeDiagnoseInfo();
                     BeanUtils.copyProperties(hisHomeDiagnose,vo);
 

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

@@ -3,9 +3,9 @@ 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.entity.HomeOperationInfo;
-import com.lantone.data.entity.his.HisHomeOperationInfo;
+import com.lantone.data.entity.his.VLtHomeOperationInfo;
 import com.lantone.data.enums.IsDeleteEnum;
-import com.lantone.data.facade.his.HisHomeOperationInfoFacade;
+import com.lantone.data.facade.his.VLtHomeOperationInfoFacade;
 import com.lantone.data.service.impl.HomeOperationInfoServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
@@ -21,9 +21,9 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class VLtHomeOperationFacade extends HomeOperationInfoServiceImpl {
+public class ViewHomeOperationFacade extends HomeOperationInfoServiceImpl {
     @Autowired
-    private HisHomeOperationInfoFacade hisHomeOperationInfoFacade;
+    private VLtHomeOperationInfoFacade hisHomeOperationInfoFacade;
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
@@ -32,9 +32,9 @@ public class VLtHomeOperationFacade extends HomeOperationInfoServiceImpl {
      **/
     public RespDTO getHomeOperationData(DataViewVO dataViewVO){
         try{
-            List<HisHomeOperationInfo> hisHomeOperationList=hisHomeOperationInfoFacade.getHomeOperationData(dataViewVO);
+            List<VLtHomeOperationInfo> hisHomeOperationList=hisHomeOperationInfoFacade.getHomeOperationData(dataViewVO);
             if(ListUtil.isNotEmpty(hisHomeOperationList)){
-                for (HisHomeOperationInfo hisHomeOperation:hisHomeOperationList) {
+                for (VLtHomeOperationInfo hisHomeOperation:hisHomeOperationList) {
                     HomeOperationInfo homeOperationInfo=this.getOne(queryWrapper(dataViewVO));
                     HomeOperationInfo vo=new HomeOperationInfo();
                     BeanUtils.copyProperties(hisHomeOperation,vo);

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

@@ -3,10 +3,9 @@ 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.entity.HomePage;
-import com.lantone.data.entity.his.HisHomePage;
+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.HisHomePageFacade;
 import com.lantone.data.service.impl.HomePageServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
@@ -24,13 +23,13 @@ import java.util.Map;
 
 @Component
 @Slf4j
-public class VLtHomePageFacade extends HomePageServiceImpl {
+public class ViewHomePageFacade extends HomePageServiceImpl {
     @Autowired
-    private HisHomePageFacade hisHomePageFacade;
+    private ViewHomePageFacade hisHomePageFacade;
     @Autowired
-    private VLtHomeDiagnoseInfoFacade vLtHomeDiagnoseInfoFacade;
+    private ViewHomeDiagnoseInfoFacade viewHomeDiagnoseInfoFacade;
     @Autowired
-    private VLtHomeOperationFacade vLtHomeOperationFacade;
+    private ViewHomeOperationFacade viewHomeOperationFacade;
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
@@ -44,12 +43,12 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
             if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
                 return RespDTO.onError("病案首页病历号为空！！");
             }
-            HisHomePage hisHomePage=hisHomePageFacade.getHomePageData(dataViewVO);
+            VLtHomePage hisHomePage=hisHomePageFacade.getHomePageData(dataViewVO);
             if(hisHomePage!=null){
                 this.addHomePage(hisHomePage);
                 //病案首页关联出院诊断及手术
-                vLtHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
-                vLtHomeOperationFacade.getHomeOperationData(dataViewVO);
+                viewHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+                viewHomeOperationFacade.getHomeOperationData(dataViewVO);
 
                 return RespDTO.onSuc("病案首页操作成功！");
                 /*
@@ -65,7 +64,7 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
         }
     }
 
-    public RespDTO analyzeRun(HisHomePage hisHomePage){
+    public RespDTO analyzeRun(VLtHomePage hisHomePage){
         AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
         analyzeRunVO.setBehospitalCode(hisHomePage.getBehospitalCode());
         analyzeRunVO.setHospitalId(hisHomePage.getHospitalId());
@@ -88,13 +87,13 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
             if(StringUtil.isEmpty(dataViewVO.getBehospitalCode())){
                 return RespDTO.onError("病案首页病历号为空！！");
             }
-            List<HisHomePage> list=hisHomePageFacade.getHomePageSupplement(dataViewVO);
+            List<VLtHomePage> list=hisHomePageFacade.getHomePageSupplement(dataViewVO);
             if(ListUtil.isNotEmpty(list)){
                 list.stream().forEach(s->{
                     this.addHomePage(s);
                     //病案首页关联出院诊断及手术
-                    vLtHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
-                    vLtHomeOperationFacade.getHomeOperationData(dataViewVO);
+                    viewHomeDiagnoseInfoFacade.getHomeDiagnoseData(dataViewVO);
+                    viewHomeOperationFacade.getHomeOperationData(dataViewVO);
                 });
             }
             return RespDTO.onSuc("病案首页操作成功！");
@@ -104,7 +103,7 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
         }
     }
 
-    public void addHomePage(HisHomePage hisHomePage){
+    public void addHomePage(VLtHomePage hisHomePage){
         HomePage vo=new HomePage();
         BeanUtils.copyProperties(hisHomePage,vo);
         HomePage homePage=this.getOne(queryWrapper(hisHomePage));
@@ -127,7 +126,7 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    private QueryWrapper queryWrapper(HisHomePage hisHomePage){
+    private QueryWrapper queryWrapper(VLtHomePage hisHomePage){
         //拼接朗通查询条件
         QueryWrapper queryWrapper=new QueryWrapper<HomePage>();
         if(StringUtil.isNotEmpty(hisHomePage.getHomePageId())){
@@ -142,7 +141,7 @@ public class VLtHomePageFacade extends HomePageServiceImpl {
         return queryWrapper;
     }
 
-    private UpdateWrapper updateWrapper(HisHomePage hisHomePage){
+    private UpdateWrapper updateWrapper(VLtHomePage hisHomePage){
         UpdateWrapper updateWrapper=new UpdateWrapper<HomePage>();
         if(StringUtil.isNotEmpty(hisHomePage.getHomePageId())){
             updateWrapper.eq("home_page_id", hisHomePage.getHomePageId());

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

@@ -16,7 +16,7 @@ import java.util.Date;
 
 @Component
 @Slf4j
-public class VLtMedicalRecordContentFacade extends MedicalRecordContentServiceImpl {
+public class ViewMRecordContentFacade extends MedicalRecordContentServiceImpl {
 
     public void addMrecordContent(HisMedicalRecord hisMedicalRecord){
         try{

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

@@ -3,10 +3,9 @@ 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.entity.MedicalRecord;
-import com.lantone.data.entity.his.HisMedicalRecord;
+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.his.HisMedicalRecordFacade;
 import com.lantone.data.service.impl.MedicalRecordServiceImpl;
 import com.lantone.data.util.ListUtil;
 import com.lantone.data.util.StringUtil;
@@ -24,15 +23,15 @@ import java.util.Map;
 
 @Component
 @Slf4j
-public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
+public class ViewMRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
-    private HisMedicalRecordFacade hisMedicalRecordFacade;
+    private ViewMRecordFacade hisMedicalRecordFacade;
 
     @Autowired
     private ModelHospitalFacade modelHospitalFacade;
 
     @Autowired
-    private VLtMedicalRecordContentFacade vLtMedicalRecordContentFacade;
+    private ViewMRecordContentFacade viewMRecordContentFacade;
 
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
@@ -51,11 +50,11 @@ public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
             }else if(dataViewVO.getHospitalId()==null || dataViewVO.getHospitalId()==0L){
                 return RespDTO.onError("初始医院ID为空！！");
             }
-            HisMedicalRecord hisMedicalRecord=hisMedicalRecordFacade.getMedicalRecordData(dataViewVO);
+            VLtMedicalRecord VLtMedicalRecord =hisMedicalRecordFacade.getMedicalRecordData(dataViewVO);
 
-            if(hisMedicalRecord!=null){
-                this.addMrecord(hisMedicalRecord);
-                vLtMedicalRecordContentFacade.addMrecordContent(hisMedicalRecord);
+            if(VLtMedicalRecord !=null){
+                this.addMrecord(VLtMedicalRecord);
+                viewMRecordContentFacade.addMrecordContent(VLtMedicalRecord);
                 return RespDTO.onSuc("病历文书操作成功！");
                 /*
                 //是否需要先评分，增加如下业务代码
@@ -70,11 +69,11 @@ public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
-    public RespDTO analyzeRun(HisMedicalRecord hisMedicalRecord){
-        Long initModeId=initModeId(hisMedicalRecord.getHospitalId(),hisMedicalRecord.getRecTypeId());
+    public RespDTO analyzeRun(VLtMedicalRecord VLtMedicalRecord){
+        Long initModeId=initModeId(VLtMedicalRecord.getHospitalId(), VLtMedicalRecord.getRecTypeId());
         AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
-        analyzeRunVO.setBehospitalCode(hisMedicalRecord.getBehospitalCode());
-        analyzeRunVO.setHospitalId(hisMedicalRecord.getHospitalId());
+        analyzeRunVO.setBehospitalCode(VLtMedicalRecord.getBehospitalCode());
+        analyzeRunVO.setHospitalId(VLtMedicalRecord.getHospitalId());
         analyzeRunVO.setModeId(initModeId);
         AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
         Map<String, Object> map = new HashMap<String, Object>();
@@ -86,11 +85,11 @@ public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
 
     public RespDTO getMedicalRecordSupplement(DataViewVO dataViewVO){
         try{
-            List<HisMedicalRecord> hisMedicalRecordList=hisMedicalRecordFacade.getMedicalRecordSupplement(dataViewVO);
-            if(ListUtil.isNotEmpty(hisMedicalRecordList)){
-                for (HisMedicalRecord hisMedicalRecord:hisMedicalRecordList) {
-                    this.addMrecord(hisMedicalRecord);
-                    vLtMedicalRecordContentFacade.addMrecordContent(hisMedicalRecord);
+            List<VLtMedicalRecord> VLtMedicalRecordList =hisMedicalRecordFacade.getMedicalRecordSupplement(dataViewVO);
+            if(ListUtil.isNotEmpty(VLtMedicalRecordList)){
+                for (VLtMedicalRecord VLtMedicalRecord : VLtMedicalRecordList) {
+                    this.addMrecord(VLtMedicalRecord);
+                    viewMRecordContentFacade.addMrecordContent(VLtMedicalRecord);
                 }
                 return RespDTO.onSuc("病历文书操作成功！");
             }else{
@@ -102,49 +101,49 @@ public class VLtMedicalRecordFacade extends MedicalRecordServiceImpl {
         }
     }
 
-    public QueryWrapper queryWrapper(HisMedicalRecord hisMedicalRecord){
+    public QueryWrapper queryWrapper(VLtMedicalRecord VLtMedicalRecord){
         //拼接朗通查询条件
         QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
-            queryWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getRecId())){
+            queryWrapper.eq("rec_id", VLtMedicalRecord.getRecId());
         }
-        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
-            queryWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        if(VLtMedicalRecord.getHospitalId()!=null && VLtMedicalRecord.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", VLtMedicalRecord.getHospitalId());
         }
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
-            queryWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", VLtMedicalRecord.getBehospitalCode());
         }
         return queryWrapper;
     }
 
-    public UpdateWrapper updateWrapper(HisMedicalRecord hisMedicalRecord){
+    public UpdateWrapper updateWrapper(VLtMedicalRecord VLtMedicalRecord){
         UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecord>();
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
-            updateWrapper.eq("rec_id", hisMedicalRecord.getRecId());
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getRecId())){
+            updateWrapper.eq("rec_id", VLtMedicalRecord.getRecId());
         }
-        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
-            updateWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
+        if(VLtMedicalRecord.getHospitalId()!=null && VLtMedicalRecord.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", VLtMedicalRecord.getHospitalId());
         }
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
-            updateWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", VLtMedicalRecord.getBehospitalCode());
         }
         return updateWrapper;
     }
 
-    public void addMrecord(HisMedicalRecord hisMedicalRecord){
+    public void addMrecord(VLtMedicalRecord VLtMedicalRecord){
         try{
-            MedicalRecord medicalRecord=this.getOne(queryWrapper(hisMedicalRecord));
+            MedicalRecord medicalRecord=this.getOne(queryWrapper(VLtMedicalRecord));
             MedicalRecord vo=new MedicalRecord();
-            BeanUtils.copyProperties(hisMedicalRecord,vo);
+            BeanUtils.copyProperties(VLtMedicalRecord,vo);
             //初始化mode_id
-            vo.setModeId(initModeId(hisMedicalRecord.getHospitalId(),hisMedicalRecord.getRecTypeId()));
+            vo.setModeId(initModeId(VLtMedicalRecord.getHospitalId(), VLtMedicalRecord.getRecTypeId()));
 
             //获取到对应数据，存到我方数据库中
             if(medicalRecord!=null){
                 vo.setGmtModified(new Date());
                 vo.setIsDeleted(IsDeleteEnum.N.getKey());
                 //更新数据
-                this.update(vo,updateWrapper(hisMedicalRecord));
+                this.update(vo,updateWrapper(VLtMedicalRecord));
             }else{
                 //新增数据
                 vo.setGmtCreate(new Date());

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

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Set;
 
 @Component
-public class VLtRecordTypeFacade extends VLtRecordTypeServiceImpl {
+public class ViewRecordTypeFacade extends VLtRecordTypeServiceImpl {
 
     @Autowired
     RedisUtil redisUtil;

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

@@ -1,60 +0,0 @@
-package com.lantone.data.facade.his;
-
-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.entity.MedicalRecord;
-import com.lantone.data.entity.his.HisMedicalRecord;
-import com.lantone.data.entity.his.HisMedicalRecordContent;
-import com.lantone.data.service.impl.his.HisMedicalRecordContentServiceImpl;
-import com.lantone.data.util.StringUtil;
-import com.lantone.data.vo.data.BehospitalInfoVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class HisMedicalRecordContentFacade extends HisMedicalRecordContentServiceImpl {
-
-    public List<List<HisMedicalRecordContent>> getHisMedicalRecordContentData(List<BehospitalInfoVO> behospitalInfoVO) {
-        List<List<HisMedicalRecordContent>> list = Lists.newLinkedList();
-        behospitalInfoVO.stream().forEach(s -> {
-            List<HisMedicalRecordContent> hisMedicalRecordContent = this.baseMapper.selectList(new QueryWrapper<HisMedicalRecordContent>()
-                    .eq("behospital_code", s.getBehospitalCode())
-                    .eq("hospital_id", s.getHospitalId()));
-            if (hisMedicalRecordContent != null && hisMedicalRecordContent.size() > 0) {
-                list.add(hisMedicalRecordContent);
-            }
-        });
-        return list;
-    }
-
-    public QueryWrapper queryWrapper(HisMedicalRecord hisMedicalRecord, long type){
-        //拼接朗通查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
-            queryWrapper.eq("rec_id", hisMedicalRecord.getRecId());
-        }
-        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
-            queryWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
-        }
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
-            queryWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
-        }
-        return queryWrapper;
-    }
-
-    public UpdateWrapper updateWrapper(HisMedicalRecord hisMedicalRecord){
-        UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecord>();
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getRecId())){
-            updateWrapper.eq("rec_id", hisMedicalRecord.getRecId());
-        }
-        if(hisMedicalRecord.getHospitalId()!=null && hisMedicalRecord.getHospitalId()!=0L){
-            updateWrapper.eq("hospital_id", hisMedicalRecord.getHospitalId());
-        }
-        if(StringUtil.isNotEmpty(hisMedicalRecord.getBehospitalCode())){
-            updateWrapper.eq("behospital_code", hisMedicalRecord.getBehospitalCode());
-        }
-        return updateWrapper;
-    }
-}

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

@@ -1,8 +1,8 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.data.entity.his.HisBehospitalInfo;
-import com.lantone.data.service.impl.his.HisBehospitalInfoServiceImpl;
+import com.lantone.data.entity.his.VLtBehospitalInfo;
+import com.lantone.data.service.impl.his.VLtBehospitalInfoServiceImpl;
 import com.lantone.data.util.DateUtil;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.DataViewVO;
@@ -13,16 +13,16 @@ import java.util.List;
 
 @Component
 @Slf4j
-public class HisBehospitalInfoFacade extends HisBehospitalInfoServiceImpl {
+public class VLtBehospitalInfoFacade extends VLtBehospitalInfoServiceImpl {
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public List<HisBehospitalInfo> getBehospitalInfoData(DataViewVO dataViewVO){
+    public List<VLtBehospitalInfo> getBehospitalInfoData(DataViewVO dataViewVO){
         QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
-        List<HisBehospitalInfo> list=this.baseMapper.selectList(hisQueryWrapper);
+        List<VLtBehospitalInfo> list=this.baseMapper.selectList(hisQueryWrapper);
         return list;
     }
 
@@ -33,7 +33,7 @@ public class HisBehospitalInfoFacade extends HisBehospitalInfoServiceImpl {
      **/
     public QueryWrapper queryWrapper(DataViewVO dataViewVO){
         //拼接his查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<HisBehospitalInfo>();
+        QueryWrapper queryWrapper=new QueryWrapper<VLtBehospitalInfo>();
         if(dataViewVO.getHospitalId()!=null && dataViewVO.getHospitalId()!=0L){
             queryWrapper.eq("HOSPITAL_ID", Long.hashCode(dataViewVO.getHospitalId()));
         }

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

@@ -1,13 +1,12 @@
-package com.lantone.data.facade.dataView;
+package com.lantone.data.facade.his;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.his.VLtDeptInfo;
-import com.diagbot.service.impl.his.VLtDeptInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RedisUtil;
+import com.lantone.data.entity.BasDeptInfo;
+import com.lantone.data.entity.his.VLtDeptInfo;
+import com.lantone.data.service.impl.his.VLtDeptInfoServiceImpl;
+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;
 
@@ -37,7 +36,7 @@ public class VLtDeptInfoFacade extends VLtDeptInfoServiceImpl {
             redisUtil.delete(keys);
 
             //将新获取的数据进行存储
-            List<BasDeptInfo> deptList=BeanUtil.listCopyTo(list,BasDeptInfo.class);
+            List<BasDeptInfo> deptList= BeanUtil.listCopyTo(list,BasDeptInfo.class);
             Boolean flag=redisUtil.setIfAbsent(DEPTS, JSON.toJSONString(deptList));
             return flag;
         }

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

@@ -1,8 +1,8 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.data.entity.his.HisDoctorAdvice;
-import com.lantone.data.service.impl.his.HisDoctorAdviceServiceImpl;
+import com.lantone.data.entity.his.VLtDoctorAdvice;
+import com.lantone.data.service.impl.his.VLtDoctorAdviceServiceImpl;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
@@ -10,17 +10,17 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-public class HisDoctorAdviceFacade extends HisDoctorAdviceServiceImpl {
+public class VLtDoctorAdviceFacade extends VLtDoctorAdviceServiceImpl {
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public List<HisDoctorAdvice> getDoctorAdviceData(DataViewVO dataViewVO){
+    public List<VLtDoctorAdvice> getDoctorAdviceData(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
-            List<HisDoctorAdvice> list=this.baseMapper.selectList(hisQueryWrapper);
+            List<VLtDoctorAdvice> list=this.baseMapper.selectList(hisQueryWrapper);
             return list;
         }catch (Exception e){
             log.error(e.getMessage());
@@ -35,7 +35,7 @@ public class HisDoctorAdviceFacade extends HisDoctorAdviceServiceImpl {
      **/
     private QueryWrapper queryWrapper(DataViewVO dataViewVO){
         //拼接HIS查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<HisDoctorAdvice>();
+        QueryWrapper queryWrapper=new QueryWrapper<VLtDoctorAdvice>();
         if(StringUtil.isNotEmpty(dataViewVO.getDoctorAdviceId())){
             queryWrapper.eq("DOCTOR_ADVICE_ID", dataViewVO.getDoctorAdviceId());
         }

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

@@ -3,8 +3,8 @@ package com.lantone.data.facade.his;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.lantone.data.entity.HomeDiagnoseInfo;
-import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
-import com.lantone.data.service.impl.his.HisHomeDiagnoseInfoServiceImpl;
+import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
+import com.lantone.data.service.impl.his.VLtHomeDiagnoseInfoServiceImpl;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
@@ -12,17 +12,17 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-public class HisHomeDiagnoseInfoFacade extends HisHomeDiagnoseInfoServiceImpl {
+public class VLtHomeDiagnoseInfoFacade extends VLtHomeDiagnoseInfoServiceImpl {
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public List<HisHomeDiagnoseInfo> getHomeDiagnoseData(DataViewVO dataViewVO){
+    public List<VLtHomeDiagnoseInfo> getHomeDiagnoseData(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
-            List<HisHomeDiagnoseInfo> hisHomeDiagnoseList=this.baseMapper.selectList(hisQueryWrapper);
+            List<VLtHomeDiagnoseInfo> hisHomeDiagnoseList=this.baseMapper.selectList(hisQueryWrapper);
             return hisHomeDiagnoseList;
         }catch (Exception e){
             log.error(e.getMessage(),new Throwable());
@@ -37,7 +37,7 @@ public class HisHomeDiagnoseInfoFacade extends HisHomeDiagnoseInfoServiceImpl {
      **/
     private QueryWrapper queryWrapper(DataViewVO dataViewVO){
         //拼接HIS查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<HisHomeDiagnoseInfo>();
+        QueryWrapper queryWrapper=new QueryWrapper<VLtHomeDiagnoseInfo>();
         if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
             queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
         }

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

@@ -1,9 +1,9 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.data.entity.his.HisHomeOperationInfo;
+import com.lantone.data.entity.his.VLtHomeOperationInfo;
 import com.lantone.data.facade.data.HomeOperationInfoFacade;
-import com.lantone.data.service.impl.his.HisHomeOperationInfoServiceImpl;
+import com.lantone.data.service.impl.his.VLtHomeOperationInfoServiceImpl;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.DataViewVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-public class HisHomeOperationInfoFacade extends HisHomeOperationInfoServiceImpl {
+public class VLtHomeOperationInfoFacade extends VLtHomeOperationInfoServiceImpl {
 
     @Autowired
     private HomeOperationInfoFacade homeOperationInfoFacade;
@@ -22,10 +22,10 @@ public class HisHomeOperationInfoFacade extends HisHomeOperationInfoServiceImpl
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public List<HisHomeOperationInfo> getHomeOperationData(DataViewVO dataViewVO){
+    public List<VLtHomeOperationInfo> getHomeOperationData(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO);
-            List<HisHomeOperationInfo> hisHomeOperationList=this.baseMapper.selectList(hisQueryWrapper);
+            List<VLtHomeOperationInfo> hisHomeOperationList=this.baseMapper.selectList(hisQueryWrapper);
             return hisHomeOperationList;
         }catch (Exception e){
             log.error("病案首页手术情况操作失败！"+e.getMessage(),new Throwable());
@@ -40,7 +40,7 @@ public class HisHomeOperationInfoFacade extends HisHomeOperationInfoServiceImpl
      **/
     private QueryWrapper queryWrapper(DataViewVO dataViewVO){
         //拼接HIS查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<HisHomeOperationInfo>();
+        QueryWrapper queryWrapper=new QueryWrapper<VLtHomeOperationInfo>();
         if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
             queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
         }

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

@@ -2,8 +2,8 @@ package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.data.entity.HomePage;
-import com.lantone.data.entity.his.HisHomePage;
-import com.lantone.data.service.impl.his.HisHomePageServiceImpl;
+import com.lantone.data.entity.his.VLtHomePage;
+import com.lantone.data.service.impl.his.VLtHomePageServiceImpl;
 import com.lantone.data.util.StringUtil;
 import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
@@ -11,17 +11,17 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 @Component
-public class HisHomePageFacade extends HisHomePageServiceImpl {
+public class VLtHomePageFacade extends VLtHomePageServiceImpl {
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public HisHomePage getHomePageData(DataViewVO dataViewVO){
+    public VLtHomePage getHomePageData(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO,0L);
-            HisHomePage hisHomePage=this.getOne(hisQueryWrapper);
+            VLtHomePage hisHomePage=this.getOne(hisQueryWrapper);
             return hisHomePage;
         }catch (Exception e){
             log.error(e.getMessage(),new Throwable());
@@ -29,10 +29,10 @@ public class HisHomePageFacade extends HisHomePageServiceImpl {
         }
     }
 
-    public List<HisHomePage> getHomePageSupplement(DataViewVO dataViewVO){
+    public List<VLtHomePage> getHomePageSupplement(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryWrapper(dataViewVO,0L);
-            List<HisHomePage> list=this.baseMapper.selectList(hisQueryWrapper);
+            List<VLtHomePage> list=this.baseMapper.selectList(hisQueryWrapper);
             return list;
         }catch (Exception e){
             log.error(e.getMessage(),new Throwable());
@@ -48,7 +48,7 @@ public class HisHomePageFacade extends HisHomePageServiceImpl {
     private QueryWrapper queryWrapper(DataViewVO dataViewVO,long type){
         if(type==0L){
             //拼接HIS查询条件
-            QueryWrapper queryWrapper=new QueryWrapper<HisHomePage>();
+            QueryWrapper queryWrapper=new QueryWrapper<VLtHomePage>();
             if(StringUtil.isNotEmpty(dataViewVO.getHomePageId())){
                 queryWrapper.eq("HOME_PAGE_ID", dataViewVO.getHomePageId());
             }

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

@@ -0,0 +1,60 @@
+package com.lantone.data.facade.his;
+
+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.entity.MedicalRecord;
+import com.lantone.data.entity.his.VLtMedicalRecord;
+import com.lantone.data.entity.his.VLtMedicalRecordContent;
+import com.lantone.data.service.impl.his.VLtMedicalRecordContentServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.data.BehospitalInfoVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class VLtMedicalRecordContentFacade extends VLtMedicalRecordContentServiceImpl {
+
+    public List<List<VLtMedicalRecordContent>> getHisMedicalRecordContentData(List<BehospitalInfoVO> behospitalInfoVO) {
+        List<List<VLtMedicalRecordContent>> list = Lists.newLinkedList();
+        behospitalInfoVO.stream().forEach(s -> {
+            List<VLtMedicalRecordContent> VLtMedicalRecordContent = this.baseMapper.selectList(new QueryWrapper<VLtMedicalRecordContent>()
+                    .eq("behospital_code", s.getBehospitalCode())
+                    .eq("hospital_id", s.getHospitalId()));
+            if (VLtMedicalRecordContent != null && VLtMedicalRecordContent.size() > 0) {
+                list.add(VLtMedicalRecordContent);
+            }
+        });
+        return list;
+    }
+
+    public QueryWrapper queryWrapper(VLtMedicalRecord VLtMedicalRecord, long type){
+        //拼接朗通查询条件
+        QueryWrapper queryWrapper=new QueryWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getRecId())){
+            queryWrapper.eq("rec_id", VLtMedicalRecord.getRecId());
+        }
+        if(VLtMedicalRecord.getHospitalId()!=null && VLtMedicalRecord.getHospitalId()!=0L){
+            queryWrapper.eq("hospital_id", VLtMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getBehospitalCode())){
+            queryWrapper.eq("behospital_code", VLtMedicalRecord.getBehospitalCode());
+        }
+        return queryWrapper;
+    }
+
+    public UpdateWrapper updateWrapper(VLtMedicalRecord VLtMedicalRecord){
+        UpdateWrapper updateWrapper=new UpdateWrapper<MedicalRecord>();
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getRecId())){
+            updateWrapper.eq("rec_id", VLtMedicalRecord.getRecId());
+        }
+        if(VLtMedicalRecord.getHospitalId()!=null && VLtMedicalRecord.getHospitalId()!=0L){
+            updateWrapper.eq("hospital_id", VLtMedicalRecord.getHospitalId());
+        }
+        if(StringUtil.isNotEmpty(VLtMedicalRecord.getBehospitalCode())){
+            updateWrapper.eq("behospital_code", VLtMedicalRecord.getBehospitalCode());
+        }
+        return updateWrapper;
+    }
+}

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

@@ -1,26 +1,26 @@
 package com.lantone.data.facade.his;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.his.HisMedicalRecord;
-import com.diagbot.service.impl.his.HisMedicalRecordServiceImpl;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.data.DataViewVO;
+import com.lantone.data.entity.his.VLtMedicalRecord;
+import com.lantone.data.service.impl.his.VLtMedicalRecordServiceImpl;
+import com.lantone.data.util.StringUtil;
+import com.lantone.data.vo.DataViewVO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 @Component
-public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
+public class VLtMedicalRecordFacade extends VLtMedicalRecordServiceImpl {
 
     /**
      * @Description:根据接口中的参数，进行查询拉取数据到入院登记表
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public HisMedicalRecord getMedicalRecordData(DataViewVO dataViewVO){
+    public VLtMedicalRecord getMedicalRecordData(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryHisWrapper(dataViewVO);
-            HisMedicalRecord hisMedicalRecord=this.getOne(hisQueryWrapper);
+            VLtMedicalRecord hisMedicalRecord=this.getOne(hisQueryWrapper);
             return hisMedicalRecord;
         }catch (Exception e){
             log.error(e.getMessage());
@@ -33,10 +33,10 @@ public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public List<HisMedicalRecord> getMedicalRecordSupplement(DataViewVO dataViewVO){
+    public List<VLtMedicalRecord> getMedicalRecordSupplement(DataViewVO dataViewVO){
         try{
             QueryWrapper hisQueryWrapper=queryHisWrapper(dataViewVO);
-            List<HisMedicalRecord> hisMedicalRecordList=this.baseMapper.selectList(hisQueryWrapper);
+            List<VLtMedicalRecord> hisMedicalRecordList=this.baseMapper.selectList(hisQueryWrapper);
             return hisMedicalRecordList;
         }catch (Exception e){
             log.error(e.getMessage());
@@ -51,7 +51,7 @@ public class HisMedicalRecordFacade extends HisMedicalRecordServiceImpl {
      **/
     private QueryWrapper queryHisWrapper(DataViewVO dataViewVO){
         //拼接HIS查询条件
-        QueryWrapper queryWrapper=new QueryWrapper<HisMedicalRecord>();
+        QueryWrapper queryWrapper=new QueryWrapper<VLtMedicalRecord>();
         if(StringUtil.isNotEmpty(dataViewVO.getRecId())){
             queryWrapper.eq("REC_ID", dataViewVO.getRecId());
         }

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

@@ -1,7 +1,8 @@
 package com.lantone.data.mapper;
 
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.BasDoctorInfo;
+import com.lantone.data.entity.BasDoctorInfo;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisBehospitalInfo;
+import com.lantone.data.entity.his.VLtBehospitalInfo;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.lantone.data.entity.his.HisBehospitalInfo;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisBehospitalInfoMapper extends BaseMapper<HisBehospitalInfo> {
+public interface VLtBehospitalInfoMapper extends BaseMapper<VLtBehospitalInfo> {
 
 }

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

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

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisDoctorAdvice;
+import com.lantone.data.entity.his.VLtDoctorAdvice;
 
 /**
  * <p>
@@ -11,5 +11,5 @@ import com.lantone.data.entity.his.HisDoctorAdvice;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisDoctorAdviceMapper extends BaseMapper<HisDoctorAdvice> {
+public interface VLtDoctorAdviceMapper extends BaseMapper<VLtDoctorAdvice> {
 }

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

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

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomeDiagnoseInfoMapper extends BaseMapper<HisHomeDiagnoseInfo> {
+public interface VLtHomeDiagnoseInfoMapper extends BaseMapper<VLtHomeDiagnoseInfo> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisHomeOperationInfo;
+import com.lantone.data.entity.his.VLtHomeOperationInfo;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.lantone.data.entity.his.HisHomeOperationInfo;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomeOperationInfoMapper extends BaseMapper<HisHomeOperationInfo> {
+public interface VLtHomeOperationInfoMapper extends BaseMapper<VLtHomeOperationInfo> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisHomePage;
+import com.lantone.data.entity.his.VLtHomePage;
 
 /**
  * <p>
@@ -11,5 +11,5 @@ import com.lantone.data.entity.his.HisHomePage;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomePageMapper extends BaseMapper<HisHomePage> {
+public interface VLtHomePageMapper extends BaseMapper<VLtHomePage> {
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.data.entity.his.HisMedicalRecordContent;
+import com.lantone.data.entity.his.VLtMedicalRecordContent;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.lantone.data.entity.his.HisMedicalRecordContent;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisMedicalRecordContentMapper extends BaseMapper<HisMedicalRecordContent> {
+public interface VLtMedicalRecordContentMapper extends BaseMapper<VLtMedicalRecordContent> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.lantone.data.mapper.his;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.his.HisMedicalRecord;
+import com.lantone.data.entity.his.VLtMedicalRecord;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.diagbot.entity.his.HisMedicalRecord;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisMedicalRecordMapper extends BaseMapper<HisMedicalRecord> {
+public interface VLtMedicalRecordMapper extends BaseMapper<VLtMedicalRecord> {
 
 }

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

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

data-service/src/main/java/com/lantone/data/service/his/HisDoctorAdviceService.java

@@ -1,7 +0,0 @@
-package com.lantone.data.service.his;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisDoctorAdvice;
-
-public interface HisDoctorAdviceService extends IService<HisDoctorAdvice> {
-}

data-service/src/main/java/com/lantone/data/service/his/HisMedicalRecordContentService.java

@@ -1,7 +0,0 @@
-package com.lantone.data.service.his;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.data.entity.his.HisMedicalRecordContent;
-
-public interface HisMedicalRecordContentService extends IService<HisMedicalRecordContent> {
-}

data-service/src/main/java/com/lantone/data/service/his/HisMedicalRecordService.java

@@ -1,7 +0,0 @@
-package com.lantone.data.service.his;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisMedicalRecord;
-
-public interface HisMedicalRecordService extends IService<HisMedicalRecord> {
-}

data-service/src/main/java/com/lantone/data/service/his/HisBehospitalInfoService.java

@@ -1,9 +1,9 @@
 package com.lantone.data.service.his;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisBehospitalInfo;
+import com.lantone.data.entity.his.VLtBehospitalInfo;
 
-public interface HisBehospitalInfoService extends IService<HisBehospitalInfo> {
+public interface VLtBehospitalInfoService extends IService<VLtBehospitalInfo> {
 
 
 }

data-service/src/main/java/com/lantone/data/service/his/VLtDeptInfoService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtDeptInfo;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtDeptInfoService extends IService<VLtDeptInfo> {
+
+}

data-service/src/main/java/com/lantone/data/service/his/VLtDoctorAdviceService.java

@@ -0,0 +1,7 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtDoctorAdvice;
+
+public interface VLtDoctorAdviceService extends IService<VLtDoctorAdvice> {
+}

data-service/src/main/java/com/lantone/data/service/his/VLtDoctorInfoService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtDoctorInfo;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtDoctorInfoService extends IService<VLtDoctorInfo> {
+
+}

data-service/src/main/java/com/lantone/data/service/his/HisHomeDiagnoseInfoService.java

@@ -1,7 +1,7 @@
 package com.lantone.data.service.his;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisHomeDiagnoseInfo;
+import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.diagbot.entity.his.HisHomeDiagnoseInfo;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomeDiagnoseInfoService extends IService<HisHomeDiagnoseInfo> {
+public interface VLtHomeDiagnoseInfoService extends IService<VLtHomeDiagnoseInfo> {
 
 }

data-service/src/main/java/com/lantone/data/service/his/HisHomeOperationInfoService.java

@@ -1,7 +1,7 @@
 package com.lantone.data.service.his;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisHomeOperationInfo;
+import com.lantone.data.entity.his.VLtHomeOperationInfo;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.diagbot.entity.his.HisHomeOperationInfo;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomeOperationInfoService extends IService<HisHomeOperationInfo> {
+public interface VLtHomeOperationInfoService extends IService<VLtHomeOperationInfo> {
 
 }

data-service/src/main/java/com/lantone/data/service/his/HisHomePageService.java

@@ -1,7 +1,7 @@
 package com.lantone.data.service.his;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.his.HisHomePage;
+import com.lantone.data.entity.his.VLtHomePage;
 
 
 /**
@@ -12,5 +12,5 @@ import com.diagbot.entity.his.HisHomePage;
  * @author zhoutg
  * @since 2020-04-13
  */
-public interface HisHomePageService extends IService<HisHomePage> {
+public interface VLtHomePageService extends IService<VLtHomePage> {
 }

data-service/src/main/java/com/lantone/data/service/his/VLtMedicalRecordContentService.java

@@ -0,0 +1,7 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtMedicalRecordContent;
+
+public interface VLtMedicalRecordContentService extends IService<VLtMedicalRecordContent> {
+}

data-service/src/main/java/com/lantone/data/service/his/VLtMedicalRecordService.java

@@ -0,0 +1,7 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtMedicalRecord;
+
+public interface VLtMedicalRecordService extends IService<VLtMedicalRecord> {
+}

data-service/src/main/java/com/lantone/data/service/his/VLtRecordTypeService.java

@@ -0,0 +1,16 @@
+package com.lantone.data.service.his;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.data.entity.his.VLtRecordType;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+public interface VLtRecordTypeService extends IService<VLtRecordType> {
+
+}

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

@@ -1,13 +1,10 @@
 package com.lantone.data.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.BasDeptInfoDTO;
-import com.diagbot.dto.DeptBaseDTO;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.mapper.BasDeptInfoMapper;
-import com.diagbot.service.BasDeptInfoService;
-import com.diagbot.vo.BasDeptInfoVO;
-import com.diagbot.vo.FilterVO;
+import com.lantone.data.entity.BasDeptInfo;
+import com.lantone.data.mapper.BasDeptInfoMapper;
+import com.lantone.data.service.BasDeptInfoService;
+import com.lantone.data.vo.data.BasDeptInfoVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,28 +20,6 @@ import java.util.List;
 @Service
 public class BasDeptInfoServiceImpl extends ServiceImpl<BasDeptInfoMapper, BasDeptInfo> implements BasDeptInfoService {
 
-    @Override
-    public List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO) {
-        return baseMapper.getList(basDeptInfoVO);
-    }
-
-    @Override
-    public List<BasDeptInfoDTO> getListUser(BasDeptInfoVO basDeptInfoVO) {
-        return baseMapper.getListUser(basDeptInfoVO);
-    }
-
-    /**
-     * 查询用户关联科室
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public List<DeptBaseDTO> getDeptByUser(FilterVO filterVO) {
-        return baseMapper.getDeptByUser(filterVO);
-    }
-
-
     /**
      * 根据科室编码，医院编码，批量修改
      * @param list

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

@@ -2,9 +2,9 @@ package com.lantone.data.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.mapper.BasDoctorInfoMapper;
-import com.diagbot.service.BasDoctorInfoService;
+import com.lantone.data.entity.BasDoctorInfo;
+import com.lantone.data.mapper.BasDoctorInfoMapper;
+import com.lantone.data.service.BasDoctorInfoService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

data-service/src/main/java/com/lantone/data/service/impl/his/HisBehospitalInfoServiceImpl.java

@@ -1,12 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisBehospitalInfo;
-import com.lantone.data.mapper.his.HisBehospitalInfoMapper;
-import com.lantone.data.service.his.HisBehospitalInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisBehospitalInfoServiceImpl extends ServiceImpl<HisBehospitalInfoMapper, HisBehospitalInfo> implements HisBehospitalInfoService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisDoctorAdviceServiceImpl.java

@@ -1,12 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisDoctorAdvice;
-import com.lantone.data.mapper.his.HisDoctorAdviceMapper;
-import com.lantone.data.service.his.HisDoctorAdviceService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisDoctorAdviceServiceImpl  extends ServiceImpl<HisDoctorAdviceMapper, HisDoctorAdvice> implements HisDoctorAdviceService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisHomeDiagnoseInfoServiceImpl.java

@@ -1,12 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisHomeDiagnoseInfo;
-import com.lantone.data.mapper.his.HisHomeDiagnoseInfoMapper;
-import com.lantone.data.service.his.HisHomeDiagnoseInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisHomeDiagnoseInfoServiceImpl extends ServiceImpl<HisHomeDiagnoseInfoMapper, HisHomeDiagnoseInfo> implements HisHomeDiagnoseInfoService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisHomeOperationInfoServiceImpl.java

@@ -1,12 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisHomeOperationInfo;
-import com.lantone.data.mapper.his.HisHomeOperationInfoMapper;
-import com.lantone.data.service.his.HisHomeOperationInfoService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisHomeOperationInfoServiceImpl extends ServiceImpl<HisHomeOperationInfoMapper, HisHomeOperationInfo> implements HisHomeOperationInfoService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisHomePageServiceImpl.java

@@ -1,21 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisHomePage;
-import com.lantone.data.mapper.his.HisHomePageMapper;
-import com.lantone.data.service.his.HisHomePageService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Service
-@DS("slave")
-public class HisHomePageServiceImpl extends ServiceImpl<HisHomePageMapper, HisHomePage> implements HisHomePageService {
-
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisMedicalRecordContentServiceImpl.java

@@ -1,12 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.data.entity.his.HisMedicalRecordContent;
-import com.lantone.data.mapper.his.HisMedicalRecordContentMapper;
-import com.lantone.data.service.his.HisMedicalRecordContentService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisMedicalRecordContentServiceImpl  extends ServiceImpl<HisMedicalRecordContentMapper, HisMedicalRecordContent> implements HisMedicalRecordContentService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/HisMedicalRecordServiceImpl.java

@@ -1,13 +0,0 @@
-package com.lantone.data.service.impl.his;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.his.HisMedicalRecord;
-import com.diagbot.mapper.HisMedicalRecordMapper;
-import com.diagbot.service.his.HisMedicalRecordService;
-import org.springframework.stereotype.Service;
-
-@Service
-@DS("slave")
-public class HisMedicalRecordServiceImpl extends ServiceImpl<HisMedicalRecordMapper, HisMedicalRecord> implements HisMedicalRecordService {
-}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtBehospitalInfoServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtBehospitalInfo;
+import com.lantone.data.mapper.his.VLtBehospitalInfoMapper;
+import com.lantone.data.service.his.VLtBehospitalInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtBehospitalInfoServiceImpl extends ServiceImpl<VLtBehospitalInfoMapper, VLtBehospitalInfo> implements VLtBehospitalInfoService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtDeptInfoServiceImpl.java

@@ -0,0 +1,21 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtDeptInfo;
+import com.lantone.data.mapper.his.VLtDeptInfoMapper;
+import com.lantone.data.service.his.VLtDeptInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Service
+@DS("slave")
+public class VLtDeptInfoServiceImpl extends ServiceImpl<VLtDeptInfoMapper, VLtDeptInfo> implements VLtDeptInfoService {
+
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtDoctorAdviceServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtDoctorAdvice;
+import com.lantone.data.mapper.his.VLtDoctorAdviceMapper;
+import com.lantone.data.service.his.VLtDoctorAdviceService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtDoctorAdviceServiceImpl extends ServiceImpl<VLtDoctorAdviceMapper, VLtDoctorAdvice> implements VLtDoctorAdviceService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtDoctorInfoServiceImpl.java

@@ -0,0 +1,21 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtDoctorInfo;
+import com.lantone.data.mapper.his.VLtDoctorInfoMapper;
+import com.lantone.data.service.his.VLtDoctorInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Service
+@DS("slave")
+public class VLtDoctorInfoServiceImpl extends ServiceImpl<VLtDoctorInfoMapper, VLtDoctorInfo> implements VLtDoctorInfoService {
+
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtHomeDiagnoseInfoServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtHomeDiagnoseInfo;
+import com.lantone.data.mapper.his.VLtHomeDiagnoseInfoMapper;
+import com.lantone.data.service.his.VLtHomeDiagnoseInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtHomeDiagnoseInfoServiceImpl extends ServiceImpl<VLtHomeDiagnoseInfoMapper, VLtHomeDiagnoseInfo> implements VLtHomeDiagnoseInfoService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtHomeOperationInfoServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtHomeOperationInfo;
+import com.lantone.data.mapper.his.VLtHomeOperationInfoMapper;
+import com.lantone.data.service.his.VLtHomeOperationInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtHomeOperationInfoServiceImpl extends ServiceImpl<VLtHomeOperationInfoMapper, VLtHomeOperationInfo> implements VLtHomeOperationInfoService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtHomePageServiceImpl.java

@@ -0,0 +1,21 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtHomePage;
+import com.lantone.data.mapper.his.VLtHomePageMapper;
+import com.lantone.data.service.his.VLtHomePageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Service
+@DS("slave")
+public class VLtHomePageServiceImpl extends ServiceImpl<VLtHomePageMapper, VLtHomePage> implements VLtHomePageService {
+
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtMedicalRecordContentServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtMedicalRecordContent;
+import com.lantone.data.mapper.his.VLtMedicalRecordContentMapper;
+import com.lantone.data.service.his.VLtMedicalRecordContentService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtMedicalRecordContentServiceImpl extends ServiceImpl<VLtMedicalRecordContentMapper, VLtMedicalRecordContent> implements VLtMedicalRecordContentService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtMedicalRecordServiceImpl.java

@@ -0,0 +1,12 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtMedicalRecord;
+import com.lantone.data.mapper.his.VLtMedicalRecordMapper;
+import com.lantone.data.service.his.VLtMedicalRecordService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("slave")
+public class VLtMedicalRecordServiceImpl extends ServiceImpl<VLtMedicalRecordMapper, VLtMedicalRecord> implements VLtMedicalRecordService {
+}

data-service/src/main/java/com/lantone/data/service/impl/his/VLtRecordTypeServiceImpl.java

@@ -0,0 +1,21 @@
+package com.lantone.data.service.impl.his;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.data.entity.his.VLtRecordType;
+import com.lantone.data.mapper.his.VLtRecordTypeMapper;
+import com.lantone.data.service.his.VLtRecordTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2022-01-20
+ */
+@Service
+@DS("slave")
+public class VLtRecordTypeServiceImpl extends ServiceImpl<VLtRecordTypeMapper, VLtRecordType> implements VLtRecordTypeService {
+
+}

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

@@ -1,22 +1,20 @@
 package com.lantone.data.task;
 
-import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSON;
-import com.diagbot.annotation.MrqcLog;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.BasDeptInfo;
-import com.diagbot.entity.BasDoctorInfo;
-import com.diagbot.entity.MedRecordType;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
 import com.google.common.collect.Lists;
+import com.lantone.data.annotation.MrqcLog;
+import com.lantone.data.entity.BasDeptInfo;
+import com.lantone.data.entity.BasDoctorInfo;
+import com.lantone.data.entity.MedRecordType;
 import com.lantone.data.facade.data.BasDeptInfoFacade;
 import com.lantone.data.facade.data.BasDoctorInfoFacade;
 import com.lantone.data.facade.data.MedRecordTypeFacade;
-import com.lantone.data.facade.dataView.VLtDeptInfoFacade;
-import com.lantone.data.facade.dataView.VLtDoctorInfoFacade;
-import com.lantone.data.facade.dataView.VLtRecordTypeFacade;
+import com.lantone.data.facade.his.VLtDeptInfoFacade;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -40,15 +38,15 @@ public class DataViewTask {
     private static final String RECORD_TYPE = "recordTypes";
 
     @Autowired
-    private VLtDeptInfoFacade vLtDeptInfoFacade;
+    private VLtDeptInfoFacade VLtDeptInfoFacade;
     @Autowired
     private BasDeptInfoFacade basDeptInfoFacade;
     @Autowired
     private BasDoctorInfoFacade basDoctorInfoFacade;
     @Autowired
-    private VLtDoctorInfoFacade vLtDoctorInfoFacade;
+    private ViewDoctorInfoFacade viewDoctorInfoFacade;
     @Autowired
-    private VLtRecordTypeFacade vLtRecordTypeFacade;
+    private ViewRecordTypeFacade viewRecordTypeFacade;
     @Autowired
     private MedRecordTypeFacade medRecordTypeFacade;
 
@@ -60,9 +58,9 @@ public class DataViewTask {
     @Scheduled(cron = "0 25 17 * * ?")
     public void syncHisData() throws Exception{
         //将his数据存到缓存中
-        vLtRecordTypeFacade.syncRecordType();
-        vLtDeptInfoFacade.syncDeptInfo();
-        vLtDoctorInfoFacade.syncDoctorInfo();
+        viewRecordTypeFacade.syncRecordType();
+        VLtDeptInfoFacade.syncDeptInfo();
+        viewDoctorInfoFacade.syncDoctorInfo();
     }
 
     /**
@@ -79,7 +77,7 @@ public class DataViewTask {
             //根据key值，获取对应的数据
             List<BasDoctorInfo> list= JSON.parseArray(values,BasDoctorInfo.class);
             if(ListUtil.isNotEmpty(list)){
-                aBasDoctorInfoFacade.execute(list);
+                basDoctorInfoFacade.execute(list);
             }
             return RespDTO.onSuc("定时拉取医生信息成功！！！");
         }catch (Exception e){
@@ -100,7 +98,7 @@ public class DataViewTask {
         //根据key值，获取对应的数据
         List<BasDeptInfo> list= JSON.parseArray(values,BasDeptInfo.class);
         if(ListUtil.isNotEmpty(list)){
-            aBasDeptInfoFacade.execute(list);
+            basDeptInfoFacade.execute(list);
         }
     }
 
@@ -117,11 +115,11 @@ public class DataViewTask {
         //根据key值，获取对应的数据
         List<MedRecordType> list= JSON.parseArray(values,MedRecordType.class);
         if(ListUtil.isNotEmpty(list)){
-            aMedRecordTypeFacade.execute(list);
+            medRecordTypeFacade.execute(list);
         }
     }
 
-    public void initDoctors() throws Exception{
+    /*public void initDoctors() throws Exception{
         //获取所有的key值
         Set<String> keys= redisUtil.getKeyList(DEPTS+"**");
         //根据key值，获取对应的数据
@@ -139,7 +137,7 @@ public class DataViewTask {
             });
             //剔除重复项，已最新入库时间为先，医生ID为唯一值
             basDoctorInfoList.sort(Comparator.comparing(BasDoctorInfo::getGmtCreate).reversed());
-            basDoctorInfoList.stream().filter(i->StringUtil.isNotBlank(i.getDoctorId())).findFirst();
+            basDoctorInfoList.stream().filter(i-> StringUtil.isNotBlank(i.getDoctorId())).findFirst();
             Map<String,BasDoctorInfo> doctorMap= new HashMap<>();
             basDoctorInfoList.stream().forEach(s->{
                 if(!doctorMap.containsKey(s.getDoctorId())){
@@ -153,5 +151,5 @@ public class DataViewTask {
             //清除缓存中内容
             redisUtil.delete(keys);
         }
-    }
+    }*/
 }

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

@@ -0,0 +1,52 @@
+package com.lantone.data.util;
+
+
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 对象转换工具类
+ * @author: gaodm
+ * @time: 2018/12/14 14:21
+ */
+public class BeanUtil {
+    /**
+     * 把一个对象的属性值复制给另外一个对象的属性值
+     *
+     * @param source 源对象，被转换的对象
+     * @param target 目标对象，即转换后对象
+     */
+    public static void copyProperties(Object source, Object target) {
+        BeanUtils.copyProperties(source, target);
+    }
+
+    /**
+     * 复制集合
+     *
+     * @param <E>
+     * @param source           转换前的列表
+     * @param destinationClass 转换后列表类
+     * @return 转换后列表
+     */
+    public static <E> List<E> listCopyTo(List<?> source, Class<E> destinationClass) {
+        try {
+            if (source.size() == 0) {
+                return Collections.emptyList();
+            }
+            List<E> res = new ArrayList<E>(source.size());
+            for (Object o : source) {
+                E e = destinationClass.newInstance();
+                BeanUtils.copyProperties(o, e);
+                res.add(e);
+            }
+            return res;
+        } catch (IllegalAccessException ex) {
+            throw new RuntimeException(ex);
+        } catch (InstantiationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.lantone.data.web;
 
 import com.lantone.data.facade.data.*;
-import com.lantone.data.facade.his.HisBehospitalInfoFacade;
+import com.lantone.data.facade.his.VLtBehospitalInfoFacade;
 import com.lantone.data.vo.DeleteFlagVO;
 import com.lantone.data.vo.HisDataDealVO;
 import com.lantone.data.vo.HisDataImportVO;
@@ -247,5 +247,5 @@ public class DataController {
     }
 
     @Autowired
-    private HisBehospitalInfoFacade hisBehospitalInfoFacade;
+    private VLtBehospitalInfoFacade hisBehospitalInfoFacade;
 }

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

@@ -1,10 +1,10 @@
 package com.lantone.data.web;
 
 import com.lantone.data.annotation.MrqcLog;
-import com.lantone.data.facade.dataView.VLtBehospitalInfoFacade;
-import com.lantone.data.facade.dataView.VLtDoctorAdviceFacade;
-import com.lantone.data.facade.dataView.VLtHomePageFacade;
-import com.lantone.data.facade.dataView.VLtMedicalRecordFacade;
+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.swagger.annotations.Api;
@@ -15,54 +15,52 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/qcView/data")
 @Api(value = "对接接口API-视图+接口模式", tags = { "对接接口API-视图+接口模式" })
 public class DataViewController {
 
     @Autowired
-    private VLtBehospitalInfoFacade vLtBehospitalInfoFacade;
+    private ViewBehospitalInfoFacade viewBehospitalInfoFacade;
     @Autowired
-    private VLtDoctorAdviceFacade vLtDoctorAdviceFacade;
+    private ViewDoctorAdviceFacade viewDoctorAdviceFacade;
     @Autowired
-    private VLtMedicalRecordFacade vLtMedicalRecordFacade;
+    private ViewMRecordFacade viewMRecordFacade;
     @Autowired
-    private VLtHomePageFacade vLtHomePageFacade;
+    private ViewHomePageFacade viewHomePageFacade;
 
     @ApiOperation(value = "数据引擎-获取医院病人住院记录信息")
     @PostMapping("/sendPatientInfo")
     @MrqcLog
     public RespDTO sendPatientInfo(@RequestBody DataViewVO dataViewVO) {
-        return vLtBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
+        return viewBehospitalInfoFacade.getBehospitalInfoData(dataViewVO);
     }
 
     @ApiOperation(value = "数据引擎-获取医院医生医嘱信息")
     @PostMapping("/sendDoctorAdvice")
     @MrqcLog
     public RespDTO sendDoctorAdvice(@RequestBody DataViewVO dataViewVO) {
-        return vLtDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
+        return viewDoctorAdviceFacade.getDoctorAdviceData(dataViewVO);
     }
 
     @ApiOperation(value = "运行质控-评分-文书信息")
     @PostMapping("/sendMrRecordIng")
     @MrqcLog
     public RespDTO sendMrRecordIng(@RequestBody DataViewVO dataViewVO) {
-        return vLtMedicalRecordFacade.getMedicalRecordData(dataViewVO);
+        return viewMRecordFacade.getMedicalRecordData(dataViewVO);
     }
 
     @ApiOperation(value = "运行质控-获取病案首页")
     @PostMapping("/sendHomePageIng")
     @MrqcLog
     public RespDTO sendHomePageIng(@RequestBody DataViewVO dataViewVO) {
-        return vLtHomePageFacade.getHomePageData(dataViewVO);
+        return viewHomePageFacade.getHomePageData(dataViewVO);
     }
 
     @ApiOperation(value = "his数据补录,根据单个病历号或某个出院时间段内病历数去进去补录")
     @PostMapping("/dataSupplement")
     @MrqcLog
     public RespDTO dataSupplement(@RequestBody DataViewVO dataViewVO) {
-        return vLtBehospitalInfoFacade.hisDataSupplement(dataViewVO);
+        return viewBehospitalInfoFacade.hisDataSupplement(dataViewVO);
     }
 }

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

@@ -4,6 +4,17 @@ server:
 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:
@@ -34,7 +45,6 @@ ribbon:
   ConnectTimeout: 3000 #服务请求连接超时时间（毫秒）
   ReadTimeout: 3000 #服务请求处理超时时间（毫秒）
 
-swagger.title: 认证中心
-swagger.des: 认证中心相关接口文档
-swagger.version: 0.0.1-SNAPSHOT
-swagger.show: true
+swagger.title: 业务对接中心
+swagger.des: 业务对接中心相关接口文档
+swagger.version: 0.0.1-SNAPSHOT

data-service/src/main/resources/mapper/his/HisBehospitalInfoMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisBehospitalInfoMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtBehospitalInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisBehospitalInfo">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtBehospitalInfo">
         <result column="BEHOSPITAL_CODE" property="behospitalCode" />
         <result column="NAME" property="name" />
         <result column="SEX" property="sex" />

data-service/src/main/resources/mapper/his/VLtDeptInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.VLtDeptInfoMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtDeptInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.VLtDeptInfo">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtDeptInfo">
         <result column="DEPT_ID" property="deptId" />
         <result column="HOSPITAL_ID" property="hospitalId" />
         <result column="PARENT_DEPT_ID" property="parentDeptId" />

data-service/src/main/resources/mapper/his/HisDoctorAdviceMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisDoctorAdviceMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtDoctorAdviceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisDoctorAdvice">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtDoctorAdvice">
         <result column="DOCTOR_ADVICE_ID" property="doctorAdviceId" />
         <result column="BEHOSPITAL_CODE" property="behospitalCode" />
         <result column="ORDER_DOCTOR_NAME" property="orderDoctorName" />

data-service/src/main/resources/mapper/his/VLtDoctorInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.VLtDoctorInfoMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtDoctorInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.VLtDoctorInfo">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtDoctorInfo">
         <id column="DOCTOR_ID" property="doctorId" />
         <result column="HOSPITAL_ID" property="hospitalId" />
         <result column="DEPT_ID" property="deptId" />

data-service/src/main/resources/mapper/his/HisHomeDiagnoseInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisHomeDiagnoseInfoMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtHomeDiagnoseInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomeDiagnoseInfo">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtHomeDiagnoseInfo">
         <result column="HOME_PAGE_ID" property="homePageId" />
         <result column="DIAGNOSE_ORDER_NO" property="diagnoseOrderNo" />
         <result column="DIAGNOSE_TYPE" property="diagnoseType" />

data-service/src/main/resources/mapper/his/HisHomeOperationInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisHomeOperationInfoMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtHomeOperationInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomeOperationInfo">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtHomeOperationInfo">
         <result column="HOME_PAGE_ID" property="homePageId" />
         <result column="OPERATION_ORDER_NO" property="operationOrderNo" />
         <result column="OPERATION_DATE" property="operationDate" />

data-service/src/main/resources/mapper/his/HisHomePageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisHomePageMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtHomePageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisHomePage">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtHomePage">
         <result column="HOME_PAGE_ID" property="homePageId" />
         <result column="HOSPITAL_ID" property="hospitalId" />
         <result column="BEHOSPITAL_CODE" property="behospitalCode" />

data-service/src/main/resources/mapper/his/HisMedicalRecordContentMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisMedicalRecordContentMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtMedicalRecordContentMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisMedicalRecordContent">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtMedicalRecordContent">
         <result column="REC_ID" property="recId" />
         <result column="HOSPITAL_ID" property="hospitalId" />
         <result column="HTML_TEXT" property="htmlText" />

data-service/src/main/resources/mapper/his/HisMedicalRecordMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.HisMedicalRecordMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtMedicalRecordMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.HisMedicalRecord">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtMedicalRecord">
         <result column="REC_ID" property="recId" />
         <result column="BEHOSPITAL_CODE" property="behospitalCode" />
         <result column="ORG_CODE" property="orgCode" />

data-service/src/main/resources/mapper/his/VLtRecordTypeMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.his.VLtRecordTypeMapper">
+<mapper namespace="com.lantone.data.mapper.his.VLtRecordTypeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.his.VLtRecordType">
+    <resultMap id="BaseResultMap" type="com.lantone.data.entity.his.VLtRecordType">
         <result column="TYPE_ID" property="typeId" />
         <result column="HOSPITAL_ID" property="hospitalId" />
         <result column="TYPE_NAME" property="typeName" />

pom.xml

@@ -30,7 +30,6 @@
         <module>message-service</module>
         <module>bus-interceptor</module>
         <module>data-service</module>
-        <module>data-service</module>
     </modules>
 
     <properties>
@@ -120,6 +119,19 @@
                 <version>${druid-spring-boot-starter.version}</version>
             </dependency>
 
+            <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>
+            </dependency>
+
             <!-- mybatisplus 代码生成器所依赖的jar包 包括3种不同类型的模板依赖-->
             <dependency>
                 <groupId>com.baomidou</groupId>