增加与厦门对接的接口

pom.xml

@@ -1,288 +1,286 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.diagbot</groupId>
-    <artifactId>mrqc-sys</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>mrqc-sys</name>
-    <description>病历质控系统</description>
-
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.1.RELEASE</version>
-        <relativePath/>
-    </parent>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
-        <mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
-        <druid.version>1.1.21</druid.version>
-        <swagger.version>2.9.2</swagger.version>
-        <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
-        <logstash.version>5.2</logstash.version>
-        <poi.version>4.1.1</poi.version>
-        <aggregator.version>1.1.0</aggregator.version>
-        <okhttp.version>4.2.2</okhttp.version>
-        <easypoi.version>4.2.0</easypoi.version>
-        <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
-        <docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
-        <registryUrl>http://192.168.2.236:5000/repository/diagbotcloud/</registryUrl>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.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>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jolokia</groupId>
-            <artifactId>jolokia-core</artifactId>
-        </dependency>
-
-        <!-- 开启web-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-
-        <!-- 开启feign-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <!-- dashboard -->
-        <!-- actuator-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <!--hystrix-dashboard-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
-        </dependency>
-        <!--hystrix -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-
-        <!--swagger-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-        <!--database-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <!--security-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>${logstash.version}</version>
-        </dependency>
-
-
-        <!-- mybatis-plus begin -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
-        </dependency>
-        <!-- mybatis-plus end -->
-
-        <!-- 阿里巴巴druid数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
-        <!-- springboot整合mybatis（核心就这一个） -->
-        <!-- 注意顺序，这个一定要放在最下面 -->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
-        </dependency>
-
-        <!--redis设置-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.github.lvyahui8</groupId>
-            <artifactId>spring-boot-data-aggregator-starter</artifactId>
-            <version>${aggregator.version}</version>
-        </dependency>
-
-        <!-- easypoi -->
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
-            <version>${easypoi.version}</version>
-        </dependency>
-<!--
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
-        </dependency>
--->
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>6.2.0.jre8</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-frontend-jaxws -->
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>3.1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>1.8.0</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
-
-
-        <!-- axis 1.4 jar start -->
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>0.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <!-- axis 1.4 jar end -->
-
-
-    </dependencies>
-
-
-
-
-    <!-- 私有仓库 
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.diagbot</groupId>
+	<artifactId>mrqc-sys</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>mrqc-sys</name>
+	<description>病历质控系统</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.1.RELEASE</version>
+		<relativePath />
+	</parent>
+
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
+		<mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
+		<mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
+		<druid.version>1.1.21</druid.version>
+		<swagger.version>2.9.2</swagger.version>
+		<!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
+		<logstash.version>5.2</logstash.version>
+		<poi.version>4.1.1</poi.version>
+		<aggregator.version>1.1.0</aggregator.version>
+		<okhttp.version>4.2.2</okhttp.version>
+		<easypoi.version>4.2.0</easypoi.version>
+		<docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
+		<docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
+		<registryUrl>http://192.168.2.236:5000/repository/diagbotcloud/</registryUrl>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.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>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jolokia</groupId>
+			<artifactId>jolokia-core</artifactId>
+		</dependency>
+
+		<!-- 开启web-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-tomcat</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+
+		<!-- 开启feign-->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+
+		<!-- dashboard -->
+		<!-- actuator-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<!--hystrix-dashboard-->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
+		</dependency>
+		<!--hystrix -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+		</dependency>
+
+		<!--swagger-->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+		<!--database-->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!--security-->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-oauth2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>net.logstash.logback</groupId>
+			<artifactId>logstash-logback-encoder</artifactId>
+			<version>${logstash.version}</version>
+		</dependency>
+
+
+		<!-- mybatis-plus begin -->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>${mybatis-plus-boot-starter.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-generator</artifactId>
+			<version>${mybatis-plus-boot-starter.version}</version>
+		</dependency>
+		<!-- mybatis-plus end -->
+
+		<!-- 阿里巴巴druid数据库连接池 -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>${druid.version}</version>
+		</dependency>
+
+		<!-- springboot整合mybatis（核心就这一个） -->
+		<!-- 注意顺序，这个一定要放在最下面 -->
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>${mybatis-spring-boot.version}</version>
+		</dependency>
+
+		<!--redis设置-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>io.github.lvyahui8</groupId>
+			<artifactId>spring-boot-data-aggregator-starter</artifactId>
+			<version>${aggregator.version}</version>
+		</dependency>
+
+		<!-- easypoi -->
+		<dependency>
+			<groupId>cn.afterturn</groupId>
+			<artifactId>easypoi-spring-boot-starter</artifactId>
+			<version>${easypoi.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.oracle</groupId>
+			<artifactId>ojdbc6</artifactId>
+			<version>11.2.0.3</version>
+			<scope>system</scope>
+			<systemPath>D:/攻心小虫/公司/朗通医疗/项目/质控/通用/代码/mrqc-sys/lib/ojdbc6.jar</systemPath>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+			<version>6.2.0.jre8</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-frontend-jaxws -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>3.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>3.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http-jetty</artifactId>
+			<version>3.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>tools</artifactId>
+			<version>1.8.0</version>
+			<scope>system</scope>
+			<systemPath>${java.home}/../lib/tools.jar</systemPath>
+		</dependency>
+
+
+		<!-- axis 1.4 jar start -->
+		<dependency>
+			<groupId>org.apache.axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-discovery</groupId>
+			<artifactId>commons-discovery</artifactId>
+			<version>0.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis</groupId>
+			<artifactId>axis-jaxrpc</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis</groupId>
+			<artifactId>axis-saaj</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>wsdl4j</groupId>
+			<artifactId>wsdl4j</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<!-- axis 1.4 jar end -->
+
+
+	</dependencies>
+
+
+	<!-- 私有仓库 
     <repositories>
         <repository>
             <id>nexus-releases</id>
@@ -295,7 +293,7 @@
             <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
         </repository>
     </repositories>-->
-    <!-- 私有仓库 
+	<!-- 私有仓库 
     <pluginRepositories>
         <pluginRepository>
             <id>nexus-releases</id>
@@ -314,49 +312,52 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
--->
-    <distributionManagement>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <!-- 添加docker-maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
-                    <forceTags>true</forceTags>
-                    <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
-                    <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                    <serverId>docker-registry</serverId>
-                    <registryUrl>${registryUrl}</registryUrl>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<distributionManagement>
+		<repository>
+			<id>nexus-releases</id>
+			<name>Nexus Release Repository</name>
+			<url>http://192.168.2.236:8081/repository/maven-releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>nexus-snapshots</id>
+			<name>Nexus Snapshot Repository</name>
+			<url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
+-->
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
+			</plugin>
+			<!-- 添加docker-maven插件 -->
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.1.1</version>
+				<configuration>
+					<imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
+					<forceTags>true</forceTags>
+					<!--镜像的FROM，使用压缩的小镜像-->
+					<baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
+					<entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}</directory>
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+					<serverId>docker-registry</serverId>
+					<registryUrl>${registryUrl}</registryUrl>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -15,16 +15,11 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
 
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -122,12 +117,15 @@ import com.diagbot.vo.TaskVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @Description:
  * @author: zhoutg
  * @time: 2020/4/12 11:39
  */
 @Component
+@Slf4j
 public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     @Autowired
@@ -1608,21 +1606,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
-
-    // /**
-    //  * 对出院日期之前3天的未评分的病历进行评分
-    //  */
-    // public void execute2(TaskVO taskVO) {
-    //     List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
-    //     for (BehospitalInfo bean : behospitalInfoList) {
-    //         AnalyzeVO analyzeVO = new AnalyzeVO();
-    //         analyzeVO.setIsTask(true);
-    //         analyzeVO.setHospitalId(bean.getHospitalId());
-    //         analyzeVO.setBehospitalCode(bean.getBehospitalCode());
-    //         authServiceClient.analyze_rpc(analyzeVO);
-    //     }
-    // }
-
     /**
      * 评分api
      *
@@ -1697,65 +1680,48 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 	        else resMapData.put("details", EntityUtil.makeEntityListMap(msgApiDTOList, "modelName"));
         }
         
+        log.info("原本返回的参数为：{}",resMapData);
         if(msgDTOList.size() >0) {
-//        	StringBuffer sb =new StringBuffer();
-//        	sb.append("strHospitalID=xmdwyy&");
-//        	sb.append("strPatientID="+behospitalInfo.getFileCode()+"&");
-//        	sb.append("strVisitNo="+ analyzeVO.getBehospitalCode()+"&");
-//        	sb.append("strVisitType=2&");
-//        	sb.append("strUserID="+behospitalInfo.getBehDoctorId()+"&");
-//        	StringBuffer sbb = new StringBuffer();
-//        	for (MsgDTO dto : msgDTOList) {
-//        		sbb.append(dto.getModelName()+"因"+dto.getMsg()+"扣了"+dto.getScore()+"\n");
-//        	}
-//        	sb.append("strMessageContent="+sbb.toString()+"&");
-//        	sb.append("strMessageType=&");
-//        	sb.append("strSourceName=lantone&");
-//        	sb.append("strToken=54A1CE1F-397A-413D-9E63-59595BA07726");
-//        	
-//        	HttpPost httpPost = new HttpPost("http://192.168.12.210/kemr.service.pub/VisitService.asmx");
-//        	httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
-//        	httpPost.setEntity(new StringEntity(sb.toString(),"utf-8"));
-//        	
-//    		CloseableHttpResponse response2 = HttpClients.createDefault().execute(httpPost);
-//    		System.out.println(response2.getStatusLine().getStatusCode());
-//        	String result = EntityUtils.toString(response2.getEntity());
-//        	System.out.println(result);
-        	
-        	
         	try {
-        	
-	        	 String endpoint = "http://192.168.12.210/kemr.service.pub/VisitService.asmx?wsdl";  
 	             // 直接引用远程的wsdl文件  
 	             // 以下都是套路  
 	             Service service = new Service();  
 	             Call call = (Call) service.createCall();  
-	             call.setTargetEndpointAddress(endpoint);  
-	             call.setOperationName("SendMessage");// WSDL里面描述的接口名称  
+	             call.setTargetEndpointAddress(new java.net.URL("http://192.168.12.210/kemr.service.pub/VisitService.asmx"));  
+	             call.setOperationName(new QName("http://www.kinosoft.net/", "SendMessage"));// WSDL里面描述的接口名称  
+	             call.setUseSOAPAction(true);
+	             call.setSOAPActionURI("http://www.kinosoft.net/SendMessage");
 	             
-	         	call.addParameter("strHospitalID",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strPatientID",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strVisitNo",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strVisitType",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strUserID",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strMessageContent",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数  
-	         	call.addParameter("strMessageType",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数 
-	         	call.addParameter("strSourceName",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数 
-	         	call.addParameter("strToken",  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN);// 接口的参数 
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strHospitalID"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strPatientID"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strVisitNo"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strVisitType"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strUserID"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strMessageContent"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数  
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strMessageType"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数 
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strSourceName"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数 
+	         	call.addParameter(new QName("http://www.kinosoft.net/","strToken"),  org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);// 接口的参数 
 	             
 	         	StringBuffer sbb = new StringBuffer();
 	         	for (MsgDTO dto : msgDTOList) {
 	         		sbb.append(dto.getModelName()+"因"+dto.getMsg()+"扣了"+dto.getScore()+"分值；\n");
 	         	}
 	             call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);// 设置返回类型  
-	             String result = (String) call.invoke(new Object[] {"xmdwyy",behospitalInfo.getFileCode(),analyzeVO.getBehospitalCode(),"2",behospitalInfo.getBehDoctorId(),behospitalInfo.getBehDoctorId()
-	            		 ,sbb.toString(),"","lantone","54A1CE1F-397A-413D-9E63-59595BA07726" 
+	             String result = (String) call.invoke(new Object[] {"xmdwyy",
+	            		 behospitalInfo.getFileCode(),
+	            		 analyzeVO.getBehospitalCode(),
+	            		 "2",
+	            		 behospitalInfo.getBehDoctorId(),
+	            		 sbb.toString(),
+	            		 "",
+	            		 "lantone",
+	            		 "54A1CE1F-397A-413D-9E63-59595BA07726" 
 	             });  
+	             log.info("wsdl调用的参数为：{}、{}、{}、{}",analyzeVO.getBehospitalCode(),behospitalInfo.getFileCode(),behospitalInfo.getBehDoctorId(),sbb.toString());
 	             // 给方法传递参数，并且调用方法  
 	             log.error("wsdl调用结果是:"+result);
         	}catch(Exception e) {
         		log.error("wsdl调用异常",e);
-        		
         	}
         }
         return resMapData;

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

@@ -1,12 +1,17 @@
 package com.diagbot.facade.data;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeOperationDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
@@ -17,12 +22,6 @@ import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
 
 @Component
 public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
@@ -75,11 +74,11 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
             if (homeOperationList != null && homeOperationList.size() > 0) {
                 homeOperationList.stream().forEach(s -> {
 
-                    HomeOperationInfo homeOperationInfo = this.getOne(new QueryWrapper<HomeOperationInfo>()
+                    List<HomeOperationInfo> homeOperationInfos = this.list(new QueryWrapper<HomeOperationInfo>()
                             .eq("home_page_id", s.getHomePageId())
                             .eq("hospital_id", s.getHospitalId())
                             .eq("operation_order_no", s.getOperationOrderNo()));
-                    if (homeOperationInfo != null) {
+                    if (homeOperationInfos != null) {
                         s.setGmtModified(new Date());
                         updateE.add(s);
                     } else {

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

@@ -1,32 +1,68 @@
 package com.diagbot.facade.data;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.AnalyzeRunDTO;
-import com.diagbot.dto.OutputInfo;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.Response;
-import com.diagbot.dto.data.AMedicalRecordDTO;
-import com.diagbot.entity.*;
-import com.diagbot.enums.CacheKeyEnum;
-import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.DoctorAdvice;
+import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.entity.MedCrisisInfo;
+import com.diagbot.entity.MedLisInfo;
+import com.diagbot.entity.MedLisResult;
+import com.diagbot.entity.MedPacsInfo;
+import com.diagbot.entity.MedPacsResult;
+import com.diagbot.entity.StrInformedConsent;
+import com.diagbot.entity.StrTalkInform;
 import com.diagbot.enums.ModeIdEnum;
 import com.diagbot.enums.TableNameEnum;
-import com.diagbot.facade.*;
-import com.diagbot.facade.str.*;
-import com.diagbot.util.*;
+import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.MedLisInfoFacade;
+import com.diagbot.facade.MedPacsInfoFacade;
+import com.diagbot.facade.str.AStrAdmissionNoteFacade;
+import com.diagbot.facade.str.AStrBloodResultFacade;
+import com.diagbot.facade.str.AStrBloodTransfusionFacade;
+import com.diagbot.facade.str.AStrConsultationApplyFacade;
+import com.diagbot.facade.str.AStrConsultationNoteFacade;
+import com.diagbot.facade.str.AStrConsultationRecordFacade;
+import com.diagbot.facade.str.AStrConsultationResultFacade;
+import com.diagbot.facade.str.AStrCrisisNoteFacade;
+import com.diagbot.facade.str.AStrDeathDiscussionFacade;
+import com.diagbot.facade.str.AStrDeathNoteFacade;
+import com.diagbot.facade.str.AStrDifficultCaseFacade;
+import com.diagbot.facade.str.AStrFirstRecordFacade;
+import com.diagbot.facade.str.AStrIllCriticallyFacade;
+import com.diagbot.facade.str.AStrIllSeriouslFacade;
+import com.diagbot.facade.str.AStrLeaveHospitalFacade;
+import com.diagbot.facade.str.AStrOperativeFirstRecord;
+import com.diagbot.facade.str.AStrOperativeNoteFacade;
+import com.diagbot.facade.str.AStrPeriodConclusionFacade;
+import com.diagbot.facade.str.AStrPreoperativeDiscussionFacade;
+import com.diagbot.facade.str.AStrRescueNoteFacade;
+import com.diagbot.facade.str.AStrTransferInNoteFacade;
+import com.diagbot.facade.str.AStrTransferOutNoteFacade;
+import com.diagbot.facade.str.AStrWardRecordFacade;
+import com.diagbot.util.FJTZDBConnHarp;
+import com.diagbot.util.ReadProperties;
 import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.QueryVo;
-import com.diagbot.vo.data.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.One;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import com.diagbot.vo.data.AStrCrisisNoteVO;
+import com.diagbot.vo.data.FJStrAdmissionNoteVo;
+import com.diagbot.vo.data.HisHomePageVO;
+import com.diagbot.vo.data.HisViewVo;
+import com.diagbot.vo.data.StructuralDataVo;
 
-import java.util.*;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Component
@@ -166,7 +202,6 @@ public class StructuralDataFacade {
             System.out.println("评分所耗时为--------" + (time3 - time2));
             aMedAbnormalInfoFacade.saveAbnormalInfo("sendStructuralData总耗时", structuralDataVos.getBehospitalCode(), ""+(time3-time1), JSON.toJSONString(structuralDataVos), "sendStructuralData耗时");
             aMedAbnormalInfoFacade.saveAbnormalInfo("装载数据所耗时为", structuralDataVos.getBehospitalCode(), ""+(time3-time1), JSON.toJSONString(structuralDataVos), "装载数据所耗时为");
-
             return msg;
         } else {
             return RespDTO.onError("未接收到数据!");
@@ -509,6 +544,17 @@ public class StructuralDataFacade {
         Map<String, Object> map = new HashMap<String, Object>();
         if(structuralDataVos.getDockModeType().equals("0")) {
             map.put("records", Arrays.asList(structuralDataVos));
+            
+            AnalyzeRunVO vo = new AnalyzeRunVO();
+        	vo.setBehospitalCode(structuralDataVos.getBehospitalCode());
+        	vo.setHospitalId(structuralDataVos.getHospitalId());
+            new Thread() {
+        		public void run() {
+        			System.gc();
+        			behospitalInfoFacade.analyzeApi(vo);
+        		}
+        	}.start();
+        	
             return RespDTO.onSuc(map);
         }else if (structuralDataVos.getDockModeType().equals("1")) {
             //页面模式

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.AnalyzeDTO;
@@ -31,6 +32,7 @@ import com.diagbot.vo.TaskVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**
@@ -41,6 +43,7 @@ import springfox.documentation.annotations.ApiIgnore;
  * @author zhoutg
  * @since 2020-04-13
  */
+@Slf4j
 @RestController
 @RequestMapping("/qc/behospitalInfo")
 @Api(value = "病历API", tags = { "病历API" })
@@ -121,6 +124,8 @@ public class BehospitalInfoController {
     @PostMapping("/analyze_api")
     @ApiOperation(value = "评分-对外api接口[by:zhoutg]")
     public RespDTO<Map<String, Object> > analyzeApi(@RequestBody AnalyzeRunVO analyzeRunVO) {
+    	
+    	log.info("开始调用请求：传入的参数为：{}",JSON.toJSONString(analyzeRunVO));
     	new Thread() {
     		public void run() {
     			behospitalInfoFacade.analyzeApi(analyzeRunVO);

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

@@ -284,44 +284,14 @@ public class DataController {
         return RespDTO.onSuc(b);
     }
 
-
     @ApiOperation(value = "测试")
     @PostMapping("/getColumnZhAndCh")
     @SysLogger("getColumnZhAndCh")
     public void getColumnZhAndCh() {
-//        aStrConsultationNoteFacade.getColumnZhAndCh();
-//        return RespDTO.onSuc(true);
         aBehospitalInfoFacade.upddateQcTypeId();
     }
 
 
-//    @Autowired
-//    private ColumnFacade columnFacade;
-//    @ApiOperation(value = "病历解析")
-//    @PostMapping("/analyseRec")
-//    @SysLogger("analyseRec")
-//    public RespDTO analyseRec(@RequestBody AColumnVO aColumnVO){
-//        columnFacade.analyseRec(aColumnVO.getHospitalId(),aColumnVO.getModeId(),aColumnVO.getContent());
-//        return RespDTO.onSuc(true);
-//    }
-
-    @ApiOperation(value = "测试1")
-    @PostMapping("/test")
-    @SysLogger("test")
-    public void test(@RequestParam String startTime,@RequestParam String endTime) {
-        List<MedAbnormalInfo> list = aMedAbnormalInfoFacade.list(new LambdaQueryWrapper<MedAbnormalInfo>().eq(MedAbnormalInfo::getModuleName, "his入参").ge(MedAbnormalInfo::getGmtCreate, startTime).le(MedAbnormalInfo::getGmtCreate, endTime));
-        List<StructuralDataVo> collect = list.stream().map((obj) -> {
-            String paramIn = obj.getParamIn();
-            StructuralDataVo structuralDataVo = JSON.parseObject(paramIn, StructuralDataVo.class);
-            return structuralDataVo;
-        }).collect(Collectors.toList());
-        HashSet<String> strings = new HashSet<>();
-        for (StructuralDataVo structuralDataVo : collect) {
-            structuralDataFacade.sendStructuralDataTest(structuralDataVo, strings);
-        }
-        aMedAbnormalInfoFacade.saveAbnormalInfo("modeIds", "3141415996", strings.toString(),strings.toString(), "modeIds");
-
-    }
 
     @PostMapping("/dataViewSupplementaryRecord")
     @ApiOperation(value = "数据补录")