文书接口增加0和2的类型处理

pom.xml

@@ -58,6 +58,13 @@
             <groupId>com.diagbot</groupId>
             <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
+            <exclusions>
+            	<exclusion>
+        		 	<groupId>com.github.promeg</groupId>
+        			<artifactId>tinypinyin</artifactId>
+            	</exclusion>
+            </exclusions>
+            
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/diagbot/facade/data/StructuralDataFacade.java

@@ -505,27 +505,44 @@ public class StructuralDataFacade {
             structuralDataVos.setModeId("63");
             execute(structuralDataVos);
         }
-        if (structuralDataVos.getDockModeType().equals("1")) {
+        
+        Map<String, Object> map = new HashMap<String, Object>();
+        if(structuralDataVos.getDockModeType().equals("0")) {
+            map.put("records", Arrays.asList(structuralDataVos));
+            return RespDTO.onSuc(map);
+        }else if (structuralDataVos.getDockModeType().equals("1")) {
             //页面模式
             String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
-            Map<String, Object> map = new HashMap<String, Object>();
             map.put("url", url);
             return RespDTO.onSuc(map);
+        }else if(structuralDataVos.getDockModeType().equals("2")) {
+        	 AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
+             analyzeRunVO.setBehospitalCode(behospitalCode);
+             analyzeRunVO.setHospitalId(hospitalId);
+             analyzeRunVO.setModeId(modeId);
+             AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+             if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+                 map.put("analyze", analyzeRunDTO.getMsgDTOList());
+             }
+             //接口引擎模式
+             return RespDTO.onSuc(map);
         } else {
+        	 //页面模式
+            String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
             AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
-            analyzeRunVO.setBehospitalCode(structuralDataVos.getBehospitalCode());
+            analyzeRunVO.setBehospitalCode(behospitalCode);
             analyzeRunVO.setHospitalId(hospitalId);
             analyzeRunVO.setModeId(modeId);
             AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
-            Map<String, Object> map = new HashMap<String, Object>();
             if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+                map.put("url", url);
                 map.put("analyze", analyzeRunDTO.getMsgDTOList());
             }
-            //接口引擎模式
             return RespDTO.onSuc(map);
         }
     }
 
+    
 
     /**
      * 根据传来的信息编辑视图的sql语句

src/main/java/com/diagbot/web/DataController.java

@@ -1,25 +1,75 @@
 package com.diagbot.web;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.data.*;
+import com.diagbot.dto.data.ABasDeptInfoDTO;
+import com.diagbot.dto.data.ABehospitalInfoDTO;
+import com.diagbot.dto.data.ADoctorAdviceDTO;
+import com.diagbot.dto.data.AHomeDiagnoseDTO;
+import com.diagbot.dto.data.AHomeOperationDTO;
+import com.diagbot.dto.data.AHomePageDTO;
+import com.diagbot.dto.data.AMedCrisisDTO;
+import com.diagbot.dto.data.AMedicalRecordContentDTO;
+import com.diagbot.dto.data.AMedicalRecordDTO;
+import com.diagbot.dto.data.AMedicalRecordTypeDTO;
 import com.diagbot.entity.MedAbnormalInfo;
-import com.diagbot.facade.data.*;
+import com.diagbot.facade.data.ABasDeptInfoFacade;
+import com.diagbot.facade.data.ABasDoctorInfoFacade;
+import com.diagbot.facade.data.ABehospitalInfoFacade;
+import com.diagbot.facade.data.ADoctorAdviceFacade;
+import com.diagbot.facade.data.AHomeDiagnoseInfoFacade;
+import com.diagbot.facade.data.AHomeOperationInfoFacade;
+import com.diagbot.facade.data.AHomePageFacade;
+import com.diagbot.facade.data.AMedAbnormalInfoFacade;
+import com.diagbot.facade.data.AMedCrisisFacade;
+import com.diagbot.facade.data.AMedLisResultFacade;
+import com.diagbot.facade.data.AMedPacsResultFacade;
+import com.diagbot.facade.data.AMedRecordTypeFacade;
+import com.diagbot.facade.data.AMedicalRecordContentFacade;
+import com.diagbot.facade.data.AMedicalRecordFacade;
+import com.diagbot.facade.data.DeleteFlagFacade;
+import com.diagbot.facade.data.StructuralDataFacade;
+import com.diagbot.facade.data.StructuralOldDataFacade;
 import com.diagbot.facade.str.AStrOperativeNoteFacade;
 import com.diagbot.service.impl.DataConsistencyServiceImpl;
-import com.diagbot.vo.data.*;
+import com.diagbot.vo.data.ABasDeptInfoVO;
+import com.diagbot.vo.data.ABehospitalInfoVO;
+import com.diagbot.vo.data.ADeleteFlagVO;
+import com.diagbot.vo.data.ADoctorAdviceVO;
+import com.diagbot.vo.data.AHomeDiagnoseVO;
+import com.diagbot.vo.data.AHomeOperationVO;
+import com.diagbot.vo.data.AHomePageIngVO;
+import com.diagbot.vo.data.AHomePageVO;
+import com.diagbot.vo.data.AMedCrisisVO;
+import com.diagbot.vo.data.AMedLisResultVO;
+import com.diagbot.vo.data.AMedPacsResultVO;
+import com.diagbot.vo.data.AMedicalRecordContentVO;
+import com.diagbot.vo.data.AMedicalRecordTypeVO;
+import com.diagbot.vo.data.AMedicalRecordVO;
+import com.diagbot.vo.data.AMrContentVO;
+import com.diagbot.vo.data.APlaceFileVO;
+import com.diagbot.vo.data.BeHospitalInfoDataVo;
+import com.diagbot.vo.data.HisDataDealVO;
+import com.diagbot.vo.data.StructuralDataVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/qc/data")
@@ -58,8 +108,6 @@ public class DataController {
     @Autowired
     private StructuralOldDataFacade sendOnebehospitalCode;
     @Autowired
-    private AStrOperativeNoteFacade aStrOperativeNoteFacade;
-    @Autowired
     private DataConsistencyServiceImpl dataConsistencyService;
     @Autowired
     private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;

src/main/resources/logback-spring.xml

@@ -7,18 +7,11 @@
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr"
-                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式 -->
-    <!--<property name="CONSOLE_LOG_PATTERN"-->
-    <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!--包名输出缩进对齐-->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!--  日志记录器，日期滚动记录
             ERROR 级别
@@ -190,60 +183,13 @@
     </appender>
 
 
-    <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
-    <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-    <!--<connectionSource-->
-    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
-    <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
-    <!--<user>root</user>-->
-    <!--<password>a123456789</password>-->
-    <!--</connectionSource>-->
-    <!--</appender>-->
-
     <!-- FrameworkServlet日志-->
     <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="DEBUG"/>
-    <logger name="java.sql" level="DEBUG"/>
-
-    <!--  项目 mapper 路径
-            console控制台显示sql语句：STDOUT.filter.level -> debug级别
-    -->
-    <logger name="com.diagbot.mapper" level="DEBUG"/>
-
-    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.236:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.241:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRE" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.121:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRO" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.122:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
+    <logger name="org.apache.ibatis" level="INFO"/>
+    <logger name="java.sql" level="INFO"/>
+    <logger name="com.diagbot.mapper" level="INFO"/>
 
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">

src/test/java/com/diagbot/CodeGeneration.java

@@ -1,83 +0,0 @@
-package com.diagbot;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-/**
- * @Description: 代码生成器
- * @author: gaodm
- * @time: 2018/8/2 10:15
- */
-public class CodeGeneration {
-
-    /**
-     *
-     * @Title: main
-     * @Description: 生成
-     * @param args
-     */
-    public static void main(String[] args) {
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//mrqcsys");
-        gc.setFileOverride(true);
-        gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
-        gc.setEnableCache(false);// XML 二级缓存
-        gc.setBaseResultMap(true);// XML ResultMap
-        gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
-
-        // 自定义文件命名，注意 %s 会自动填充表实体属性！
-        gc.setControllerName("%sController");
-        gc.setServiceName("%sService");
-        gc.setServiceImplName("%sServiceImpl");
-        gc.setMapperName("%sMapper");
-        gc.setXmlName("%sMapper");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("teamtec");
-        dsc.setPassword("rpPh9Gn6BQ");
-        dsc.setUrl("jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
-        mpg.setDataSource(dsc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
-        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "str_informed_consent"}); // 需要生成的表
-
-        strategy.setSuperServiceClass(null);
-        strategy.setSuperServiceImplClass(null);
-        strategy.setSuperMapperClass(null);
-
-        mpg.setStrategy(strategy);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent("com.diagbot");
-        pc.setController("web");
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setEntity("entity");
-        pc.setXml("resources.mapper");
-        mpg.setPackageInfo(pc);
-
-        // 执行生成
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-
-    }
-}

src/test/java/com/diagbot/MrqcSysApplicationTests.java

@@ -1,16 +0,0 @@
-package com.diagbot;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MrqcSysApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}