From 4f3b917ffcc1aedfd23ecbf71c26d7b121055e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E9=9C=9E?= <2521530874@qq.com>
Date: Fri, 29 Nov 2019 10:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E5=A4=9A=E4=B8=AAsheet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 download/.settings/org.eclipse.jdt.core.prefs |   3 +
 download/pom.xml                              |  57 +-
 .../src/main/java/com/sict/excel/myExcel.java |   4 +-
 .../sict/excel/test/ScreeningRankQgExcel.java |   2 +-
 .../java/com/sict/excel/test/SerumTest.java   |   2 +-
 .../main/resources/mapper/DownloadMapper.xml  | 560 ++++++++----------
 .../maven/download/download/pom.properties    |   2 +-
 .../META-INF/maven/download/download/pom.xml  |  57 +-
 .../classes/com/sict/excel/myExcel.class      | Bin 3738 -> 3742 bytes
 .../excel/test/ScreeningRankQgExcel.class     | Bin 2024 -> 1923 bytes
 .../com/sict/excel/test/SerumTest.class       | Bin 6847 -> 6691 bytes
 .../target/classes/mapper/DownloadMapper.xml  | 560 ++++++++----------
 download/target/dependency-reduced-pom.xml    |  39 ++
 download/target/maven-archiver/pom.properties |   5 +
 .../compile/default-compile/createdFiles.lst  |   0
 .../compile/default-compile/inputFiles.lst    |  29 +
 .../default-testCompile/inputFiles.lst        |   0
 17 files changed, 641 insertions(+), 679 deletions(-)
 create mode 100644 download/target/dependency-reduced-pom.xml
 create mode 100644 download/target/maven-archiver/pom.properties
 create mode 100644 download/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
 create mode 100644 download/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
 create mode 100644 download/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

diff --git a/download/.settings/org.eclipse.jdt.core.prefs b/download/.settings/org.eclipse.jdt.core.prefs
index 0e49574..5a67b2c 100644
--- a/download/.settings/org.eclipse.jdt.core.prefs
+++ b/download/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/download/pom.xml b/download/pom.xml
index bf4518a..373f41a 100644
--- a/download/pom.xml
+++ b/download/pom.xml
@@ -8,8 +8,6 @@
 	<artifactId>download</artifactId>
 	<version>1.0-SNAPSHOT</version>
 
-
-
 	<dependencies>
 		<!--mybatis核心包 -->
 		<dependency>
@@ -60,40 +58,8 @@
 			<artifactId>poi-excelant</artifactId>
 			<version>3.11-beta2</version>
 		</dependency>
-		<!--<dependency> -->
-		<!--<groupId>com.huawei.paas.cse</groupId> -->
-		<!--<artifactId>cse-solution-service-engine</artifactId> -->
-		<!--<exclusions> -->
-		<!--<exclusion> -->
-		<!--<groupId>org.slf4j</groupId> -->
-		<!--<artifactId>slf4j-log4j12</artifactId> -->
-		<!--</exclusion> -->
-		<!--</exclusions> -->
-		<!--</dependency> -->
-		<!--<dependency> -->
-		<!--<groupId>org.apache.servicecomb</groupId> -->
-		<!--<artifactId>spring-boot-starter-provider</artifactId> -->
-		<!--</dependency> -->
 	</dependencies>
 
-	<!--<dependencyManagement> -->
-	<!--<dependencies> -->
-	<!--<dependency> -->
-	<!--<groupId>org.apache.servicecomb</groupId> -->
-	<!--<artifactId>java-chassis-dependencies-springboot2</artifactId> -->
-	<!--<version>1.1.0.B018</version> -->
-	<!--<type>pom</type> -->
-	<!--<scope>import</scope> -->
-	<!--</dependency> -->
-	<!--<dependency> -->
-	<!--<groupId>com.huawei.paas.cse</groupId> -->
-	<!--<artifactId>cse-dependency</artifactId> -->
-	<!--<version>2.3.46</version> -->
-	<!--<type>pom</type> -->
-	<!--<scope>import</scope> -->
-	<!--</dependency> -->
-	<!--</dependencies> -->
-	<!--</dependencyManagement> -->
 
 	<build>
 		<resources>
@@ -104,6 +70,29 @@
 				</includes>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.2.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>com.sict.excel.myExcel</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 
 </project>
\ No newline at end of file
diff --git a/download/src/main/java/com/sict/excel/myExcel.java b/download/src/main/java/com/sict/excel/myExcel.java
index caee643..a102697 100644
--- a/download/src/main/java/com/sict/excel/myExcel.java
+++ b/download/src/main/java/com/sict/excel/myExcel.java
@@ -67,8 +67,8 @@ public class myExcel {
 		HSSFSheet sheet11 = screeningRankQgExcel.getSheet11(workbook);
 		workbook.setSheetName(10, "门诊筛查排名-血检人数");
 		
-		
-		FileOutputStream outputStream = new FileOutputStream("E:/2019/excel/GICC+map+data.xls");
+	//	FileOutputStream outputStream = new FileOutputStream("E:/2019/excel/GICC+map+data.xls");
+		FileOutputStream outputStream = new FileOutputStream("/home/gcsvr/excel/GICC+map+data.xls");
 		workbook.write(outputStream);
 		outputStream.close();
 	}
diff --git a/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java b/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java
index e21e1bf..44337a5 100644
--- a/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java
@@ -22,7 +22,7 @@ public class ScreeningRankQgExcel {
 			ExportExcelUtil<ScreeningRankDTO> util = new ExportExcelUtil<ScreeningRankDTO>();
 			String[] columnNames = {"排名","医联体名称","血检人数"};
 			List<ScreeningRankDTO> list = mapper.getScreeningRankDTOs();
-			String path = "E:/2019/excel/" + "门诊筛查排名-血检人数.xls";
+			//String path = "E:/2019/excel/" + "门诊筛查排名-血检人数.xls";
 			HSSFSheet sheet = util.exportExcel(workbook,"门诊筛查排名-血检人", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
 			sqlSession.commit();
 		
diff --git a/download/src/main/java/com/sict/excel/test/SerumTest.java b/download/src/main/java/com/sict/excel/test/SerumTest.java
index beb76d8..467e88a 100644
--- a/download/src/main/java/com/sict/excel/test/SerumTest.java
+++ b/download/src/main/java/com/sict/excel/test/SerumTest.java
@@ -156,7 +156,7 @@ public class SerumTest {
 		cell112.setCellValue(String.valueOf(shchyyinInteger.intValue()+gecaintInteger.intValue()+qgInteger.intValue()));
 		
 		
-		FileOutputStream outputStream = new FileOutputStream("E:/2019/excel/筛查监控-血清学检查.xls");
+		//FileOutputStream outputStream = new FileOutputStream("E:/2019/excel/筛查监控-血清学检查.xls");
 
 		sqlSession.commit();
 		shchyy.commit();
diff --git a/download/src/main/resources/mapper/DownloadMapper.xml b/download/src/main/resources/mapper/DownloadMapper.xml
index 7411924..7dd71f6 100644
--- a/download/src/main/resources/mapper/DownloadMapper.xml
+++ b/download/src/main/resources/mapper/DownloadMapper.xml
@@ -6,66 +6,41 @@
 	<!-- 筛查监控-血清学检查 -->
 	<select id="getSerumStatistics"
 		resultType="com.sict.excel.dto.SerumStatisticsDTO">
-		SELECT SUM(serumTestTotal) serumTestTotal,SUM(iggPositive)
-		iggPositive
-		FROM
-		(
-		SELECT
-		sum( 实际血清检测总人次 ) serumTestTotal,
-		sum(
-		HP抗体（IGG）检测阳性总人次 ) iggPositive
-		FROM
-		(
-		(
 		SELECT
-		省份,
-		医联体编号,
-		医联体名称,
-		count( * )
-		实际血清检测总人次,
-		count( HP抗体（IGG）检测 = '阳性' OR NULL )
-		HP抗体（IGG）检测阳性总人次
-		FROM
-		(
+		COUNT(*) serumTestTotal,
+		count(HP抗体（IGG）检测 = '阳性' OR
+		NULL) iggPositive
+		from(
 		SELECT
 		p.id 患者id,
-		rel3.area 省份,
-		rel2.number 医联体编号,
-		rel2.`name` 医联体名称,
-		rel1.step 实验室检查调查进度,
-		rel1.g17 'G-17',
-		rel1.pg1 'PG-Ⅰ',
-		rel1.pg2 'PG-Ⅱ',
-		CASE
-		rel1.igg
-		WHEN 1 THEN
+		p.step step,
+		CASE rel1.igg
+		WHEN 1
+		THEN
 		'阳性'
 		WHEN 0 THEN
-		'阴性' ELSE ''
+		'阴性'
+		ELSE
+		''
 		END HP抗体（IGG）检测,
 		rel1.`status` 审核状态
 		FROM
 		tb_patient AS p
-		RIGHT JOIN ( SELECT patient_id,
-		step, g17, pg1, pg2, igg, `status` FROM
-		tb_lab_inspect ) rel1 ON
-		rel1.patient_id = p.id
-		inner JOIN ( SELECT `name`, number FROM tb_hosp
-		) rel2 ON rel2.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area, `name`
-		FROM tmp_tb_hosp_area ) rel3 ON
-		rel3.`name` = rel2.`name`
+		INNER JOIN (
+		SELECT
+		patient_id,
+		step,
+		igg,
+		`status`
+		FROM
+		tb_lab_inspect
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (SELECT
+		`name`,number FROM tb_hosp )rel2 ON rel2.number = p.hosp_number
 		WHERE
-		rel1.`status` NOT IN ( 0, 5 )
-		) rel
-		GROUP BY
-		医联体名称
-		)
-		) rel
-		GROUP BY
-		医联体名称
-		)result
+		rel1.`status` NOT
+		IN (0, 5)
+		)rel
 	</select>
 
 
@@ -91,70 +66,56 @@
 		rel3.area 省份
 		FROM
 		tb_patient AS p
-		LEFT JOIN ( SELECT `name`, number FROM tb_hosp )
+		INNER JOIN ( SELECT `name`, number FROM tb_hosp )
 		rel1 ON rel1.number =
 		p.hosp_number
-		LEFT JOIN ( SELECT patient_id, step,
+		INNER JOIN ( SELECT patient_id,
+		step,
 		g17, pg1, pg2, igg, `status` FROM
 		tb_lab_inspect ) rel2 ON
 		rel2.patient_id = p.id
-		left JOIN ( SELECT area, `name` FROM
+		INNER JOIN ( SELECT area, `name` FROM
 		tmp_tb_hosp_area ) rel3 ON
 		rel3.`name` = rel1.`name`
 		WHERE
 		rel2.`status`
-		NOT IN ( 0, 5 ) AND rel1.number is not null
+		NOT IN ( 0, 5 )
 		) rel
 		GROUP BY
 		医联体名称
 		ORDER BY
-		actualserum DESC ) actual,(select @rownum :=0) result
+		actualserum DESC )
+		actual,(select @rownum :=0) result
 	</select>
 
 	<!-- 省份早癌排名 -->
 	<select id="getEarlyCancerRankDTOs"
 		resultType="com.sict.excel.dto.EarlyCancerRankDTO">
+		SELECT province,ECamount
+		FROM
+		(
 		SELECT
-		省份 as province,
-		count( 最终诊断详情 LIKE '%"b":1%' OR NULL )
-		+ count( 最终诊断详情
-		LIKE '%"g":1%' OR NULL ) ECamount
+		省份 AS province,
+		count(
+		最终诊断详情 LIKE '%"b":1%'
+		OR NULL
+		) + count(
+		最终诊断详情 LIKE '%"g":1%'
+		OR NULL
+		)
+		ECamount
 		FROM
 		(
 		SELECT
 		p.id 患者id,
 		rel3.area 省份,
 		rel1.step 胃镜检查调查进度,
-		CASE
-		rel1.is_inspect
-		WHEN 1 THEN
-		'是'
-		WHEN
-		0 THEN
-		'否' ELSE ''
-		END 是否胃镜检查,
-		rel1.inspect_way 胃镜检查方式,
-		CASE
-		rel1.capsule
-		WHEN 1 THEN
-		'异常'
-		WHEN 2 THEN
-		'未见异常' ELSE ''
-		END 胃镜检查结果,
-		rel1.precise_way
-		胃镜精查方式,
-		CASE
-		WHEN rel1.diagnose_result = 1 THEN
-		'异常'
-		WHEN
-		rel1.diagnose_result = 2 THEN
-		'未见明显异常' ELSE ''
-		END 最终诊断结果,
 		rel1.diagnose_info 最终诊断详情,
-		rel1.STATUS 审核状态
+		rel1. STATUS 审核状态
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN
+		(
 		SELECT
 		patient_id,
 		step,
@@ -169,18 +130,33 @@
 		tb_gastro_inspect
 		WHERE
 		is_inspect = 1
-		AND `status` NOT IN ( 0, 5 )
-		) rel1
-		ON rel1.patient_id = p.id
-		inner JOIN ( SELECT `name`, number FROM
-		tb_hosp ) rel2 ON rel2.number =
-		p.hosp_number
-		left join ( select area,
-		`name` from tmp_tb_hosp_area ) rel3 on
-		rel3.`name` = rel2.`name`
+		AND `status` NOT IN (0, 5)
+		AND
+		diagnose_result = 1
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number = p.hosp_number
+		LEFT JOIN
+		(
+		SELECT
+		area,
+		`name`
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel3.`name` =
+		rel2.`name`
 		) rel
 		GROUP BY
 		省份
+		)result
+		WHERE ECamount>0
+		ORDER BY ECamount
+		DESC
 	</select>
 
 	<!-- 运营分析-医院早癌 胃癌数 -->
@@ -252,7 +228,7 @@
 		rel3.area
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		step,
@@ -275,7 +251,7 @@
 		INNER JOIN ( SELECT `name`, number FROM
 		tb_hosp )
 		rel2 ON rel2.number = p.hosp_number
-		LEFT JOIN tmp_tb_hosp_area rel3 ON
+		INNER JOIN tmp_tb_hosp_area rel3 ON
 		rel2.`name` = rel3.`name`
 		) rel
 		GROUP BY
@@ -290,7 +266,7 @@
 	<select id="getAnalysisProvinceDTOs"
 		resultType="com.sict.excel.dto.AnalysisProvinceDTO">
 		SELECT
-		provinceName as province,
+		provinceName AS province,
 		SUM(applyHosp) applyHosp,
 		SUM(openAccountHosp) openAccountHosp,
 		SUM(applyAccountHosp)
@@ -302,7 +278,8 @@
 		earlyCancer
 		FROM
 		(
-		(SELECT
+		(
+		SELECT
 		provinceName,
 		COUNT(NULL) applyHosp,
 		COUNT(NULL)
@@ -311,54 +288,34 @@
 		COUNT(NULL)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( * )
+		count(*)
 		provinceScreeningTotal,
-		count( NULL ) earlyCancer
+		count(NULL) earlyCancer
 		FROM
 		(
 		SELECT
-		rel6.area
-		provinceName,
-		rel3.diagnose_info gastroscopyDetailInfo
+		p.id
+		patient_id,
+		rel6.area provinceName
 		FROM
-		tb_patient p
-		RIGHT JOIN ( SELECT patient_id,step, `status` FROM tb_lab_inspect
-		WHERE
-		`status` NOT IN ( 0, 5 ) ) rel1 ON rel1.patient_id = p.id
-		LEFT
-		JOIN ( SELECT patient_id, step, `status` FROM tb_risk_assess WHERE
-		`status` NOT IN ( 0, 5 ) ) rel2 ON rel2.patient_id = p.id
-		AND rel2.step
-		= rel1.step
-		AND rel2.`status` = rel1.`status`
+		( SELECT id,step,hosp_number FROM
+		tb_patient WHERE step=0) p
+		INNER JOIN (
+		SELECT
+		number,
+		`name`
+		FROM
+		tb_hosp
+		)
+		rel5 ON rel5.number = p.hosp_number
 		LEFT JOIN (
 		SELECT
-		patient_id,
-		step,
-		diagnose_info,
-		`status`
+		area,
+		`name`
 		FROM
-		tb_gastro_inspect
-		WHERE
-		`status` NOT IN ( 0, 5 )
-		) rel3 ON rel3.patient_id = p.id
-		AND rel3.step
-		= rel2.step
-		AND rel3.`status` = rel2.`status`
-		LEFT JOIN ( SELECT
-		patient_id, step,`status` FROM tb_flup_plan WHERE
-		`status` NOT IN ( 0,
-		5 ) ) rel4 ON rel4.patient_id = p.id
-		AND rel4.step = rel3.step
-		AND
-		rel4.`status` = rel3.`status`
-		INNER JOIN ( SELECT number, `name` FROM
-		tb_hosp ) rel5 ON rel5.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area,
-		`name` FROM tmp_tb_hosp_area ) rel6 ON
-		rel6.`name` = rel5.`name`
-		) rel
+		tmp_tb_hosp_area
+		) rel6 ON rel6.`name` = rel5.`name`
+		)rel
 		GROUP BY
 		provinceName
 		)
@@ -372,13 +329,16 @@
 		COUNT(NULL)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( NULL )
+		count(NULL)
 		provinceScreeningTotal,
-		count(gastroscopyDetailInfo LIKE '%"b":1%' OR
-		NULL ) + count( gastroscopyDetailInfo LIKE
-		'%"g":1%' OR NULL )
-		earlyCancer
-
+		count(
+		gastroscopyDetailInfo LIKE '%"b":1%'
+		OR
+		NULL
+		) + count(
+		gastroscopyDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) earlyCancer
 		FROM
 		(
 		SELECT
@@ -387,7 +347,7 @@
 		gastroscopyDetailInfo
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		diagnose_info
@@ -396,14 +356,25 @@
 		WHERE
 		is_inspect = 1
 		AND `status` NOT
-		IN ( 0, 5 )
+		IN (0, 5)
 		AND diagnose_result = 1
 		) rel1 ON rel1.patient_id = p.id
-		INNER JOIN ( SELECT `name`, number FROM tb_hosp ) rel2 ON rel2.number
-		=
+		INNER
+		JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number =
 		p.hosp_number
-		LEFT JOIN ( SELECT area, `name` FROM tmp_tb_hosp_area )
-		rel3 ON
+		LEFT JOIN (
+		SELECT
+		area,
+		`name`
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON
 		rel3.`name` = rel2.`name`
 		) rel
 		GROUP BY
@@ -420,12 +391,13 @@
 		COUNT(rel2.area)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( * )
+		count(NULL)
 		provinceScreeningTotal,
-		count( NULL ) earlyCancer
-		FROM tb_hosp rel1 LEFT
-		JOIN tmp_tb_hosp_area rel2 ON rel1.`name` =
-		rel2.`name`
+		count(NULL) earlyCancer
+		FROM
+		tb_hosp rel1
+		INNER
+		JOIN tmp_tb_hosp_area rel2 ON rel1.`name` = rel2.`name`
 		GROUP BY
 		provinceName
 		)
@@ -438,41 +410,50 @@
 		COUNT(NULL) applyAccountHosp,
 		COUNT(NULL) passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( NULL
-		) provinceScreeningTotal,
-		count( NULL ) earlyCancer
+		count(NULL) provinceScreeningTotal,
+		count(NULL) earlyCancer
 		FROM
 		(
 		SELECT
 		DISTINCT
-		rel3.name hospname,
+		rel3. NAME hospname,
 		rel3.area provinceName
-		FROM tb_hosp rel1
-		LEFT JOIN
-		(SELECT area FROM tb_user ) rel2 ON rel2.area like
-		CONCAT('%',rel1.number,'%')
-		LEFT JOIN (SELECT `name`,area FROM
-		tmp_tb_hosp_area ) rel3 ON rel1.`name`
-		= rel3.name
-		WHERE rel2.area is
+		FROM
+		tb_hosp rel1
+		INNER JOIN (SELECT area FROM tb_user) rel2 ON rel2.area LIKE
+		CONCAT('%',
+		rel1.number, '%')
+		INNER JOIN (
+		SELECT
+		`name`,
+		area
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel1.`name` = rel3. NAME
+		WHERE
+		rel2.area IS
 		NOT NULL
 		) rel4
-		GROUP BY provinceName
+		GROUP BY
+		provinceName
 		)
-		)result GROUP BY
+		) result
+		GROUP BY
 		result.provinceName
 	</select>
 
-	<!-- 社区筛查排名-血检人数 -->
+	<!-- 社区筛查排名-血检人数 体检筛查排名 门诊筛查排名 -->
 	<select id="getScreeningRankDTOs"
 		resultType="com.sict.excel.dto.ScreeningRankDTO">
 		SELECT
-		(@rownum := @rownum + 1) as
-		id,hospname,actualserum
+		(@rownum := @rownum + 1) AS id,
+		hospname,
+		actualserum
 		FROM
-		(SELECT
+		(
+		SELECT
 		医联体名称 hospname,
-		count( * ) actualserum
+		count(*) actualserum
 		FROM
 		(
 		SELECT
@@ -484,32 +465,45 @@
 		审核状态
 		FROM
 		tb_patient AS p
-		LEFT JOIN ( SELECT `name`, number FROM tb_hosp
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
 		)
-		rel1 ON rel1.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT patient_id,
+		rel1 ON rel1.number = p.hosp_number
+		INNER JOIN (
+		SELECT
+		patient_id,
 		step,
-		g17, pg1, pg2, igg, `status` FROM
-		tb_lab_inspect ) rel2 ON
-		rel2.patient_id = p.id
+		g17,
+		pg1,
+		pg2,
+		igg,
+		`status`
+		FROM
+		tb_lab_inspect
+		) rel2 ON rel2.patient_id =
+		p.id
 		WHERE
-		rel2.`status`
-		NOT IN ( 0, 5 ) AND
-		rel1.number is not null
+		rel2.`status` NOT IN (0, 5)
 		) rel
 		GROUP BY
 		医联体名称
 		ORDER BY
-		actualserum DESC )
-		actual,(select @rownum :=0) result
+		actualserum DESC
+		) actual,
+		(SELECT @rownum := 0) result
 	</select>
 
 	<!-- 运营分析-图例数据 -->
 	<select id="getAnalysisGraphicDTOs"
 		resultType="com.sict.excel.dto.AnalysisGraphicDTO">
 		SELECT
-		sum(applyGastricCancerScreeningHosp)
+		sum(
+		applyGastricCancerScreeningHosp
+		)
 		applyGastricCancerScreeningHosp,
 		sum(passApplyHosp) passApplyHosp,
 		sum(platAccountApplyHosp) platAccountApplyHosp,
@@ -518,11 +512,12 @@
 		FROM
 		(
 		SELECT
-		SUM(applyGastricCancerScreeningHosp)
+		SUM(
+		applyGastricCancerScreeningHosp
+		)
 		applyGastricCancerScreeningHosp,
 		SUM(passApplyHosp) passApplyHosp,
-		SUM(platAccountApplyHosp)
-		platAccountApplyHosp,
+		SUM(platAccountApplyHosp) platAccountApplyHosp,
 		SUM(openAccountHosp)
 		openAccountHosp
 		FROM
@@ -532,138 +527,93 @@
 		provinceName,
 		COUNT(NULL)
 		applyGastricCancerScreeningHosp,
-		COUNT(NULL)
-		passApplyHosp,
+		COUNT(NULL) passApplyHosp,
 		COUNT(NULL)
 		platAccountApplyHosp,
-		COUNT(provinceName)
-		openAccountHosp
+		COUNT(provinceName) openAccountHosp
 		FROM
 		(
 		SELECT
-		DISTINCT rel3.name hospname,
-		rel3.area
-		provinceName
-		FROM tb_hosp rel1
-		LEFT JOIN (SELECT area FROM tb_user )
-		rel2 ON rel2.area like
-		CONCAT('%',rel1.number,'%')
-		LEFT JOIN (SELECT
-		`name`,area FROM
-		tmp_tb_hosp_area ) rel3 ON rel1.`name`
-		= rel3.name
-		WHERE rel2.area is
+		DISTINCT
+		rel3. NAME hospname,
+		rel3.area provinceName
+		FROM
+		tb_hosp rel1
+		INNER JOIN (SELECT area FROM tb_user) rel2 ON rel2.area LIKE
+		CONCAT('%',
+		rel1.number, '%')
+		INNER JOIN (
+		SELECT
+		`name`,
+		area
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel1.`name` = rel3. NAME
+		WHERE
+		rel2.area IS
 		NOT NULL
 		) rel4
-		GROUP BY provinceName
+		GROUP BY
+		provinceName
 		)
 		UNION
 		(
 		SELECT
-		rel2.area
-		provinceName,
+		rel2.area provinceName,
 		COUNT(NULL) applyGastricCancerScreeningHosp,
-		COUNT(rel2.area) passApplyHosp,
+		COUNT(rel2.area)
+		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		COUNT(NULL) openAccountHosp
-		FROM tb_hosp rel1 LEFT JOIN
-		tmp_tb_hosp_area rel2 ON rel1.`name` =
-		rel2.`name`
-		GROUP BY provinceName
+		COUNT(NULL)
+		openAccountHosp
+		FROM
+		tb_hosp rel1
+		INNER JOIN tmp_tb_hosp_area rel2 ON
+		rel1.`name` = rel2.`name`
+		GROUP BY
+		provinceName
 		)
-		)result GROUP BY
+		) result
+		GROUP BY
 		result.provinceName
-		)result2
+		) result2
 	</select>
 
 	<!-- 筛查监控-胃镜检查 -->
 	<select id="getGastroscopeTestDTOs"
 		resultType="com.sict.excel.dto.GastroscopeTestDTO">
 		SELECT
-		count( gastroscopyResult = '异常' OR NULL )
-		actualGastroscope,
-		count( * ) planGastroscope
+		sum(actual) actualGastroscope,
+		sum(total)
+		planGastroscope
 		FROM
 		(
+		(
 		SELECT
-		p.id patientId,
-		p.`name` patientName,
-		rel6.area provinceName,
-		CASE
-		rel1.igg
-		WHEN 1 THEN
-		'阳性'
-		WHEN 0 THEN
-		'阴性' ELSE ''
-		END iggDetection,
-		CASE
-		rel2.grade
-		WHEN 1 THEN
-		'低风险'
-		WHEN 2 THEN
-		'中风险'
-		WHEN 3 THEN
-		'高风险' ELSE ''
-		END riskLevel,
-		CASE
-		rel3.is_inspect
-		WHEN 1 THEN
-		'是'
-		WHEN 0 THEN
-		'否' ELSE '否'
-		END isGastroscopy,
-		rel3.inspect_way gastroscopyWay,
-		CASE
-		rel3.capsule
-		WHEN 1 THEN
-		'异常'
-		WHEN 2
-		THEN
-		'未见异常' ELSE ''
-		END gastroscopyResult,
-		rel3.precise_way
-		gastroscopyDetailWay,
-		CASE
-		rel3.diagnose_result
-		WHEN 1 THEN
-		'异常'
-		WHEN 2
-		THEN
-		'未见明显异常' ELSE ''
-		END gastroscopyDetailResult,
-		rel3.diagnose_info
-		gastroscopyDetailInfo,
-		rel1.`status` screeningStatus
+		COUNT(DISTINCT p2.patient_id) total,
+		COUNT(NULL) actual
 		FROM
-		tb_patient p
-		RIGHT JOIN ( SELECT patient_id, igg, step, `status` FROM
-		tb_lab_inspect
-		WHERE `status` NOT IN ( 0, 5 ) ) rel1 ON rel1.patient_id
-		= p.id
-		LEFT JOIN ( SELECT patient_id, step, score, grade, `status` FROM
-		tb_risk_assess ) rel2 ON rel2.patient_id = p.id
-		AND rel2.step =
-		rel1.step
-		AND rel2.`status` = rel1.`status`
-		LEFT JOIN ( SELECT
-		patient_id, step, is_inspect, inspect_way, capsule,
-		precise_way,
-		diagnose_result, diagnose_info, `status` FROM
-		tb_gastro_inspect ) rel3
-		ON rel3.patient_id = p.id
-		AND rel3.step = rel2.step
-		AND rel3.`status` =
-		rel2.`status`
-		INNER JOIN ( SELECT number, `name` FROM tb_hosp ) rel5 ON
-		rel5.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area, `name` FROM
-		tmp_tb_hosp_area ) rel6 ON
-		rel6.`name` = rel5.`name`
-		WHERE
-		rel2.grade = 2
-		OR rel2.grade = 3
-		) rel
+		tb_patient p1 INNER JOIN tb_risk_assess p2
+		ON p1.id = p2.patient_id RIGHT JOIN (SELECT `name`,number FROM tb_hosp
+		)rel2 ON rel2.number = p1.hosp_number
+		WHERE p2.grade > 1
+		AND p2.step = 0
+		)
+		UNION
+		(
+		SELECT
+		COUNT(NULL)
+		total,
+		COUNT(p2.capsule) actual
+		FROM
+		tb_patient
+		p1 INNER JOIN tb_gastro_inspect p2
+		on p1.id = p2.patient_id RIGHT JOIN
+		(SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number =
+		p1.hosp_number
+		WHERE p2.capsule = 1
+		)
+		) rell
 	</select>
 
 	<!-- 诊断结果 -->
@@ -717,7 +667,7 @@
 		auditStatus
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		step,
@@ -737,13 +687,13 @@
 		AND diagnose_result = 1
 		) rel1 ON
 		rel1.patient_id = p.id
+		INNER JOIN (SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number =
+		p.hosp_number
 		) rel
 
 	</select>
 
 	<select id="getRiskDTOs" resultType="com.sict.excel.dto.RiskDTO">
-
-
 		SELECT
 		胃癌患病风险等级 as grade,
 		count( * ) total
@@ -751,7 +701,8 @@
 		(
 		SELECT
 		p.id 患者id,
-		rel1.score 胃癌患病风险评分,
+		rel1.score
+		胃癌患病风险评分,
 		CASE
 		rel1.grade
 		WHEN 1 THEN
@@ -763,8 +714,11 @@
 		END 胃癌患病风险等级
 		FROM
 		tb_patient p
-		RIGHT JOIN ( SELECT patient_id, score, grade FROM tb_risk_assess ) rel1 ON
+		INNER JOIN ( SELECT
+		patient_id, score,
+		grade FROM tb_risk_assess ) rel1 ON
 		rel1.patient_id = p.id
+		INNER JOIN (SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number = p.hosp_number
 		) rel
 		GROUP BY
 		胃癌患病风险等级
diff --git a/download/target/classes/META-INF/maven/download/download/pom.properties b/download/target/classes/META-INF/maven/download/download/pom.properties
index 0f9389c..fca7f79 100644
--- a/download/target/classes/META-INF/maven/download/download/pom.properties
+++ b/download/target/classes/META-INF/maven/download/download/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Nov 22 09:15:51 CST 2019
+#Fri Nov 29 10:09:37 CST 2019
 version=1.0-SNAPSHOT
 groupId=download
 m2e.projectName=download
diff --git a/download/target/classes/META-INF/maven/download/download/pom.xml b/download/target/classes/META-INF/maven/download/download/pom.xml
index bf4518a..373f41a 100644
--- a/download/target/classes/META-INF/maven/download/download/pom.xml
+++ b/download/target/classes/META-INF/maven/download/download/pom.xml
@@ -8,8 +8,6 @@
 	<artifactId>download</artifactId>
 	<version>1.0-SNAPSHOT</version>
 
-
-
 	<dependencies>
 		<!--mybatis核心包 -->
 		<dependency>
@@ -60,40 +58,8 @@
 			<artifactId>poi-excelant</artifactId>
 			<version>3.11-beta2</version>
 		</dependency>
-		<!--<dependency> -->
-		<!--<groupId>com.huawei.paas.cse</groupId> -->
-		<!--<artifactId>cse-solution-service-engine</artifactId> -->
-		<!--<exclusions> -->
-		<!--<exclusion> -->
-		<!--<groupId>org.slf4j</groupId> -->
-		<!--<artifactId>slf4j-log4j12</artifactId> -->
-		<!--</exclusion> -->
-		<!--</exclusions> -->
-		<!--</dependency> -->
-		<!--<dependency> -->
-		<!--<groupId>org.apache.servicecomb</groupId> -->
-		<!--<artifactId>spring-boot-starter-provider</artifactId> -->
-		<!--</dependency> -->
 	</dependencies>
 
-	<!--<dependencyManagement> -->
-	<!--<dependencies> -->
-	<!--<dependency> -->
-	<!--<groupId>org.apache.servicecomb</groupId> -->
-	<!--<artifactId>java-chassis-dependencies-springboot2</artifactId> -->
-	<!--<version>1.1.0.B018</version> -->
-	<!--<type>pom</type> -->
-	<!--<scope>import</scope> -->
-	<!--</dependency> -->
-	<!--<dependency> -->
-	<!--<groupId>com.huawei.paas.cse</groupId> -->
-	<!--<artifactId>cse-dependency</artifactId> -->
-	<!--<version>2.3.46</version> -->
-	<!--<type>pom</type> -->
-	<!--<scope>import</scope> -->
-	<!--</dependency> -->
-	<!--</dependencies> -->
-	<!--</dependencyManagement> -->
 
 	<build>
 		<resources>
@@ -104,6 +70,29 @@
 				</includes>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.2.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>com.sict.excel.myExcel</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 
 </project>
\ No newline at end of file
diff --git a/download/target/classes/com/sict/excel/myExcel.class b/download/target/classes/com/sict/excel/myExcel.class
index a3cb874b6157992c3b56c9f7f33a7ae306c2b6a0..aec3759c825a137422e2dd1257273a6fb6ee3d5d 100644
GIT binary patch
delta 25
hcmbOwJ5P4QSvDSJ{fzwFRQ>ei;<BR6SJ{rT0|0q-39A4A

delta 21
dcmbOyJ4<%MSvC%NS1WxZ14GNrH`$J|0{~5_2K4{{

diff --git a/download/target/classes/com/sict/excel/test/ScreeningRankQgExcel.class b/download/target/classes/com/sict/excel/test/ScreeningRankQgExcel.class
index c1a1b5701ce9196bc05a8432cb8352cbbbe682ee..a5685234ed28b76e440d654f2de4b0a7bc086a4e 100644
GIT binary patch
delta 291
zcmX|*JxT*%6h+UMnfb)Yz(~Zz(Wuy1C<9}3j3#QL@hAQ!Vr^w*5wx(dvv3Ks5hWnR
z!UebqTQ^`Eyb!Q>7as4P!}|$eLjP;{@d>PQ_2v(AS;JW<tQp)&l2m;bNdq>hW)IGw
zv=vap8tm<TuXp#Dr_6T1PQU4vP5;TeF+RUo#$>zBzHRy(FBg)?jl4qTo%Nbs8L(+k
z)(w$;Rn5UyE-|j0#AS*JicC`?R;J8wz$~ZC(Pf^zTJ4dZT^ib4IyBkCh-<O0$%(6r
oI+VK=OMS$#YN_xxCwMxA5}xVLa|w$7z=eQO>ryQvF}ijC04owF82|tP

delta 382
zcmXAj%Sr-q6vn^5bJI~UCeo%%uxOECGh>;JR(7+j?Bb2qgA8h@MGoPvMcZ~m?_mgm
zEqZ_+Bzg+zl$#F@=lA>0c@F*r<*)I_CjbMrH+k#{8u^Tt)D2U!`*pjmxjrr;f4>ga
z`t6<<>#oSfloSJ>)b+HC7}5c3!E{Y-6wU^)4Us{t-*q}I$Bzhh1IP`1e1t9Y_m<OS
zP>Q$KqouX2ZbPd$53Oz^%OLccw(T&ixG{cdSP~2-GYKNR^wy30BBq`cJtHRKN>b%j
zLD_i6W=2{aA;Unq!=Oq7LOIBk@&B9#j~PrMgjs}<piDu9i8&N7k4r3|iYWZVmnUbi
zhkcrORB(VpFmg|DggiXt)^a$ek)xtG6`T^5!XnOa4uMLeDB^<tEg(qMSCDW`RiS_N
R&n%HS;mgD`Isw{Me*ug-JK+ET

diff --git a/download/target/classes/com/sict/excel/test/SerumTest.class b/download/target/classes/com/sict/excel/test/SerumTest.class
index effb422d82673cc722d9cad4dc04c637278d1a22..76132701f75bb3444d4a7fa52dcea392e071ff4c 100644
GIT binary patch
delta 737
zcmX|;O-R&H6vfYZ_s!_c{70P`KWF?HCr6zbM;+5LEu9p`ASl{Mn}~9iAQA>HBBlru
z+O()`McRi#Md2d)pePKYpjre;i@;q)yRem7SEJe7_j~8u`|gADqGzt#`*!2Wa{w6*
zKlHl%5g+1Mcd!9B;U1fum^g7tCBh*W&-q`;<;lPY&k^{L0qp+8kzj=#N<GFJ(Y967
zTeZd(jz5HIS~oR4w0ZLqe4tAOUVvXQy|_^Ml=&Mrf?3;$IopDpwjH-@4{qCj+_6KL
zxBIZ5Yr)^>+FVUT(I>1Op`{B%u^pyc$-uFLEK(8#Y#)o2Eb48V9(v(I%0}r^a--LV
z=qME-XI=E?6^n6D)>y()cyL&Lv5W!z<1zWcppp;cvciy(gOl=w<*a}o)AEUxN+mcW
z?^&f(iu3Y@)k<Z!C@)!~6u>M(3^RftKK~~=1<FW1%v#nV$gKES&jz(};$oDIDCY(9
znlWxe1@D`yY+@XhTrx9kR;uE%nPQ9fRhveWWUJ2Bn1qQjp>Eg=8iz@xh&j&hOsQLI
z#<{{a)#}VyzGGUcK5ynY&vwNIbC1{9!A?ZYBVJ)fDQ151D7$n?lUd~`x9c-;v(5wT
z)`?~bYgdm_iww}u9qP79jxO$0Eg@t0#$KhQ%wUPT)J@4HJY%0~ZE_da+0R39q~#+{
sbGO><vWzM2QM*G{G0Fj@P7Z3~QO)&VG}%Hl*+Mi~jfUK-eTGAS0pF!_^Z)<=

delta 869
zcmZ{j%S)6|7{;IHoZ~poMaS_z>UhcVHtIOzC2y%+97{5xAaWIxxKI?ksJTglz@SZ#
ze}JT2G%5-gQbIupK?E8>*(wOyl)G}L);pHcrp<eP-}AobJ@0p(@0+cDSz~*%{rm-h
zAUmGgVw|B^Y!T`Gk<mz?ZzvG%8|dvC89qNUd}{b&Z)DJlUqnS)Lm*TctPk{#_4Ez|
zrdCW=LB-g>B^x&J-3}j>gBljX(lazT*f$)NVjQ$AlsaGOQpeCg{Rq$T|DDx1_09Dz
zZWMNe0CRd_IWfg_E@89Vy}d{@1pUuQqHHIY@5BtVw-`b+iBU}!DULq4pUA6f*Z_XP
z*g|IN5+|ljE^eDb%$PFFnh@@odfYXwxM#w+Z#pq&PGMfAfC8$blQ5Q6X=BVu#?c1C
zYEIBDq~I_ebO>oAnl?Ix47{d}@k~Gr{Kik0kOg(d%S54AgeQ!PZb2)$Oe~X_j5wUp
z+e~4q%o))eOcS!BU#~M=$bk#`D>LYU6PNX8W(vjQivGkbp#)sh@0l&+!VUeFUZF(H
zAc;B5g&QAtiH^TC;bu_#n8$p$*{V~yj|GwnYZrYiL^3DUDvMZ*6h2mSEMX~9xvXx{
zFO<eLHO?}rOILZShUKz1LzSp<R!G*PT2vYXLYe9uf3i}tS*oAw42qVmuJQvz6M|kf
z%LP^m<)}xTXEke(s}?!UTA_Tk&VKHfLkiReBdn7)KDEVe*2|7U?O_uego<>t+)$%r
zi*;Box=FMW-Gd)IAXKWaV};F<_3N8>%@)zh^h2C|z*fO>y^2X5lyrq&!#EF#7SJ1r
o@UT#&d?U3y!Z!I&!s30dIQ++?cI=wezGqUqm_#0xI>lqZ0lc@Dc>n+a

diff --git a/download/target/classes/mapper/DownloadMapper.xml b/download/target/classes/mapper/DownloadMapper.xml
index 7411924..7dd71f6 100644
--- a/download/target/classes/mapper/DownloadMapper.xml
+++ b/download/target/classes/mapper/DownloadMapper.xml
@@ -6,66 +6,41 @@
 	<!-- 筛查监控-血清学检查 -->
 	<select id="getSerumStatistics"
 		resultType="com.sict.excel.dto.SerumStatisticsDTO">
-		SELECT SUM(serumTestTotal) serumTestTotal,SUM(iggPositive)
-		iggPositive
-		FROM
-		(
-		SELECT
-		sum( 实际血清检测总人次 ) serumTestTotal,
-		sum(
-		HP抗体（IGG）检测阳性总人次 ) iggPositive
-		FROM
-		(
-		(
 		SELECT
-		省份,
-		医联体编号,
-		医联体名称,
-		count( * )
-		实际血清检测总人次,
-		count( HP抗体（IGG）检测 = '阳性' OR NULL )
-		HP抗体（IGG）检测阳性总人次
-		FROM
-		(
+		COUNT(*) serumTestTotal,
+		count(HP抗体（IGG）检测 = '阳性' OR
+		NULL) iggPositive
+		from(
 		SELECT
 		p.id 患者id,
-		rel3.area 省份,
-		rel2.number 医联体编号,
-		rel2.`name` 医联体名称,
-		rel1.step 实验室检查调查进度,
-		rel1.g17 'G-17',
-		rel1.pg1 'PG-Ⅰ',
-		rel1.pg2 'PG-Ⅱ',
-		CASE
-		rel1.igg
-		WHEN 1 THEN
+		p.step step,
+		CASE rel1.igg
+		WHEN 1
+		THEN
 		'阳性'
 		WHEN 0 THEN
-		'阴性' ELSE ''
+		'阴性'
+		ELSE
+		''
 		END HP抗体（IGG）检测,
 		rel1.`status` 审核状态
 		FROM
 		tb_patient AS p
-		RIGHT JOIN ( SELECT patient_id,
-		step, g17, pg1, pg2, igg, `status` FROM
-		tb_lab_inspect ) rel1 ON
-		rel1.patient_id = p.id
-		inner JOIN ( SELECT `name`, number FROM tb_hosp
-		) rel2 ON rel2.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area, `name`
-		FROM tmp_tb_hosp_area ) rel3 ON
-		rel3.`name` = rel2.`name`
+		INNER JOIN (
+		SELECT
+		patient_id,
+		step,
+		igg,
+		`status`
+		FROM
+		tb_lab_inspect
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (SELECT
+		`name`,number FROM tb_hosp )rel2 ON rel2.number = p.hosp_number
 		WHERE
-		rel1.`status` NOT IN ( 0, 5 )
-		) rel
-		GROUP BY
-		医联体名称
-		)
-		) rel
-		GROUP BY
-		医联体名称
-		)result
+		rel1.`status` NOT
+		IN (0, 5)
+		)rel
 	</select>
 
 
@@ -91,70 +66,56 @@
 		rel3.area 省份
 		FROM
 		tb_patient AS p
-		LEFT JOIN ( SELECT `name`, number FROM tb_hosp )
+		INNER JOIN ( SELECT `name`, number FROM tb_hosp )
 		rel1 ON rel1.number =
 		p.hosp_number
-		LEFT JOIN ( SELECT patient_id, step,
+		INNER JOIN ( SELECT patient_id,
+		step,
 		g17, pg1, pg2, igg, `status` FROM
 		tb_lab_inspect ) rel2 ON
 		rel2.patient_id = p.id
-		left JOIN ( SELECT area, `name` FROM
+		INNER JOIN ( SELECT area, `name` FROM
 		tmp_tb_hosp_area ) rel3 ON
 		rel3.`name` = rel1.`name`
 		WHERE
 		rel2.`status`
-		NOT IN ( 0, 5 ) AND rel1.number is not null
+		NOT IN ( 0, 5 )
 		) rel
 		GROUP BY
 		医联体名称
 		ORDER BY
-		actualserum DESC ) actual,(select @rownum :=0) result
+		actualserum DESC )
+		actual,(select @rownum :=0) result
 	</select>
 
 	<!-- 省份早癌排名 -->
 	<select id="getEarlyCancerRankDTOs"
 		resultType="com.sict.excel.dto.EarlyCancerRankDTO">
+		SELECT province,ECamount
+		FROM
+		(
 		SELECT
-		省份 as province,
-		count( 最终诊断详情 LIKE '%"b":1%' OR NULL )
-		+ count( 最终诊断详情
-		LIKE '%"g":1%' OR NULL ) ECamount
+		省份 AS province,
+		count(
+		最终诊断详情 LIKE '%"b":1%'
+		OR NULL
+		) + count(
+		最终诊断详情 LIKE '%"g":1%'
+		OR NULL
+		)
+		ECamount
 		FROM
 		(
 		SELECT
 		p.id 患者id,
 		rel3.area 省份,
 		rel1.step 胃镜检查调查进度,
-		CASE
-		rel1.is_inspect
-		WHEN 1 THEN
-		'是'
-		WHEN
-		0 THEN
-		'否' ELSE ''
-		END 是否胃镜检查,
-		rel1.inspect_way 胃镜检查方式,
-		CASE
-		rel1.capsule
-		WHEN 1 THEN
-		'异常'
-		WHEN 2 THEN
-		'未见异常' ELSE ''
-		END 胃镜检查结果,
-		rel1.precise_way
-		胃镜精查方式,
-		CASE
-		WHEN rel1.diagnose_result = 1 THEN
-		'异常'
-		WHEN
-		rel1.diagnose_result = 2 THEN
-		'未见明显异常' ELSE ''
-		END 最终诊断结果,
 		rel1.diagnose_info 最终诊断详情,
-		rel1.STATUS 审核状态
+		rel1. STATUS 审核状态
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN
+		(
 		SELECT
 		patient_id,
 		step,
@@ -169,18 +130,33 @@
 		tb_gastro_inspect
 		WHERE
 		is_inspect = 1
-		AND `status` NOT IN ( 0, 5 )
-		) rel1
-		ON rel1.patient_id = p.id
-		inner JOIN ( SELECT `name`, number FROM
-		tb_hosp ) rel2 ON rel2.number =
-		p.hosp_number
-		left join ( select area,
-		`name` from tmp_tb_hosp_area ) rel3 on
-		rel3.`name` = rel2.`name`
+		AND `status` NOT IN (0, 5)
+		AND
+		diagnose_result = 1
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number = p.hosp_number
+		LEFT JOIN
+		(
+		SELECT
+		area,
+		`name`
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel3.`name` =
+		rel2.`name`
 		) rel
 		GROUP BY
 		省份
+		)result
+		WHERE ECamount>0
+		ORDER BY ECamount
+		DESC
 	</select>
 
 	<!-- 运营分析-医院早癌 胃癌数 -->
@@ -252,7 +228,7 @@
 		rel3.area
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		step,
@@ -275,7 +251,7 @@
 		INNER JOIN ( SELECT `name`, number FROM
 		tb_hosp )
 		rel2 ON rel2.number = p.hosp_number
-		LEFT JOIN tmp_tb_hosp_area rel3 ON
+		INNER JOIN tmp_tb_hosp_area rel3 ON
 		rel2.`name` = rel3.`name`
 		) rel
 		GROUP BY
@@ -290,7 +266,7 @@
 	<select id="getAnalysisProvinceDTOs"
 		resultType="com.sict.excel.dto.AnalysisProvinceDTO">
 		SELECT
-		provinceName as province,
+		provinceName AS province,
 		SUM(applyHosp) applyHosp,
 		SUM(openAccountHosp) openAccountHosp,
 		SUM(applyAccountHosp)
@@ -302,7 +278,8 @@
 		earlyCancer
 		FROM
 		(
-		(SELECT
+		(
+		SELECT
 		provinceName,
 		COUNT(NULL) applyHosp,
 		COUNT(NULL)
@@ -311,54 +288,34 @@
 		COUNT(NULL)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( * )
+		count(*)
 		provinceScreeningTotal,
-		count( NULL ) earlyCancer
+		count(NULL) earlyCancer
 		FROM
 		(
 		SELECT
-		rel6.area
-		provinceName,
-		rel3.diagnose_info gastroscopyDetailInfo
+		p.id
+		patient_id,
+		rel6.area provinceName
 		FROM
-		tb_patient p
-		RIGHT JOIN ( SELECT patient_id,step, `status` FROM tb_lab_inspect
-		WHERE
-		`status` NOT IN ( 0, 5 ) ) rel1 ON rel1.patient_id = p.id
-		LEFT
-		JOIN ( SELECT patient_id, step, `status` FROM tb_risk_assess WHERE
-		`status` NOT IN ( 0, 5 ) ) rel2 ON rel2.patient_id = p.id
-		AND rel2.step
-		= rel1.step
-		AND rel2.`status` = rel1.`status`
+		( SELECT id,step,hosp_number FROM
+		tb_patient WHERE step=0) p
+		INNER JOIN (
+		SELECT
+		number,
+		`name`
+		FROM
+		tb_hosp
+		)
+		rel5 ON rel5.number = p.hosp_number
 		LEFT JOIN (
 		SELECT
-		patient_id,
-		step,
-		diagnose_info,
-		`status`
+		area,
+		`name`
 		FROM
-		tb_gastro_inspect
-		WHERE
-		`status` NOT IN ( 0, 5 )
-		) rel3 ON rel3.patient_id = p.id
-		AND rel3.step
-		= rel2.step
-		AND rel3.`status` = rel2.`status`
-		LEFT JOIN ( SELECT
-		patient_id, step,`status` FROM tb_flup_plan WHERE
-		`status` NOT IN ( 0,
-		5 ) ) rel4 ON rel4.patient_id = p.id
-		AND rel4.step = rel3.step
-		AND
-		rel4.`status` = rel3.`status`
-		INNER JOIN ( SELECT number, `name` FROM
-		tb_hosp ) rel5 ON rel5.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area,
-		`name` FROM tmp_tb_hosp_area ) rel6 ON
-		rel6.`name` = rel5.`name`
-		) rel
+		tmp_tb_hosp_area
+		) rel6 ON rel6.`name` = rel5.`name`
+		)rel
 		GROUP BY
 		provinceName
 		)
@@ -372,13 +329,16 @@
 		COUNT(NULL)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( NULL )
+		count(NULL)
 		provinceScreeningTotal,
-		count(gastroscopyDetailInfo LIKE '%"b":1%' OR
-		NULL ) + count( gastroscopyDetailInfo LIKE
-		'%"g":1%' OR NULL )
-		earlyCancer
-
+		count(
+		gastroscopyDetailInfo LIKE '%"b":1%'
+		OR
+		NULL
+		) + count(
+		gastroscopyDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) earlyCancer
 		FROM
 		(
 		SELECT
@@ -387,7 +347,7 @@
 		gastroscopyDetailInfo
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		diagnose_info
@@ -396,14 +356,25 @@
 		WHERE
 		is_inspect = 1
 		AND `status` NOT
-		IN ( 0, 5 )
+		IN (0, 5)
 		AND diagnose_result = 1
 		) rel1 ON rel1.patient_id = p.id
-		INNER JOIN ( SELECT `name`, number FROM tb_hosp ) rel2 ON rel2.number
-		=
+		INNER
+		JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number =
 		p.hosp_number
-		LEFT JOIN ( SELECT area, `name` FROM tmp_tb_hosp_area )
-		rel3 ON
+		LEFT JOIN (
+		SELECT
+		area,
+		`name`
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON
 		rel3.`name` = rel2.`name`
 		) rel
 		GROUP BY
@@ -420,12 +391,13 @@
 		COUNT(rel2.area)
 		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( * )
+		count(NULL)
 		provinceScreeningTotal,
-		count( NULL ) earlyCancer
-		FROM tb_hosp rel1 LEFT
-		JOIN tmp_tb_hosp_area rel2 ON rel1.`name` =
-		rel2.`name`
+		count(NULL) earlyCancer
+		FROM
+		tb_hosp rel1
+		INNER
+		JOIN tmp_tb_hosp_area rel2 ON rel1.`name` = rel2.`name`
 		GROUP BY
 		provinceName
 		)
@@ -438,41 +410,50 @@
 		COUNT(NULL) applyAccountHosp,
 		COUNT(NULL) passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		count( NULL
-		) provinceScreeningTotal,
-		count( NULL ) earlyCancer
+		count(NULL) provinceScreeningTotal,
+		count(NULL) earlyCancer
 		FROM
 		(
 		SELECT
 		DISTINCT
-		rel3.name hospname,
+		rel3. NAME hospname,
 		rel3.area provinceName
-		FROM tb_hosp rel1
-		LEFT JOIN
-		(SELECT area FROM tb_user ) rel2 ON rel2.area like
-		CONCAT('%',rel1.number,'%')
-		LEFT JOIN (SELECT `name`,area FROM
-		tmp_tb_hosp_area ) rel3 ON rel1.`name`
-		= rel3.name
-		WHERE rel2.area is
+		FROM
+		tb_hosp rel1
+		INNER JOIN (SELECT area FROM tb_user) rel2 ON rel2.area LIKE
+		CONCAT('%',
+		rel1.number, '%')
+		INNER JOIN (
+		SELECT
+		`name`,
+		area
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel1.`name` = rel3. NAME
+		WHERE
+		rel2.area IS
 		NOT NULL
 		) rel4
-		GROUP BY provinceName
+		GROUP BY
+		provinceName
 		)
-		)result GROUP BY
+		) result
+		GROUP BY
 		result.provinceName
 	</select>
 
-	<!-- 社区筛查排名-血检人数 -->
+	<!-- 社区筛查排名-血检人数 体检筛查排名 门诊筛查排名 -->
 	<select id="getScreeningRankDTOs"
 		resultType="com.sict.excel.dto.ScreeningRankDTO">
 		SELECT
-		(@rownum := @rownum + 1) as
-		id,hospname,actualserum
+		(@rownum := @rownum + 1) AS id,
+		hospname,
+		actualserum
 		FROM
-		(SELECT
+		(
+		SELECT
 		医联体名称 hospname,
-		count( * ) actualserum
+		count(*) actualserum
 		FROM
 		(
 		SELECT
@@ -484,32 +465,45 @@
 		审核状态
 		FROM
 		tb_patient AS p
-		LEFT JOIN ( SELECT `name`, number FROM tb_hosp
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
 		)
-		rel1 ON rel1.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT patient_id,
+		rel1 ON rel1.number = p.hosp_number
+		INNER JOIN (
+		SELECT
+		patient_id,
 		step,
-		g17, pg1, pg2, igg, `status` FROM
-		tb_lab_inspect ) rel2 ON
-		rel2.patient_id = p.id
+		g17,
+		pg1,
+		pg2,
+		igg,
+		`status`
+		FROM
+		tb_lab_inspect
+		) rel2 ON rel2.patient_id =
+		p.id
 		WHERE
-		rel2.`status`
-		NOT IN ( 0, 5 ) AND
-		rel1.number is not null
+		rel2.`status` NOT IN (0, 5)
 		) rel
 		GROUP BY
 		医联体名称
 		ORDER BY
-		actualserum DESC )
-		actual,(select @rownum :=0) result
+		actualserum DESC
+		) actual,
+		(SELECT @rownum := 0) result
 	</select>
 
 	<!-- 运营分析-图例数据 -->
 	<select id="getAnalysisGraphicDTOs"
 		resultType="com.sict.excel.dto.AnalysisGraphicDTO">
 		SELECT
-		sum(applyGastricCancerScreeningHosp)
+		sum(
+		applyGastricCancerScreeningHosp
+		)
 		applyGastricCancerScreeningHosp,
 		sum(passApplyHosp) passApplyHosp,
 		sum(platAccountApplyHosp) platAccountApplyHosp,
@@ -518,11 +512,12 @@
 		FROM
 		(
 		SELECT
-		SUM(applyGastricCancerScreeningHosp)
+		SUM(
+		applyGastricCancerScreeningHosp
+		)
 		applyGastricCancerScreeningHosp,
 		SUM(passApplyHosp) passApplyHosp,
-		SUM(platAccountApplyHosp)
-		platAccountApplyHosp,
+		SUM(platAccountApplyHosp) platAccountApplyHosp,
 		SUM(openAccountHosp)
 		openAccountHosp
 		FROM
@@ -532,138 +527,93 @@
 		provinceName,
 		COUNT(NULL)
 		applyGastricCancerScreeningHosp,
-		COUNT(NULL)
-		passApplyHosp,
+		COUNT(NULL) passApplyHosp,
 		COUNT(NULL)
 		platAccountApplyHosp,
-		COUNT(provinceName)
-		openAccountHosp
+		COUNT(provinceName) openAccountHosp
 		FROM
 		(
 		SELECT
-		DISTINCT rel3.name hospname,
-		rel3.area
-		provinceName
-		FROM tb_hosp rel1
-		LEFT JOIN (SELECT area FROM tb_user )
-		rel2 ON rel2.area like
-		CONCAT('%',rel1.number,'%')
-		LEFT JOIN (SELECT
-		`name`,area FROM
-		tmp_tb_hosp_area ) rel3 ON rel1.`name`
-		= rel3.name
-		WHERE rel2.area is
+		DISTINCT
+		rel3. NAME hospname,
+		rel3.area provinceName
+		FROM
+		tb_hosp rel1
+		INNER JOIN (SELECT area FROM tb_user) rel2 ON rel2.area LIKE
+		CONCAT('%',
+		rel1.number, '%')
+		INNER JOIN (
+		SELECT
+		`name`,
+		area
+		FROM
+		tmp_tb_hosp_area
+		) rel3 ON rel1.`name` = rel3. NAME
+		WHERE
+		rel2.area IS
 		NOT NULL
 		) rel4
-		GROUP BY provinceName
+		GROUP BY
+		provinceName
 		)
 		UNION
 		(
 		SELECT
-		rel2.area
-		provinceName,
+		rel2.area provinceName,
 		COUNT(NULL) applyGastricCancerScreeningHosp,
-		COUNT(rel2.area) passApplyHosp,
+		COUNT(rel2.area)
+		passApplyHosp,
 		COUNT(NULL) platAccountApplyHosp,
-		COUNT(NULL) openAccountHosp
-		FROM tb_hosp rel1 LEFT JOIN
-		tmp_tb_hosp_area rel2 ON rel1.`name` =
-		rel2.`name`
-		GROUP BY provinceName
+		COUNT(NULL)
+		openAccountHosp
+		FROM
+		tb_hosp rel1
+		INNER JOIN tmp_tb_hosp_area rel2 ON
+		rel1.`name` = rel2.`name`
+		GROUP BY
+		provinceName
 		)
-		)result GROUP BY
+		) result
+		GROUP BY
 		result.provinceName
-		)result2
+		) result2
 	</select>
 
 	<!-- 筛查监控-胃镜检查 -->
 	<select id="getGastroscopeTestDTOs"
 		resultType="com.sict.excel.dto.GastroscopeTestDTO">
 		SELECT
-		count( gastroscopyResult = '异常' OR NULL )
-		actualGastroscope,
-		count( * ) planGastroscope
+		sum(actual) actualGastroscope,
+		sum(total)
+		planGastroscope
 		FROM
 		(
+		(
 		SELECT
-		p.id patientId,
-		p.`name` patientName,
-		rel6.area provinceName,
-		CASE
-		rel1.igg
-		WHEN 1 THEN
-		'阳性'
-		WHEN 0 THEN
-		'阴性' ELSE ''
-		END iggDetection,
-		CASE
-		rel2.grade
-		WHEN 1 THEN
-		'低风险'
-		WHEN 2 THEN
-		'中风险'
-		WHEN 3 THEN
-		'高风险' ELSE ''
-		END riskLevel,
-		CASE
-		rel3.is_inspect
-		WHEN 1 THEN
-		'是'
-		WHEN 0 THEN
-		'否' ELSE '否'
-		END isGastroscopy,
-		rel3.inspect_way gastroscopyWay,
-		CASE
-		rel3.capsule
-		WHEN 1 THEN
-		'异常'
-		WHEN 2
-		THEN
-		'未见异常' ELSE ''
-		END gastroscopyResult,
-		rel3.precise_way
-		gastroscopyDetailWay,
-		CASE
-		rel3.diagnose_result
-		WHEN 1 THEN
-		'异常'
-		WHEN 2
-		THEN
-		'未见明显异常' ELSE ''
-		END gastroscopyDetailResult,
-		rel3.diagnose_info
-		gastroscopyDetailInfo,
-		rel1.`status` screeningStatus
+		COUNT(DISTINCT p2.patient_id) total,
+		COUNT(NULL) actual
 		FROM
-		tb_patient p
-		RIGHT JOIN ( SELECT patient_id, igg, step, `status` FROM
-		tb_lab_inspect
-		WHERE `status` NOT IN ( 0, 5 ) ) rel1 ON rel1.patient_id
-		= p.id
-		LEFT JOIN ( SELECT patient_id, step, score, grade, `status` FROM
-		tb_risk_assess ) rel2 ON rel2.patient_id = p.id
-		AND rel2.step =
-		rel1.step
-		AND rel2.`status` = rel1.`status`
-		LEFT JOIN ( SELECT
-		patient_id, step, is_inspect, inspect_way, capsule,
-		precise_way,
-		diagnose_result, diagnose_info, `status` FROM
-		tb_gastro_inspect ) rel3
-		ON rel3.patient_id = p.id
-		AND rel3.step = rel2.step
-		AND rel3.`status` =
-		rel2.`status`
-		INNER JOIN ( SELECT number, `name` FROM tb_hosp ) rel5 ON
-		rel5.number =
-		p.hosp_number
-		LEFT JOIN ( SELECT area, `name` FROM
-		tmp_tb_hosp_area ) rel6 ON
-		rel6.`name` = rel5.`name`
-		WHERE
-		rel2.grade = 2
-		OR rel2.grade = 3
-		) rel
+		tb_patient p1 INNER JOIN tb_risk_assess p2
+		ON p1.id = p2.patient_id RIGHT JOIN (SELECT `name`,number FROM tb_hosp
+		)rel2 ON rel2.number = p1.hosp_number
+		WHERE p2.grade > 1
+		AND p2.step = 0
+		)
+		UNION
+		(
+		SELECT
+		COUNT(NULL)
+		total,
+		COUNT(p2.capsule) actual
+		FROM
+		tb_patient
+		p1 INNER JOIN tb_gastro_inspect p2
+		on p1.id = p2.patient_id RIGHT JOIN
+		(SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number =
+		p1.hosp_number
+		WHERE p2.capsule = 1
+		)
+		) rell
 	</select>
 
 	<!-- 诊断结果 -->
@@ -717,7 +667,7 @@
 		auditStatus
 		FROM
 		tb_patient p
-		RIGHT JOIN (
+		INNER JOIN (
 		SELECT
 		patient_id,
 		step,
@@ -737,13 +687,13 @@
 		AND diagnose_result = 1
 		) rel1 ON
 		rel1.patient_id = p.id
+		INNER JOIN (SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number =
+		p.hosp_number
 		) rel
 
 	</select>
 
 	<select id="getRiskDTOs" resultType="com.sict.excel.dto.RiskDTO">
-
-
 		SELECT
 		胃癌患病风险等级 as grade,
 		count( * ) total
@@ -751,7 +701,8 @@
 		(
 		SELECT
 		p.id 患者id,
-		rel1.score 胃癌患病风险评分,
+		rel1.score
+		胃癌患病风险评分,
 		CASE
 		rel1.grade
 		WHEN 1 THEN
@@ -763,8 +714,11 @@
 		END 胃癌患病风险等级
 		FROM
 		tb_patient p
-		RIGHT JOIN ( SELECT patient_id, score, grade FROM tb_risk_assess ) rel1 ON
+		INNER JOIN ( SELECT
+		patient_id, score,
+		grade FROM tb_risk_assess ) rel1 ON
 		rel1.patient_id = p.id
+		INNER JOIN (SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number = p.hosp_number
 		) rel
 		GROUP BY
 		胃癌患病风险等级
diff --git a/download/target/dependency-reduced-pom.xml b/download/target/dependency-reduced-pom.xml
new file mode 100644
index 0000000..cea4fd5
--- /dev/null
+++ b/download/target/dependency-reduced-pom.xml
@@ -0,0 +1,39 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>download</groupId>
+  <artifactId>download</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*.*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer>
+                  <mainClass>com.sict.excel.myExcel</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+
diff --git a/download/target/maven-archiver/pom.properties b/download/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..af90d8f
--- /dev/null
+++ b/download/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Nov 25 15:12:19 CST 2019
+version=1.0-SNAPSHOT
+groupId=download
+artifactId=download
diff --git a/download/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/download/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..e69de29
diff --git a/download/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/download/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..c20583f
--- /dev/null
+++ b/download/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,29 @@
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\ScreeningRankGecaExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\GastroscopeTestDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\EarlyCancerHospitalDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\EarlyCancerRankDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\mapper\DownloadMapper.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\TestExportExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\utils\SqlSessionUtil.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\HpPositiveDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\AnalysisGraphicDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\SerumTest.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\RiskDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\myExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\AnalysisHospitalEarlyCancerExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\Diagnosis.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\ScreeningRankDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\ProvinceEarlyCancerRankExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\utils\ExportExcelUtil.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\GastroscopeTest.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\AnalysisProvinceExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\AnalysisGraphicExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\SerumStatisticsDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\ScreeningRankQgExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\ScreeningRankShchyyExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\AnalysisProvinceDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\bo\AnalysisGraphicBO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\Student.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\DiagnosisDTO.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\test\ScreeningRankProvinceExcel.java
+E:\BIGDATA\HadoopSpace\download\src\main\java\com\sict\excel\dto\ScreeningRankProvinceDTO.java
diff --git a/download/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/download/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
new file mode 100644
index 0000000..e69de29
-- 
2.22.0