From e680058402c081bcdc7846868da8975d6ce15e59 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 17:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9excel=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/dto/EarlyCancerHospitalDTO.java     |  18 --
 .../src/main/java/com/sict/excel/myExcel.java |  12 +-
 .../sict/excel/test/AnalysisGraphicExcel.java |  74 ++++++-
 .../AnalysisHospitalEarlyCancerExcel.java     | 181 ++++++++++++++++--
 .../excel/test/AnalysisProvinceExcel.java     |  70 ++++++-
 .../test/ProvinceEarlyCancerRankExcel.java    |  13 +-
 .../excel/test/ScreeningRankGecaExcel.java    |  15 +-
 .../test/ScreeningRankProvinceExcel.java      |  12 +-
 .../sict/excel/test/ScreeningRankQgExcel.java |  14 +-
 .../excel/test/ScreeningRankShchyyExcel.java  |  12 +-
 .../java/com/sict/excel/test/SerumTest.java   |   4 +-
 .../main/resources/mapper/DownloadMapper.xml  | 135 +++++++------
 .../maven/download/download/pom.properties    |   2 +-
 .../excel/dto/EarlyCancerHospitalDTO.class    | Bin 3448 -> 3278 bytes
 .../classes/com/sict/excel/myExcel.class      | Bin 3742 -> 3738 bytes
 .../excel/test/AnalysisGraphicExcel.class     | Bin 2949 -> 4426 bytes
 .../AnalysisHospitalEarlyCancerExcel.class    | Bin 2186 -> 6862 bytes
 .../excel/test/AnalysisProvinceExcel.class    | Bin 2102 -> 4352 bytes
 .../test/ProvinceEarlyCancerRankExcel.class   | Bin 1911 -> 2552 bytes
 .../excel/test/ScreeningRankGecaExcel.class   | Bin 2037 -> 2926 bytes
 .../test/ScreeningRankProvinceExcel.class     | Bin 1982 -> 2980 bytes
 .../excel/test/ScreeningRankQgExcel.class     | Bin 1923 -> 2916 bytes
 .../excel/test/ScreeningRankShchyyExcel.class | Bin 2042 -> 2931 bytes
 .../com/sict/excel/test/SerumTest.class       | Bin 6691 -> 6691 bytes
 .../target/classes/mapper/DownloadMapper.xml  | 135 +++++++------
 25 files changed, 512 insertions(+), 185 deletions(-)

diff --git a/download/src/main/java/com/sict/excel/dto/EarlyCancerHospitalDTO.java b/download/src/main/java/com/sict/excel/dto/EarlyCancerHospitalDTO.java
index 3ffe592..50287f1 100644
--- a/download/src/main/java/com/sict/excel/dto/EarlyCancerHospitalDTO.java
+++ b/download/src/main/java/com/sict/excel/dto/EarlyCancerHospitalDTO.java
@@ -37,54 +37,36 @@ public class EarlyCancerHospitalDTO {
 		this.total = total;
 	}
 	public Integer getHighEsophagealNeoplasia() {
-		if (highEsophagealNeoplasia==0) {
-			return null;
-		}
 		return highEsophagealNeoplasia;
 	}
 	public void setHighEsophagealNeoplasia(Integer highEsophagealNeoplasia) {
 		this.highEsophagealNeoplasia = highEsophagealNeoplasia;
 	}
 	public Integer getEarlyEsophagealCancer() {
-		if (earlyEsophagealCancer==0) {
-			return null;
-		}
 		return earlyEsophagealCancer;
 	}
 	public void setEarlyEsophagealCancer(Integer earlyEsophagealCancer) {
 		this.earlyEsophagealCancer = earlyEsophagealCancer;
 	}
 	public Integer getAdvancedEsophagealCancer() {
-		if (advancedEsophagealCancer==0) {
-			return null;
-		}
 		return advancedEsophagealCancer;
 	}
 	public void setAdvancedEsophagealCancer(Integer advancedEsophagealCancer) {
 		this.advancedEsophagealCancer = advancedEsophagealCancer;
 	}
 	public Integer getHighGastricNeoplasia() {
-		if (highGastricNeoplasia==0) {
-			return null;
-		}
 		return highGastricNeoplasia;
 	}
 	public void setHighGastricNeoplasia(Integer highGastricNeoplasia) {
 		this.highGastricNeoplasia = highGastricNeoplasia;
 	}
 	public Integer getEarlyGastricCancer() {
-		if (earlyGastricCancer==0) {
-			return null;
-		}
 		return earlyGastricCancer;
 	}
 	public void setEarlyGastricCancer(Integer earlyGastricCancer) {
 		this.earlyGastricCancer = earlyGastricCancer;
 	}
 	public Integer getAdvancedGastricCancer() {
-		if (advancedGastricCancer==0) {
-			return null;
-		}
 		return advancedGastricCancer;
 	}
 	public void setAdvancedGastricCancer(Integer advancedGastricCancer) {
diff --git a/download/src/main/java/com/sict/excel/myExcel.java b/download/src/main/java/com/sict/excel/myExcel.java
index a102697..a1aeb10 100644
--- a/download/src/main/java/com/sict/excel/myExcel.java
+++ b/download/src/main/java/com/sict/excel/myExcel.java
@@ -59,16 +59,16 @@ public class myExcel {
 		HSSFSheet sheet9 = screeningRankShchyyExcel.getSheet9(workbook);
 		workbook.setSheetName(8, "社区筛查排名-血检人数");
 		//体检筛查排名-血检人数
-		ScreeningRankGecaExcel screeningRankGecaExcel = new ScreeningRankGecaExcel();
-		HSSFWorkbook getsheet10 = screeningRankGecaExcel.getsheet10(workbook);
-		workbook.setSheetName(9, "体检筛查排名-血检人数");
-		//门诊筛查排名-血检人数
 		ScreeningRankQgExcel screeningRankQgExcel = new ScreeningRankQgExcel();
 		HSSFSheet sheet11 = screeningRankQgExcel.getSheet11(workbook);
+		workbook.setSheetName(9, "体检筛查排名-血检人数");
+		//门诊筛查排名-血检人数
+		ScreeningRankGecaExcel screeningRankGecaExcel = new ScreeningRankGecaExcel();
+		HSSFWorkbook getsheet10 = screeningRankGecaExcel.getsheet10(workbook);
 		workbook.setSheetName(10, "门诊筛查排名-血检人数");
 		
-	//	FileOutputStream outputStream = new FileOutputStream("E:/2019/excel/GICC+map+data.xls");
-		FileOutputStream outputStream = new FileOutputStream("/home/gcsvr/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/AnalysisGraphicExcel.java b/download/src/main/java/com/sict/excel/test/AnalysisGraphicExcel.java
index a0f034f..c70d4ac 100644
--- a/download/src/main/java/com/sict/excel/test/AnalysisGraphicExcel.java
+++ b/download/src/main/java/com/sict/excel/test/AnalysisGraphicExcel.java
@@ -6,8 +6,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import com.sict.excel.bo.AnalysisGraphicBO;
 import com.sict.excel.dto.AnalysisGraphicDTO;
@@ -25,38 +30,91 @@ public class AnalysisGraphicExcel {
 		
 			DownloadMapper mapper = sqlSession.getMapper(DownloadMapper.class);
 			
-			ExportExcelUtil<AnalysisGraphicBO> util = new ExportExcelUtil<AnalysisGraphicBO>();
 			
 			String[] columnNames = {"收集项","数值","备注"};
 			
-			AnalysisGraphicDTO graphicDTO = mapper.getAnalysisGraphicDTOs();
 			
 			List<AnalysisGraphicBO> list = new ArrayList<AnalysisGraphicBO>();
 			
 			AnalysisGraphicBO analysisGraphicBO = new AnalysisGraphicBO();
 			analysisGraphicBO.setItem("申请胃癌筛查的医院总数");
-			analysisGraphicBO.setNumber(graphicDTO.getApplyGastricCancerScreeningHosp());
 			list.add(analysisGraphicBO);
 			
 			AnalysisGraphicBO analysisGraphicBO2 = new AnalysisGraphicBO();
 			analysisGraphicBO2.setItem("通过申请医院数 ");
-			analysisGraphicBO2.setNumber(graphicDTO.getPassApplyHosp());
 			list.add(analysisGraphicBO2);
 			
 			AnalysisGraphicBO analysisGraphicBO3 = new AnalysisGraphicBO();
 			analysisGraphicBO3.setItem("平台账号申请医院数");
-			analysisGraphicBO3.setNumber(graphicDTO.getPlatAccountApplyHosp());
 			list.add(analysisGraphicBO3);
 			
 			AnalysisGraphicBO analysisGraphicBO4 = new AnalysisGraphicBO();
 			analysisGraphicBO4.setItem("账号已开通的医院数");
-			analysisGraphicBO4.setNumber(graphicDTO.getOpenAccountHosp());
 			list.add(analysisGraphicBO4);
 			
+		
+			HSSFSheet sheet = workbook.createSheet("运营分析-图例数据");
+			sheet.setDefaultColumnWidth(20);
+			HSSFCellStyle style = workbook.createCellStyle();
+			// 设置这些样式
+			style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+			// 背景色 蓝色
+			style.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
+			style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
+			style.setFillBackgroundColor(IndexedColors.PALE_BLUE.getIndex());
+			// 设置边框
+			style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style.setBorderTop(HSSFCellStyle.BORDER_THIN);
+			// 生成一个字体
+			HSSFFont font = workbook.createFont();
+			font.setFontHeightInPoints((short) 12);
+			font.setColor(IndexedColors.AUTOMATIC.getIndex());
+			font.setFontName("宋体");
+			style.setFont(font);// 把字体 应用到当前样式
 			
-		//	String path = "E:/2019/excel/" + "运营分析-图例数据.xls";
+			HSSFCellStyle style2 = workbook.createCellStyle();
+			// 设置这些样式
+			style2.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+			// 背景色黄色
+			style2.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
+			style2.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
+			style2.setFillBackgroundColor(IndexedColors.YELLOW.getIndex());
+			// 设置边框
+			style2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderTop(HSSFCellStyle.BORDER_THIN);
 			
-			HSSFSheet sheet =  util.exportExcel(workbook,"运营分析-图例数据", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFCellStyle style3 = workbook.createCellStyle();
+			// 设置这些样式
+			// 设置边框
+			style3.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderTop(HSSFCellStyle.BORDER_THIN);
+		
+			//HSSFSheet sheet =  util.exportExcel(workbook,"运营分析-图例数据", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFRow row1 = sheet.createRow(0);
+			for (int i = 0; i < columnNames.length; i++) {
+				HSSFCell createCell = row1.createCell(i);
+				createCell.setCellValue(columnNames[i]);
+				createCell.setCellStyle(style);
+			}
+			for (int i = 0; i < list.size(); i++) {
+				HSSFRow createRow = sheet.createRow(i+1);
+				HSSFCell createCell = createRow.createCell(0);
+				createCell.setCellStyle(style3);
+				createCell.setCellValue(list.get(i).getItem());
+				
+				HSSFCell cell = createRow.createCell(1);
+				cell.setCellStyle(style2);
+				
+				HSSFCell cell3 = createRow.createCell(2);
+				cell3.setCellStyle(style3);
+			}
+		//	HSSFSheet sheet =  util.exportExcel(workbook,"运营分析-图例数据", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
 			sqlSession.commit();
 		
 			sqlSession.close();
diff --git a/download/src/main/java/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.java b/download/src/main/java/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.java
index d8bd082..2e639f7 100644
--- a/download/src/main/java/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.java
+++ b/download/src/main/java/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.java
@@ -2,12 +2,18 @@ package com.sict.excel.test;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.ibatis.session.SqlSession;
 import org.apache.poi.hslf.model.Sheet;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import com.sict.excel.dto.EarlyCancerHospitalDTO;
 import com.sict.excel.dto.ScreeningRankProvinceDTO;
@@ -17,24 +23,169 @@ import com.sict.excel.utils.SqlSessionUtil;
 
 public class AnalysisHospitalEarlyCancerExcel {
 
-	public static HSSFSheet  getsheet6(HSSFWorkbook workbook) throws IOException {
+	public static HSSFSheet getsheet6(HSSFWorkbook workbook) throws IOException {
+
+		SqlSession sqlSession = SqlSessionUtil.getSession();
+
+		DownloadMapper mapper = sqlSession.getMapper(DownloadMapper.class);
+
+		// ExportExcelUtil<EarlyCancerHospitalDTO> util = new
+		// ExportExcelUtil<EarlyCancerHospitalDTO>();
+
+		String[] columnNames = { "排名", "医院名称", "省份", "合计", "高级别食管粘膜上皮内瘤变", "早期食管癌", "进展期食管癌", "高级别胃粘膜上皮内瘤病变", "早期胃癌",
+				"进展期胃癌" };
+
+		List<EarlyCancerHospitalDTO> list = mapper.geteaCancerHospitals();
+		HSSFSheet sheet = workbook.createSheet("运营分析-医院早癌 胃癌数");
+		HSSFCellStyle style = workbook.createCellStyle();
+		// 设置这些样式
+		style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+		// 背景色 蓝色
+		style.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
+		style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
+		style.setFillBackgroundColor(IndexedColors.PALE_BLUE.getIndex());
+		// 设置边框
+		style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+		style.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+		style.setBorderRight(HSSFCellStyle.BORDER_THIN);
+		style.setBorderTop(HSSFCellStyle.BORDER_THIN);
+		// 生成一个字体
+		HSSFFont font = workbook.createFont();
+		font.setFontHeightInPoints((short) 11);
+		font.setColor(IndexedColors.AUTOMATIC.getIndex());
+		font.setFontName("宋体");
+		font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);// 粗体显示
+		style.setFont(font);// 把字体 应用到当前样式
+
+		HSSFCellStyle style2 = workbook.createCellStyle();
+		// 设置这些样式
+		style2.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+		// 设置边框
+		style2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+		style2.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+		style2.setBorderRight(HSSFCellStyle.BORDER_THIN);
+		style2.setBorderTop(HSSFCellStyle.BORDER_THIN);
+		// 生成一个字体
+		HSSFFont font2 = workbook.createFont();
+		font2.setFontHeightInPoints((short) 11);
+		font2.setColor(IndexedColors.AUTOMATIC.getIndex());
+		font2.setFontName("宋体");
+		style2.setFont(font2);// 把字体 应用到当前样式
+		HSSFRow row = sheet.createRow(0);
+		for (int i = 0; i < columnNames.length; i++) {
+			HSSFCell cell = row.createCell(i);
+			cell.setCellValue(columnNames[i]);
+			cell.setCellStyle(style);
+		}
+		
+		for (int i = 0; i < list.size(); i++) {
+			HSSFRow row2 = sheet.createRow(i+1);
+			HSSFCell cell = row2.createCell(0);
+			cell.setCellStyle(style2);
+			cell.setCellValue(list.get(i).getId()+"");
+			HSSFCell cell1 = row2.createCell(1);
+			cell1.setCellStyle(style2);
+			cell1.setCellValue(list.get(i).getHospname());
+			HSSFCell cell2 = row2.createCell(2);
+			cell2.setCellStyle(style2);
+			cell2.setCellValue(list.get(i).getProvince());
+			HSSFCell cell3 = row2.createCell(3);
+			cell3.setCellStyle(style2);
+			cell3.setCellValue(list.get(i).getTotal()+"");
+			HSSFCell cell4 = row2.createCell(4);
+			cell4.setCellStyle(style2);
+			cell4.setCellValue(list.get(i).getHighEsophagealNeoplasia()>0?list.get(i).getHighEsophagealNeoplasia()+"":"");
+			HSSFCell cell5 = row2.createCell(5);
+			cell5.setCellStyle(style2);
+			cell5.setCellValue(list.get(i).getEarlyEsophagealCancer()>0?list.get(i).getEarlyEsophagealCancer()+"":"");
+			HSSFCell cell6 = row2.createCell(6);
+			cell6.setCellStyle(style2);
+			cell6.setCellValue(list.get(i).getAdvancedEsophagealCancer()>0?list.get(i).getAdvancedEsophagealCancer()+"":"");
+			HSSFCell cell7 = row2.createCell(7);
+			cell7.setCellStyle(style2);
+			cell7.setCellValue(list.get(i).getHighGastricNeoplasia()>0?list.get(i).getHighGastricNeoplasia()+"":"");
+			HSSFCell cell8 = row2.createCell(8);
+			cell8.setCellStyle(style2);
+			cell8.setCellValue(list.get(i).getEarlyGastricCancer()>0?list.get(i).getEarlyGastricCancer()+"":"");
+			HSSFCell cell9 = row2.createCell(9);
+			cell9.setCellStyle(style2);
+			cell9.setCellValue(list.get(i).getAdvancedGastricCancer()>0?list.get(i).getAdvancedGastricCancer()+"":"");
+		}
+		HSSFRow row2 = sheet.createRow(list.size()+1);
+		int total1=0,total2=0,total3=0,total4=0,total5=0,total6=0,total7=0;
+		for (int i = 0; i < list.size(); i++) {
+			total1 += list.get(i).getTotal();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total2 += list.get(i).getHighEsophagealNeoplasia();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total3 += list.get(i).getEarlyEsophagealCancer();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total4 += list.get(i).getAdvancedEsophagealCancer();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total5 += list.get(i).getHighGastricNeoplasia();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total6 += list.get(i).getEarlyGastricCancer();
+		}
+		for (int i = 0; i < list.size(); i++) {
+			total7 += list.get(i).getAdvancedGastricCancer();
+		}
+		HSSFCell cell1 = row2.createCell(0);
+		cell1.setCellStyle(style2);
+		cell1.setCellValue("合计");
+		
+		HSSFCell cell2 = row2.createCell(1);
+		cell2.setCellStyle(style2);
 		
-SqlSession sqlSession = SqlSessionUtil.getSession();
+		HSSFCell cell3= row2.createCell(2);
+		cell3.setCellStyle(style2);
+		
+		HSSFCell cell4=row2.createCell(3);
+		cell4.setCellValue(total1+"");
+		cell4.setCellStyle(style2);
+		
+		HSSFCell cell5 = row2.createCell(4);
+		cell5.setCellStyle(style2);
+		cell5.setCellValue(total2+"");
+		
+		HSSFCell cell6=row2.createCell(5);
+		cell6.setCellStyle(style2);
+		cell6.setCellValue(total3+"");
+		
+		HSSFCell cell7 = row2.createCell(6);
+		cell7.setCellStyle(style2);
+		cell7.setCellValue(""+total4);
+		
+		HSSFCell cell8 = row2.createCell(7);
+		cell8.setCellStyle(style2);
+		cell8.setCellValue(""+total5);
+		
+		HSSFCell cell9 = row2.createCell(8);
+		cell9.setCellStyle(style2);
+		cell9.setCellValue(total6+"");
+		
+		HSSFCell cell10 =row2.createCell(9);
+		cell10.setCellStyle(style2);
+		cell10.setCellValue(""+total7);
+
 		
-			DownloadMapper mapper = sqlSession.getMapper(DownloadMapper.class);
-			
-			ExportExcelUtil<EarlyCancerHospitalDTO> util = new ExportExcelUtil<EarlyCancerHospitalDTO>();
-			
-			String[] columnNames = {"排名","医院名称","省份","合计","高级别食管粘膜上皮内瘤变","早期食管癌","进展期食管癌","高级别胃粘膜上皮内瘤病变","早期胃癌","进展期胃癌"};
-			
-			List<EarlyCancerHospitalDTO> list = mapper.geteaCancerHospitals();
-			
-		//	String path = "E:/2019/excel/" + "运营分析-医院早癌 胃癌数.xls";
-			HSSFSheet sheet = util.exportExcel(workbook,"运营分析-医院早癌 胃癌数", columnNames, list,  ExportExcelUtil.EXCEl_FILE_2007);
-			sqlSession.commit();
-	
-			sqlSession.close();
+		sheet.setColumnWidth(0, 10*256);
+		sheet.setColumnWidth(1, 30*256);
+		sheet.setColumnWidth(2, 10*256);
+		sheet.setColumnWidth(3, 10*256);
+		sheet.setColumnWidth(4, 30*256);
+		sheet.setColumnWidth(5, 10*256);
+		sheet.setColumnWidth(6, 10*256);
+		sheet.setColumnWidth(7, 30*256);
+		sheet.setColumnWidth(8, 10*256);
+		sheet.setColumnWidth(9, 10*256);
 		
+		sqlSession.commit();
+		sqlSession.close();
 
 		return sheet;
 	}
diff --git a/download/src/main/java/com/sict/excel/test/AnalysisProvinceExcel.java b/download/src/main/java/com/sict/excel/test/AnalysisProvinceExcel.java
index 727f74a..05b3e0e 100644
--- a/download/src/main/java/com/sict/excel/test/AnalysisProvinceExcel.java
+++ b/download/src/main/java/com/sict/excel/test/AnalysisProvinceExcel.java
@@ -5,8 +5,13 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import com.sict.excel.dto.AnalysisProvinceDTO;
 import com.sict.excel.mapper.DownloadMapper;
@@ -21,14 +26,71 @@ public class AnalysisProvinceExcel {
 		
 			DownloadMapper mapper = sqlSession.getMapper(DownloadMapper.class);
 			
-			ExportExcelUtil<AnalysisProvinceDTO> util = new ExportExcelUtil<AnalysisProvinceDTO>();
+			HSSFSheet sheet = workbook.createSheet("运营分析-省份数据");
+			sheet.setDefaultColumnWidth(15);
+			HSSFCellStyle style = workbook.createCellStyle();
+			// 设置这些样式
+			style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+			// 背景色
+			style.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex());
+			style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
+			style.setFillBackgroundColor(IndexedColors.PALE_BLUE.getIndex());
+			// 设置边框
+			style.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style.setBorderTop(HSSFCellStyle.BORDER_THIN);
+			// 生成一个字体
+			HSSFFont font = workbook.createFont();
+			font.setFontHeightInPoints((short) 12);
+			font.setColor(IndexedColors.AUTOMATIC.getIndex());
+			font.setFontName("宋体");
+			style.setFont(font);// 把字体 应用到当前样式
 			
-			String[] columnNames = {"省份","申请医院总数 ","开通账号医院总数","申请账号中的医院总数","通过申请医院数","平台账号申请医院数","筛查人数","早癌数"};
+			HSSFCellStyle style2 = workbook.createCellStyle();
+			// 设置这些样式
+			style2.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 垂直居中
+			// 背景色
+			style2.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
+			style2.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
+			style2.setFillBackgroundColor(IndexedColors.YELLOW.getIndex());
+			// 设置边框
+			style2.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style2.setBorderTop(HSSFCellStyle.BORDER_THIN);
 			
+			HSSFCellStyle style3 = workbook.createCellStyle();
+			// 设置这些样式
+			// 设置边框
+			style3.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderRight(HSSFCellStyle.BORDER_THIN);
+			style3.setBorderTop(HSSFCellStyle.BORDER_THIN);
+			HSSFRow row1 = sheet.createRow(0);
+			String[] columnNames = {"省份","申请医院总数 ","开通账号医院总数","申请账号中的医院总数","通过申请医院数","平台账号申请医院数","筛查人数","早癌数"};
+			for (int i = 0; i < columnNames.length; i++) {
+				HSSFCell createCell = row1.createCell(i);
+				createCell.setCellValue(columnNames[i]);
+				createCell.setCellStyle(style);
+			}
 			List<AnalysisProvinceDTO> list = mapper.getAnalysisProvinceDTOs();
+			AnalysisProvinceDTO l1 = new AnalysisProvinceDTO();
+			l1.setProvince("合计");
+			list.add(l1);
+			for (int i = 0; i < list.size(); i++) {
+				HSSFRow createRow = sheet.createRow(i+1);
+				HSSFCell createCell = createRow.createCell(0);
+				createCell.setCellValue(list.get(i).getProvince());
+				createCell.setCellStyle(style3);
+				HSSFCell cell = createRow.createCell(1);
+				cell.setCellStyle(style2);
+				for (int j = 2; j < columnNames.length; j++) {
+					HSSFCell cell2 = createRow.createCell(j);
+					cell2.setCellStyle(style3);
+				}
+			}
 			
-			//String path = "E:/2019/excel/" + "运营分析-省份数据.xls";
-			HSSFSheet sheet = util.exportExcel(workbook,"运营分析-省份数据", columnNames, list,  ExportExcelUtil.EXCEl_FILE_2007);
 			sqlSession.commit();
 		
 			sqlSession.close();
diff --git a/download/src/main/java/com/sict/excel/test/ProvinceEarlyCancerRankExcel.java b/download/src/main/java/com/sict/excel/test/ProvinceEarlyCancerRankExcel.java
index 4900632..34afb27 100644
--- a/download/src/main/java/com/sict/excel/test/ProvinceEarlyCancerRankExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ProvinceEarlyCancerRankExcel.java
@@ -4,8 +4,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tools.ant.types.selectors.modifiedselector.EqualComparator;
 
 import com.sict.excel.dto.EarlyCancerRankDTO;
 import com.sict.excel.mapper.DownloadMapper;
@@ -21,8 +23,17 @@ public class ProvinceEarlyCancerRankExcel {
 			ExportExcelUtil<EarlyCancerRankDTO> util = new ExportExcelUtil<EarlyCancerRankDTO>();
 			String[] columnNames = {"省份","早癌数"};
 			List<EarlyCancerRankDTO> list = mapper.getEarlyCancerRankDTOs();
-			//String path = "E:/2019/excel/" + "省份早癌排名.xls";
+			int total = 0;
+			for (int i = 0; i < list.size(); i++) {
+				total+=list.get(i).getECamount();
+			}
+			EarlyCancerRankDTO earlyCancerRankDTO = new EarlyCancerRankDTO();
+			earlyCancerRankDTO.setProvince("合计");
+			earlyCancerRankDTO.setECamount(total);
+			list.add(earlyCancerRankDTO);
 			HSSFSheet sheet = util.exportExcel(workbook,"省份早癌排名", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
+			
+			
 			sqlSession.commit();
 	
 			sqlSession.close();
diff --git a/download/src/main/java/com/sict/excel/test/ScreeningRankGecaExcel.java b/download/src/main/java/com/sict/excel/test/ScreeningRankGecaExcel.java
index 9d5e4da..30d1b73 100644
--- a/download/src/main/java/com/sict/excel/test/ScreeningRankGecaExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ScreeningRankGecaExcel.java
@@ -4,6 +4,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
@@ -22,8 +24,17 @@ public class ScreeningRankGecaExcel {
 			ExportExcelUtil<ScreeningRankDTO> util = new ExportExcelUtil<ScreeningRankDTO>();
 			String[] columnNames = {"排名","医联体名称","血检人数"};
 			List<ScreeningRankDTO> list = mapper.getScreeningRankDTOs();
-			String path = "E:/2019/excel/" + "体检筛查排名-血检人数.xls";
-			HSSFSheet sheet = util.exportExcel(workbook,"体检筛查排名-血检人数", columnNames, list,  ExportExcelUtil.EXCEl_FILE_2007);
+			int total =0;
+			for (int i = 0; i < list.size(); i++) {
+				total+=list.get(i).getActualserum();
+			}
+			HSSFSheet sheet = util.exportExcel(workbook,"门诊筛查排名-血检人数", columnNames, list,  ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFRow row = sheet.createRow(list.size()+1);
+			HSSFCell cell = row.createCell(0);
+			cell.setCellValue("合计");
+			HSSFCell cell2 = row.createCell(2);
+			cell2.setCellValue(""+total);
+			
 			sqlSession.commit();
 		
 			sqlSession.close();
diff --git a/download/src/main/java/com/sict/excel/test/ScreeningRankProvinceExcel.java b/download/src/main/java/com/sict/excel/test/ScreeningRankProvinceExcel.java
index 72a3049..e2638e6 100644
--- a/download/src/main/java/com/sict/excel/test/ScreeningRankProvinceExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ScreeningRankProvinceExcel.java
@@ -5,6 +5,8 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
@@ -26,9 +28,17 @@ public class ScreeningRankProvinceExcel {
 			String[] columnNames = {"排名","医院名称","省份","血检人数"};
 			
 			List<ScreeningRankProvinceDTO> list = mapper.getScreeningRankProvinceDTOs();
-			
+			int total =0;
+			for (int i = 0; i < list.size(); i++) {
+				total+=list.get(i).getActualserum();
+			}
 			//String path = "E:/2019/excel/" + "筛查排名-按血检人数排名.xls";
 			HSSFSheet sheet = util.exportExcel(workbook, "筛查排名-按血检人数排名", columnNames,  list, ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFRow row = sheet.createRow(list.size()+1);
+			HSSFCell cell = row.createCell(0);
+			cell.setCellValue("合计");
+			HSSFCell cell2 = row.createCell(3);
+			cell2.setCellValue(""+total);
 			sqlSession.commit();
 		
 			sqlSession.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 44337a5..18a90c8 100644
--- a/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ScreeningRankQgExcel.java
@@ -4,6 +4,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
@@ -22,8 +24,16 @@ public class ScreeningRankQgExcel {
 			ExportExcelUtil<ScreeningRankDTO> util = new ExportExcelUtil<ScreeningRankDTO>();
 			String[] columnNames = {"排名","医联体名称","血检人数"};
 			List<ScreeningRankDTO> list = mapper.getScreeningRankDTOs();
-			//String path = "E:/2019/excel/" + "门诊筛查排名-血检人数.xls";
-			HSSFSheet sheet = util.exportExcel(workbook,"门诊筛查排名-血检人", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
+			int total =0;
+			for (int i = 0; i < list.size(); i++) {
+				total+=list.get(i).getActualserum();
+			}
+			HSSFSheet sheet = util.exportExcel(workbook,"体检筛查排名-血检人数", columnNames, list, ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFRow row = sheet.createRow(list.size()+1);
+			HSSFCell cell = row.createCell(0);
+			cell.setCellValue("合计");
+			HSSFCell cell2 = row.createCell(2);
+			cell2.setCellValue(""+total);
 			sqlSession.commit();
 		
 			sqlSession.close();
diff --git a/download/src/main/java/com/sict/excel/test/ScreeningRankShchyyExcel.java b/download/src/main/java/com/sict/excel/test/ScreeningRankShchyyExcel.java
index 4ce2669..a9744e7 100644
--- a/download/src/main/java/com/sict/excel/test/ScreeningRankShchyyExcel.java
+++ b/download/src/main/java/com/sict/excel/test/ScreeningRankShchyyExcel.java
@@ -4,6 +4,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
 import org.apache.ibatis.session.SqlSession;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
@@ -22,8 +24,16 @@ public class ScreeningRankShchyyExcel {
 			ExportExcelUtil<ScreeningRankDTO> util = new ExportExcelUtil<ScreeningRankDTO>();
 			String[] columnNames = {"排名","医联体名称","血检人数"};
 			List<ScreeningRankDTO> list = mapper.getScreeningRankDTOs();
-			String path = "E:/2019/excel/" + "社区筛查排名-血检人数.xls";
+			int total =0;
+			for (int i = 0; i < list.size(); i++) {
+				total+=list.get(i).getActualserum();
+			}
 			HSSFSheet sheet = util.exportExcel(workbook,"社区筛查排名-血检人数", columnNames, list,  ExportExcelUtil.EXCEl_FILE_2007);
+			HSSFRow row = sheet.createRow(list.size()+1);
+			HSSFCell cell = row.createCell(0);
+			cell.setCellValue("合计");
+			HSSFCell cell2 = row.createCell(2);
+			cell2.setCellValue(""+total);
 			sqlSession.commit();
 			sqlSession.close();
 			return sheet;
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 467e88a..cbccf30 100644
--- a/download/src/main/java/com/sict/excel/test/SerumTest.java
+++ b/download/src/main/java/com/sict/excel/test/SerumTest.java
@@ -135,7 +135,7 @@ public class SerumTest {
 		cell91.setCellStyle(style3);
 		HSSFCell cell92 = row9.createCell(1);
 		cell92.setCellStyle(style3);
-		cell92.setCellValue(qgInteger+"");
+		cell92.setCellValue(gecaintInteger+"");
 		
 		HSSFRow row10 = sheet.createRow(9);//9行
 		HSSFCell cell101 = row10.createCell(0);
@@ -144,7 +144,7 @@ public class SerumTest {
 		cell101.setCellStyle(style3);
 		HSSFCell cell102 = row10.createCell(1);
 		cell102.setCellStyle(style3);
-		cell102.setCellValue(gecaintInteger+"");
+		cell102.setCellValue(qgInteger+"");
 		
 		HSSFRow row11= sheet.createRow(10);//10行
 		HSSFCell cell111 = row11.createCell(0);
diff --git a/download/src/main/resources/mapper/DownloadMapper.xml b/download/src/main/resources/mapper/DownloadMapper.xml
index 7dd71f6..89432ab 100644
--- a/download/src/main/resources/mapper/DownloadMapper.xml
+++ b/download/src/main/resources/mapper/DownloadMapper.xml
@@ -163,68 +163,73 @@
 
 	<select id="geteaCancerHospitals"
 		resultType="com.sict.excel.dto.EarlyCancerHospitalDTO">
-		SELECT (@rowNO := @rowNo+1) AS id,a.*
-		FROM(
 		SELECT
-		hospName as
-		hospname,
+		(@rowNO := @rowNo + 1) AS id,
+		a.*
+		FROM
+		(
+		SELECT
+		hospName AS hospname,
 		area province,
 		(
-		count( gastroDetailInfo LIKE '%"a":1%' OR NULL
+		count(
+		gastroDetailInfo LIKE '%"a":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"b":1%'
+		OR NULL
 		) + count(
-		gastroDetailInfo LIKE '%"b":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"c":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"d":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"e":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"f":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"g":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"h":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"i":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"j":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"k":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"l":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"m":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"n":%' OR NULL )
+		gastroDetailInfo LIKE '%"c":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"f":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"h":1%'
+		OR NULL
+		)
 		) total,
 		count(
-		gastroDetailInfo LIKE '%"a":1%' OR NULL ) AS highEsophagealNeoplasia,
-		count( gastroDetailInfo LIKE '%"b":1%' OR NULL ) AS
-		earlyEsophagealCancer,
-		count( gastroDetailInfo LIKE '%"c":1%' OR NULL )
-		AS
-		advancedEsophagealCancer,
-		count( gastroDetailInfo LIKE '%"f":1%' OR
-		NULL ) AS highGastricNeoplasia,
-		count( gastroDetailInfo LIKE '%"g":1%'
-		OR NULL ) AS
-		earlyGastricCancer,
-		count( gastroDetailInfo LIKE '%"h":1%'
-		OR NULL ) AS advancedGastricCancer
+		gastroDetailInfo LIKE '%"a":1%'
+		OR NULL
+		) AS highEsophagealNeoplasia,
+		count(
+		gastroDetailInfo LIKE '%"b":1%'
+		OR NULL
+		) AS earlyEsophagealCancer,
+		count(
+		gastroDetailInfo LIKE '%"c":1%'
+		OR NULL
+		) AS advancedEsophagealCancer,
+		count(
+		gastroDetailInfo LIKE '%"f":1%'
+		OR NULL
+		) AS highGastricNeoplasia,
+		count(
+		gastroDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) AS earlyGastricCancer,
+		count(
+		gastroDetailInfo LIKE '%"h":1%'
+		OR NULL
+		) AS advancedGastricCancer
 		FROM
 		(
 		SELECT
 		p.id patientId,
 		rel2.number hospNumber,
 		rel2.`name` hospName,
-		rel1.step
-		gastroStep,
+		rel1.step gastroStep,
 		rel1.is_inspect isGastro,
 		rel1.inspect_way gastroWay,
-		rel1.capsule
-		gastroResult,
+		rel1.capsule gastroResult,
 		rel1.precise_way gastroDetailWay,
-		rel1.diagnose_result
-		gastroDetailResult,
-		rel1.diagnose_info
-		gastroDetailInfo,
-		rel1.`status`
-		auditStatus,
+		rel1.diagnose_result gastroDetailResult,
+		rel1.diagnose_info gastroDetailInfo,
+		rel1.`status` auditStatus,
 		rel3.area
 		FROM
 		tb_patient p
@@ -243,23 +248,25 @@
 		tb_gastro_inspect
 		WHERE
 		is_inspect = 1
-		AND
-		`status` NOT IN ( 0, 5 )
+		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
-		INNER JOIN tmp_tb_hosp_area rel3 ON
-		rel2.`name` = rel3.`name`
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number = p.hosp_number
+		INNER JOIN tmp_tb_hosp_area rel3 ON rel2.`name` = rel3.`name`
 		) rel
 		GROUP BY
 		hospName
-		ORDER BY
-		earlyGastricCancer DESC
 		) a,
-		(select @rowNO :=0) b
+		(SELECT @rowNO := 0) b
+WHERE total >0
+		ORDER BY
+		total DESC
 	</select>
 
 	<!-- 运营分析-省份数据 -->
@@ -594,7 +601,8 @@
 		COUNT(NULL) actual
 		FROM
 		tb_patient p1 INNER JOIN tb_risk_assess p2
-		ON p1.id = p2.patient_id RIGHT JOIN (SELECT `name`,number FROM tb_hosp
+		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
@@ -687,7 +695,8 @@
 		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
 		) rel
 
@@ -718,7 +727,9 @@
 		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
+		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 fca7f79..ccec34b 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 29 10:09:37 CST 2019
+#Fri Nov 29 11:00:23 CST 2019
 version=1.0-SNAPSHOT
 groupId=download
 m2e.projectName=download
diff --git a/download/target/classes/com/sict/excel/dto/EarlyCancerHospitalDTO.class b/download/target/classes/com/sict/excel/dto/EarlyCancerHospitalDTO.class
index 5b6c502638b28f7a036fc534d2bdaf5c085ade06..7d50c857c8dc8541fb7f96c376d8687b0301c338 100644
GIT binary patch
delta 870
zcmZ9K&2JJx7{=dWSy*6+vT0dBNzkO)*wv;`MN27d`KljaYyD`et**GjDzXHKi6`U1
zKY+~L*t0RQ(O}}i>eYi@O+5AF-HSaL-<c(v>}B@%?mN%(KAD;Q*w?84%byP)0bmN6
zJO0-$FM(Ls=q>fPBUBRNWSSlm7Rgy^3JYYGz7jHIp8gbOg9RB5f`>o^H!sjVaU?`Q
z>RGG3j@hbvVTpiBcipNW!3Ao$<4PGW$q<4uKa`;=!(~{eFWi~v6#@Y*(XhJhmj1}d
zvhG#Zy+(hzlVdk{x81QGo2{CWm0%r*Xo;TH)0<e`#H?DP|56>tViU7y2}AERpA@@R
zyP?+&y_wfh*TL>>0*ADOPAh_X1WO&`;aIcYDC=E}T&o&ZyQz0g9h)`!NsJML{t)BA
zIsvlDQkgQ8-in^zF8bXgE0b^V#9R=@)dK|AaoU$g$rRo5h3SSbBu;<`8vX25eF46M
zK$3p*j4COo@DvxGX2Ni4=bx(|-PxUpsADej(B%wwNjqJpxyw1`Leg~Kr}=_I!3-B<
zoPrrH$nvon=h!TconvF^RzM<i+#%<5nCA|7^%y+objYJafd@Y@%(2K_@=li$cPaAV
zd72DpK73Vpq6A8GTON5@URTb)hl?lP!QlZ^l$8OjA|J(%a^2?RjMr?QV0$)fo@9K>
z<`m;Co70T%*qmW}*XA7Kdp748-$yPCpz%L)45I;5;3QO`h>vs)mZ1$R@C^T{*pc~D
Qcn%SWVnyHqt}b}^7v}S^lmGw#

delta 1157
zcmZvb%}*0S7{;IJcC~Jc+LaWjkW>=_NU>=}v6NK`6sfj?tRUq>Sa9XT(iW&Bo{R^s
zCO9`wa`a#VQEQ@!F?#dh#l(|;g9l@xC*!-jM4HWBcAj@;c7OA{`^=YyKSAm9-?#4p
zM6tdny>P`P#L#&d=NSAe+NKuCYlX!~x=_{^^>rW4;{t<cxlkV0^7nNHp|vf|5Zutq
zL)$y`{F|$Zb@N}YK6Z(B2}#z+9|#FH$X^RR>?;2$bg=6@<ZfgmTyZzaS&aJNN3(=1
zZu&5Wah`W48YURL;m}fXqg2pVb;VenG*+kh2Y0M_##}9}7dMv+3%cULEFCBuDi_OI
zo+^z_6Ao=ZtCOf$V5kp=^d~~Cn<|};h#|Jf*ThD)%pZ$Ec8@<7n`%}W*o;9b`jC0~
zRs8K5>IcnHQ~YOMAyPr~DMYqw=v|t0AwbWg5a`(o32pG99d%Ustd~%a2C5jk_;D$~
zYmfNFvk(#CJD$2pFAkX>zlf7Go}hizuy_?LZiht)79&WfBP?OSSe&;=VQQBJ>2ZW8
zRS?Av=_W{mAc`a8vH=Mwdvt884HAt&FWF0)_G<RYy^iE$6**}q_Y--5$b*jLe$!r(
zfAog=cgZt4;0Q=n0aA8Ah5%Ut3_Aj@nATEuYolaMHLV@nw>IQRPFIoBcJdgJ$B8`Q
zNWNy0({}O{k*5tZ|KasK%;401UOrLsjBswfLpCQ5zrhVkW@81ae5-;S>C-gG)0S>A
z^leMG8++y~O{rGpc}r91RQZmjDI2PM*V6R2RC&qLIqIw`uUG|nRpmVC3JM2SgVY~j
d79E&F3L2T6M+pmfL~{qXW9$FzD48Kz`v;(AyTt$i

diff --git a/download/target/classes/com/sict/excel/myExcel.class b/download/target/classes/com/sict/excel/myExcel.class
index aec3759c825a137422e2dd1257273a6fb6ee3d5d..165d7f56f3808ffdc9dbd8d2fd0540937d397513 100644
GIT binary patch
delta 187
zcmbOyJ4<#$5$oiOOrn$LvGA$|rn^=or{-`mBr|Y=h;$x?3<eoS2CnqflHiQg)DlBO
z4u-7Bl58rBIg<-m^?9>F>arQ~c^C>93Ma2&&6(WJ=EfoKYNc;vU}(AdCfgq7$#=Q@
zCQs$^*sRSxkx?*n8-x6AhV01g47pZf+B+EXCZFZm!RR)*jrX<g5{6C&QHJ*nstijR
lmNAGid}WXa8r#Ys&d9;Q!?2uT1%m_wBg0At1_maERRG1wF^&KL

delta 177
zcmV;i08am!9iAPqas`v&1uYF@00{~JV*qCi0B8VdlN$zX0c(@G1tbA&lW+ws8f*Xw
z3IJ>Xa0~!(02~1T3TI_>Q)p#nbTKiLg$76rBQI!gZDlWKV{>+Lv(*N?1C!qhNRyEY
zPO~QqkpU5Ewg4Zy0Bl*e0B$-KE4Tn}lgSLY0Y{U94eKpv0EGY*0Pg@L0Hgq=02ToC
f03QIR0Eqw>0SEvL0H*+`02lxP0I2`~00IE2Pa`m5

diff --git a/download/target/classes/com/sict/excel/test/AnalysisGraphicExcel.class b/download/target/classes/com/sict/excel/test/AnalysisGraphicExcel.class
index 50fcb9e54f0bf24825da65541616016709d69b19..12c18752553020706add1d7ec88fa6c848e78fa1 100644
GIT binary patch
literal 4426
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
KKBT)m{O$jmd=bY0

delta 1365
zcmai!+jA3T7{;G3*(ST29qDYLu)=goXmjYn6jDHvij-0dnx<$tMMc>zYY3)E+}%R!
zDIg<`S6+M`F1*nhoN>5d>M#=w^>o1%I$n9H&NvPoJLBIVzF!xqC^Ot_zU=<?eV+II
zo^NkP-(IiY{OkHR0Jh@77wTky_3#sHU1NN%UUR(hIm@mb_R19%o1ui!%g}z>JY%LR
zX0?<mcuu)mk`ZT6mfmkJe|&NI)0T`RLul!Pg<I#olF?7=TbJHhy83wp1_m`ef)qn%
z$@WI8W@X+jyAzICKUKE&9h!0(l8I!_s?DU_y=BWw*+M;a(yOKZ4`;*J%FwZ5W|j=5
zMjgkT&y`(I#gMQ%%ohTQP#TJio&488Oip8$h77V?3q~6%9>e2d>}Kd)(R+}bhCLW%
zhzjHNdS!mXbg6l3%&c0rQ?MM{uF@#>*W5b8I%;BdNC&E(U9z35iZsSF?87)sYmaMt
z`PrFi+o543?n5V!L@<E^VeDskXthbvpN1##6wd{_*(9F{8r`CmDGdjOzjpF>&~)7u
zkHU?NXZX9puDE~>X*evP^#ZDx-l%2OW~+WbK6{j34t7NaTh#EZV0B`r>UQ-G>toOJ
z?}M9SGG1ViwhayK6yZ3b!NfE}#9j>!!=(iOEwqK-RuuhTP5QaX^7Cp(r+<582ghoa
zifwu2S~bhl(#XaLHsPcO8zBl2?b1xy6SqnlPVpPc6-5$nF~o8ruxtJkSYA`(!)obn
zxESJovL3Y4oU1?Zyk-O@?_c+<*2hcQM{F&>ttA=(2_a~7dj9+p9l3tpXklXj-@%w%
z#OC5PY{`edMo%%Q#|lMBPZWx6dS4+U4YV-8kZD`Q5JB5Ap+%%=u{{$u!upOT9yP*7
zTN5Kq>@`A0xP>PIIQkDG8?v4gjBGRr%KMOfFQgcX{<MG;QK;ZE%Ds$gsQMAXsDe4>
zGpf%F_UX?Vk`dC6H}PU7(%*u`K-ZTTjK~5t9E1uqa2gNOpAC@cx1Dxp1G+GXZfr*s
zyU{}-?nNFk977z_NaAJm!9hP>#{e$U*Wf**@FAVpPw4w|nU2U+4C6YzeFHo2BeM7f
zBlw*vEz<#vkkYIEv{5Ey(wFcDm8^iGkDoDvDgtETC)7|UhlBVQuaKNX1+T${hc+s8
z1+zFq+ctsEa29h2Q-$-Gr<F{0j+4Y36f&|4uhB{+3v0;k8zlcGNp{{<Xdt-uPPubb
Lj!_ZN!?*qh8PHht

diff --git a/download/target/classes/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.class b/download/target/classes/com/sict/excel/test/AnalysisHospitalEarlyCancerExcel.class
index 646d533e20cf095971b5b77680993b82f991d3b9..5ad24e7ade222604696df28f17b90e4625f589ea 100644
GIT binary patch
literal 6862
zcmbVQ4SZD9mH*%OHIvLsGMQvT9z<=ykAx4$&#5NrmLNzp1aLwyYB7_^BN>>?i!(1E
z*t)tPB5E47R8UYsg;JFQ)d57%w!8hXw$;{tY+1XuB_y=luG?Dsq18S2zM09)G(dLq
z`{lj!?)~5YIrp4%&pU5k`{<=304`*cT#y(piCDdXWHe$2%-bSnEMS{SJ1{dIj;%^Y
zlXI<PU(^oAW``58RkOnJh?$tpQ7$M9-eutx;Xo`L?+(oGTxLdW2JMPyJZfLXAlKHl
zF(|XFF0&Xiigc*Z7|NQXakHhrx6@3thC5>>gRj|&gkx>tM3g_L2Nk;~nq&wz|9@<2
zU?}P~?PQN>+ChfJwar$dI}q**M|#XapA`-CB$G=6{Yf*?OV-5#b3>syi><`+PRm-}
zP&W>6h%=LxV(yAQJ8H#~F8CNKgg>HIplN<~rWlo|a>36qrC=}pb~Kg@gl>(6%w&={
z7SXeg38*GwGCw`aP+Oa4Q?xT|N0Wi1vnXeMg9{TG&Mwf>8}92f6M?I(mGPJr?wTha
zJ*dH%E}TK|9M_zbS;txUgyU3aJ;OP*&7;Ae6$>Ym<hjuiCmqP5$$424vJ=sGw;N|u
zq8uN1XlU>OH_m0yhweXgV)J%-9NxLdjar%=-g4KmLx<g%O7hU)`jOq++?Y=0o_KcC
z@Jl;~)<1jVsV9baZyVmXX=L4&V+S@2Ke~Hp-QB~Ro*w%ACO6KfL_7Y-uH##tNW(VY
z@5Tj`Ya_2bHnewR{`f_?v?FWQ{3GY^BX<khOUP7*mcuwFrB_*&(;4)@z-2lvM?FI&
z#nB8q$0l=<D6M@IQQ<3|0)gge(r$3$3d)d?R|ZE0pBY-e?)c+_GaRRoKGO6Fhx_=(
zJ;k^RpLXG&7^dcg?lf7gV<s9IJduPMwoQ?~3|Hoc(230dA^W)<SL>LKIphL|ca|B8
zh3r-QPzUmJ_9W(I7c>-OF0OT<iDBC5ca>eH<2p2xmy@R5W+v<?)sdO8Xm`BVj8iF6
zYD0BxMQFhS7v?k66%Z$rIVGSe-eulqcFnS4RwAimA+D!%Uof+I_AQOgi)NEmg;n9?
zt7$JSXw|U@RR7$R0D@Z-#1P-+4LaJn)m3EmoM<dI$4Z#p39CQuXy=fdbll7#rD@25
zux*=(IG<Xg<Cfgjjp4}hg4JOiog7j|s~fFEmzij^Y}@MP%e!=#e6A!r*K97e`AoNt
zo{Uas)%DTt9x=5{$8tWUXBV|veLViXI^wXXTsiTdV{x}n9arc%mOOPUsB$J4&MgSe
z7!{hY&|z~!{M;|}IM?JRHpLfM(YT%Dp<bb5rHI|kMXmGa&1`L&#dWOGv6`=Q(>f7i
zH$Kbj%I^D)9e$Vt?$GhixRVY@nz$w0OG)e>>wvUz{J-c}!wDTX#=2GtL%197*0B!v
zFu2l8lse;i{Rnr|5%;~g&xH*P=bhdm;u!0=9}iHjIuW?uTFC>@l=s3o$>Ad`1>o~|
z(1k&&=cm_43v@h$hqLkK=aBDjT<SQO^lii=E_`uZ0p}}pY~pd@na3a7!m)m8CpO|y
z9gktl=tR2gTreJAb0UFnsB3fKafS(_?=7bcHugtjbZm;T6-6Fw!&5G7r_-2UvUNO-
zXXsed3FoOoP8g-hzW#Pn-6?n>ciC1Tr<=;W7OrlcUyL2trQ^$ZmO<r(ql**g@;1e7
zv)fFNAGhLp9lP-rN@M;;j}vr8Zn~x|$X%SbH$kyi$3A?O&V_9`lT=Id^rhbl+^`pQ
zq&U_?hH;zYbVT_00UZZ3;|mhjiYT>+eEg7(m-$9`1#GpbgXDupbiBd`Cvp-xyR(y4
zUr)H(498kbtB<;fXt)?(!#7;`Iz#!WKhyix@vrzdqNLL<GC>s8CO5vt08alM9j|fv
zYN8h|9_4r5!5s9uj_+~MBm&LsTESb|uCZ`G(D4SxO-S2%O*l#2OC-n89r&S+A90L7
zqc9B`)%If@KgpPs(Uu3|`Smj$|IRn2B%`azd7s2l9shy1sfw)N2|s`7KO|T-FkA7T
zytBTOXT&dgM*NDQCO;V+Y&xeY?)T!Djv*X(-Y--S`+MVyqg{3nWnFDkQ(YVH4o7sH
z;QhKr+1nen`Ot55{1+cmBQYy!QW#dIduE2|g|Ejk>UXxoruvc0Hoa5{a@U@;1*L9V
zb6Q!xqTon569qjkt?)#|=6E%yuB+mvoD-UMAo)B-?H4tvg$)_)Q+z<s0nRn>B*irI
zMW7~~{%6KG){NF6vSO)tcaEogiB|=ALujJjRpm?RE+=^LKW`k0dF5wdQTnHbONmfD
zq_2!|EaVo`N`*9W#eCs~>3in+;`H++>HDSWJ2lDz|Ecu-vh@9O+KJ7}0}(j_F*yQJ
zIRbGx0+Bfau{i?KX~GO@?yK@YBv<uiJ|?d$i0u`H`E&A;+;A1`w>V_=Cn6>_Yn1ip
zobJo`d|tNb3{yntBO8!NqEBDCy67oDcdAxUr|yS)ub3{TE1w3c;i0SU0O(#qPemw2
z8IgENR%oW2(-2I-8MN%k0aP?k^BD&*Ny4iz=6Q<`<CE>OZ%U|L@tqTDSAFM&+BIKY
zsNLn87HW6<W`x?knlC_Cm+wNlx_uYZwa9mAsAc*=kU#5{slJ93uB=z5rZB5sGc+ZI
zYYc54=A{ryVX+vvadhA_VxU7@BjUPLT%)u;R_`)gUQY^rhHD@C1;K5G%XfPUpEF$L
z(#t8_WoU*gg|$MP+i(kQ{MsSph`25lSBJ64C~_E!Mj4A7Mz>K!Ool3_u)e-n4tjRt
zETh;@`UmQDL!aUIT$I8W4BgOD*u2)m{GJ&{wtf5#2TCgq)$dU{_)3Bj!$5tBQDV3W
zX_Oqo*7p5)!chF4gLsm=dPfRhO5wQ__6SC@cc8x1D0T3q`M?(hMCFh&qs)Pn<wN!h
z2$?ld?=`#*#5<<emvXd{-v;W-jdBNHo=<r=g;yWP<S|KTj+?#{s_&aZGi`IA-e>q6
zCSN|&w@<-DbNNhOv55+!!lA0jr~2+GsA#T$O6;%FsC1|*^Qpdn3M!f_pb{JO8-9n%
zpHKDXDX3_!fQoW#puWnea;U2EsopvT70u;Ri3Bv1gZL@Kw!g12)U@m*p+^qta<D`W
zmde30Ip~#x<#Ny`2P<~s48KlFD@HSsa^lsFpuV<(`N`i7;m2>Mu_gIfo)#U!lCiNo
zadUWi;5&k)V`F&+=U{ncJA!3nW4-xU9=eX8cWf+A;~ZWdn~q@l*jS#ZIau!ej-amq
zYk0(I9!*JK9nX1>IJ4R8@`&@9%@B`BV~R3AKYslHe!d^SNT2p}<UJxiCm0i)M3^9u
zC3#4XNV{sI+JRIHNNGOAIWPwO5qPs<qz|mWEQNQ{3O!z-YN9dG!A#6xytx>mYmza^
z!Augm$_sRf+^sQc9867y$2ZEO%H_q>>i^nMmGUzkLCuV48NrpAa%V=o**R}^(mOg^
z<lv?q#4vp_9>i}L40R8^(`4%0Ax*}5l56O#b|$^)rqGA<+4S4a6g1;pwBkJaIi!|;
z)R;;?QA|e?Gq4KhV=XSg23&|iT!b&;Vr;>s*p47};Zt}4m*Eio2KNor(<i|d)X85(
zefX!TtDcEpp%EjPh2PVUSMOmCKEO3h!(3KEKR;FCT2_PW*kt;;pN4tt611=edY+Ai
z>^k~kp$#Fn1g*@(BDRix;2FSTwh=e5U1(=}aU(l`o7n5PnZ1S2u%lSQKEy4Of)2@p
zurvpqQVSx|B6LZEFs02{Dm{sA=_q=nV~9$>#WML^ESCd_$wBnWw<0dDh9%#HKKW%V
zl)sCFd=yFfUD)#b=vPW$D>YcDOvY`><#eBm)k+I)S4_Iw_?)sDcPJ0i{Yl)Z?7&^h
zVY<JLHOddMRyjfUzhIs65$;j_Sf`$id)4XKpk9po)OtLiHex_+!l1ek52`odVYLHa
zP;G2fZ^t9*8f;QGV6*x-9#eN<i~2mas$ats>T7sXeG}W%Av~r29#5-(!ZTVCc4|I+
zNi(oZn}KJwAfD5%#Pixh?9pz-UM+%sS`1&+`tgEx2VT_fK}vfN`?be#KzjxUwXfii
z_99-^4&exIdf59EYwCLNJBl9lK-x?AZ@f!gkyqP||G^)qPioc@_#?$tMys|Af5Q8e
zQ#Wg!_%r@OZCIyvGyaOdQNOiatD(q$NZr&MWbNN+%#HVG4<FH35vx(R<756+$<Cr5
zs2P*sp?vT%nJLiOTxm^utW8?VRKn?OiL^w_maqZoe5Mhul<k!~%tcZedy9=QH%VSe
zVFy?dN##-ti?d>qe9~q%g?UJ-pgi~)(@CnNEO>yGkmRQvXk?`%Rmn%CUkhy>`4`eV
ztc<ME<zGr~GcQRc@-gY>tem7$d06@>^O000|3-R?RgmPBe<!`kDoHAr-<7`4{3QA0
zKcY_Tqe3|=D_xhBR%WHAveFN-(gztyoz5N-`>jwL*=NOmE7gUpSM1lXcCaOk@3%@_
z!y3eXC#XAEwb*Yp`TISwUxQ-shS={!%9rQFekW13tY=lUwuVihX!E{U#FSN2Oc^t1
IOkxxN7k7HJr~m)}

delta 824
zcma)4O-~b16g{t<PN(g})@MSjAPG{+M=4WKL|YUUQPhGT1L%k!sZE2`fs#@b<ANAA
z#-Kqa22m1%niyh2V53%oxOU;Mur2KP1;$$%HR^`V$$e+eId|@T?_1-e?e?!fK79sI
zkLyeJm}%4#P4p{6@n}kkjYMO*GMtL*LrUAoU?Q1n%QM|X*ii<X6%`DwTah~vMUM>h
zDQYSiALx@%$slH*OlBq?OQ>d$Gvmwa)34~5d%GyXM_+R@556z2NbpmgnRvLiFegD_
z@T|XkZmgQh>*^Vt*{S*L%<TH>+1$chZhBn8UIxCl`ZBZh>~Fr&aG9%>CTdi$tc{Ir
z>JL)LZ+(Guz>ScMW*jnZn(J7LF=h5vNI1$MGz0=o`KelE97h|2Blc%vhBr?){Gsr_
zqlS9_rwUAdX-aEC*JIICJTVY5Y(jIf10^^qqa7lRO<V4dr}ETk8E1@;yx<q|E(ULS
zD>q<d<>8j1a3UJfdm_nr<c1#Wx;Gf>$`=gkmNF)t0b^s^Jmba-XVoa%4G~s)3HLu@
zN7%>RX%w6A1@4YzlxZJO-s!Thz@wSDSJebwrD_&lqiQ0rRW&QGQ#FYPRLv#w20|;}
zM=0_Agf@Oa4GOhs1Q~)Be+@tE7Tgwo<UNiBMPC{x7zjsCF}TG=>Tiaf&<h)35d`dn
z3%dwQ(2Y`DrAyMW2T6D^f=W0@)n52-gwa7K0e8`fv!KU`+c<~wFp)co3s5P$o07W-
l1xhMK4=%z&c~1B)L8Ap+-fa5I&`XAb><Y;k)u6CzKLL-e<I4a5

diff --git a/download/target/classes/com/sict/excel/test/AnalysisProvinceExcel.class b/download/target/classes/com/sict/excel/test/AnalysisProvinceExcel.class
index eccd126089fca4475788f85d9a88177d5b23de1a..802b721076174cb40aaf35b30e8bf7348d351b1c 100644
GIT binary patch
literal 4352
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

delta 834
zcma)4TTc@~7(G+AyGy&qby08yr9ds$x_}p?MZ5qiS`b|kS01!!Dyc5iz-oBVfG_F;
zCXkg7gm{ZQ_#k3TKxh!3{S`hyTmFRcYZ~M2g-qs~%$e_;neTivTDmC9-+ruo0Z@lt
z0S<=BiPx1M8w(x%0!kUYk$As06pL6|bT|?<wYyf#9Mal`@5BeKwhYoufD0wa6|kQ{
zz7@U~*39rgpQc-bv4K7j<qUjk_ThSBRYWC2Uh3JW^oOO5vBc)|o8)LBIl15wQEhvK
zz07Yn3uQ$b!>-NI=jpY_f2B??h^Vt42p;VqgOqwdlYBY1zOq7m5r-LalT+_f(_^%C
zLq&sxqiAF(=!;tRgp_B07xP<11R2!y+IV_=ZsW<L<co2C_F+UyKAjhFjDf4Kt!>EE
zb6mm+oMdoEf7i<J)(-Pt`;|j%3WokIHQ4(<ltnV8X)STnj7F?jd?0AAIhqRHC_;;b
zR`6sHx!fPKGSF!WXKdLu@8>cs2483^9k6HJ<prD>8?vYee_R?O#7?*xY+X`)U0aj7
zFZpd#nqjgnZmSq!JHSJr{}KO;yim2GE~C(auTVP@C^42$)+vjt@ESRaPd7NFLN}aB
zm2U7#jcy3a0o@RlTHTO&rJkao9MS_^%`%QK1f2dVC7^PuQ)ya6bAYd2#wiAhZPX=x
zfv(JfYlIdbaw+ZvhkVG`O=Az*$*PMe#tnFI6QwZWg`2X@X5UI{JMB2!#yOk^nS$#G
zp#u(L_n;FONW7htyGVtjxeu41!%2GEaT(oI^A+Ofqxcu0hX~oUtCYrI(6Iy8egbWI
B<UIfY

diff --git a/download/target/classes/com/sict/excel/test/ProvinceEarlyCancerRankExcel.class b/download/target/classes/com/sict/excel/test/ProvinceEarlyCancerRankExcel.class
index 5b4c61c417a9a8276d32163962ac2b1e294d4882..a7616258175b32795493718b425093378126e9d3 100644
GIT binary patch
delta 860
zcmZvZ%TE(g6vn^Xc4o?Sf>3R7RD30ssYY9%7NIK2ORLo)Pr(NaWvBz~RN843G--?v
zbf<LVMw71G84XFbni$vq4=znyx>7ej&S0WO%p`a2+;h(F`@TD0YQL@*-+h1e20$~e
zKNmmQ{4NC0EFj2GJF6DdK;G0-fta2%CA6TG!JgDi29FXg#cdwPeg<D@iSrdjgwQ78
z0NNQ`)Y99nrZahCwbdV6C8bm&8HgIDmejHl5fK~`aFC&XO;N&ObTT+~!yHjld5uIB
zf7CK|R6>_ka^&<y&62EfqL+dHP`rQl<I}Qra!kT;M9D->GyAidf^H-T;8FhaFlc6V
zBN_3JSSC(Nh~X52P_U%pGYnoO`hUkE#3l6O%rE$#gkB}qxh4eREysfrhA>PC)amJe
zY{aK#wS*b*k2^71`etizk5RCeV6aWZ4xE#49v4cx?A3+|36tO{Wg?SK>!u4^FeM?e
z^4Z?Vd}hW}Qw)p}Go8V$soB&*w@RV21FA9CGZbfND&66lR_eGe#_CIhydtt2;88<A
zy<ED@2aEPFZx0Jk(CFc1&LdQ@&xW@MRS>SAV=~O&5|~Gjxhjq@lz+T`jnLQ&bax1{
z;O?oQPZm7<OPr|Sw9LsgJz&G=-repI*&%c8vlWbYIQLX>k%3l~L3TbPWjjP#`%n)Q
zu>lTvQHKU>q(^~_AU2^Do6$~T`{_M_t+<43$Y47b=z4BqCzj#ELp0$rO}Gd)vx+QZ
z8XA2$@Q6;5V8neuvpQ_VzK2=Nk+?#X6w=fc#PB=}0&^s2;4<dvZo=>*OFMxE+mVAw
fyJf6H9tAjYh49|rxT}N<Qm;Wsj^q}pYQwdk`y;gp

delta 301
zcmX|*y-LGS97oShZf;{5tVC^$SiwbtQcbJ2TD4W<XItw-ICUs4I{OeA+<XS5Ak@KC
z@M*f~B>th`@`KAg=iK`<`#tS_{l0$y6>eU=v1Pk#X3shdDhgdqlDfwVTRz+DWS@Ez
z)_ry{3Uhlm81(P+EYa}UA3ixHHMDarr3zW<#vWq~IqCMY2RC^vuLT>Cj+`KQquMa*
zBWeoSJw;?*1hesESDBIx(9AKzJPQ<w2}y`(vB;S`*P%pSsLM&70}kb+Y10%&iPz+a
uV=S?2oRCU8jU|05x|Y;3=Um_jT#(3>{Ie~A;=j-lVM29<Qe4ZeMeh$+)hJE?

diff --git a/download/target/classes/com/sict/excel/test/ScreeningRankGecaExcel.class b/download/target/classes/com/sict/excel/test/ScreeningRankGecaExcel.class
index ef438ee145edb636ff1075d140d559b63e1f46ef..0cf616f63c1ebf7d648629e1c80c81dd4b889618 100644
GIT binary patch
delta 1076
zcmY+C-*XdH6vsceo83*ei(rOOmzF_Wga)S5Qf+`nP>R2T(JBatigroYur*CevH_`R
z1PUVRXw3sNzA@vBJ~)U2t`-=^Xa5J_$r*gmHy?aa&Nh`Fv$OZ!bHDfdJ?DJy{d@6W
z%dFr2y?hN=&*wi{ZQ4k?tR6ENR6H=@9&-EZfnVy+`?bL4afTFH(F+u*-ds9AkC)tX
zv43>`gjWc%CL0tz&42WshDC-=Hp65^NGMwiLESCYylQ<iV&6;7l>@KnRkIeGdD3Ky
z;=#Mh3!u$YY*obla<JPi)jg@BH=T=W-DdN21jTCpv=`@D#mYa<ey82~;Y@Q>>r6f`
z$l$=h28&17Zu0{9=27jZc8iyI*<@6)X7*-x^MbB-*u26HMWRsk+`!vWIjmSKUC!R<
zSuBB6_bR(hb}1eeMyG7q?BO+q)go;3N+rd*7NaYQvT<Hl7{7mc`que#7H{&F$v(wu
zp*JGj=559lcFhZ-aG|eM?>)Zm461&)m`zLK{fdsewzPnex?dXisunJZXz*;_p(r`s
zsVT2KuIRe|n(naj5lvch@ogq}SDXzhEmX1ezS~(Sp`9)!ZORxTU#Lt@`a!fcWpnUi
zKGvliJ*Wh(IG}R!`wG2wz>8i=WT5yPH??YH=^6<aMSjY?6y`0Py}oMEyj{YHb_Oqo
zdQ7Qg^NNv9T*9DTUgy>3pT<x_%NSb5{FW6d!_iab90P6qN+x7u$P;53W5!e|)6wS`
zQJnkldf(dQGfvFWlh1|ZhE3;xC^i=I;&9xFYau&_6HX$zH{=Z`u1BHeSXXfO{!Afd
zgp7wA5NzEX(pp2NioA*oQjmrv<93oVrijtO5+0Jzp^xPZ(aA=!XA3LXCG$8dsqru;
z<Q0BOH($}i*R0|^tGPrkmr2jJIgK4POI1!Is=p9WM~U|L9HMcUHc9af?{P#5=;I5f
zd0&nV@i9mF09}&K@F5LxEh~~A$;uR|9LG2=s}pRJe}=dev7VEhA|YjT3;UF`b6Qd^
VyOZG)$<We0Bf3f$lBkW(ZUe}o_0IqR

delta 468
zcmaiwOG{f(6otPNZ>~2Fs-!eEK3YT^B$D1FZPdj2s*SJus-~R>xtNsrKrfP+I&o$x
zy*P3pB6e0#1kphK0ZvN)gT{_J>$G%het?q&d!KKub<X({{9EU}`d7XL;(R#qx@tBI
z;)-}CZ6;#zlxdabt)hAT!>Jr@-hSV!>>pJ=f4%v#6a9U#DXZ&pxw3owqEuWnc&T{)
z0BDd@Xo*;?%S$U=e!591d{${?dDYI`RVl~RzBT!1rpM1~bcH^@ytr7f?^b<&`cE(P
zX4S5(<m|j6F!3q3o->QNr3G`&UM(yw^eEhGdCRgDVdt0L=KR$3(=9_&s@~c5ggrVs
zhP?KpbM8rQ1Y&7D8VMvqTF4!Ebw+2pw&Q}dLbO*AITo@8uW006AEWVvdV)0Yl&ENu
z5GfiNrHLt8$np%I@Uztx1{jn{llcupDDe*SmJBZO_GM)lk%A~;2^bSBDc>^AJKPf5
i!UU6Y-BBJ%^fa~1NK~+D73X_#R{2@s6?1axBKsf97;HlT

diff --git a/download/target/classes/com/sict/excel/test/ScreeningRankProvinceExcel.class b/download/target/classes/com/sict/excel/test/ScreeningRankProvinceExcel.class
index ae103d5b24272371344cde1d61c1b2943baa229a..f0615ee0e309e0441bd162c86e138eb0d8d0554e 100644
GIT binary patch
delta 1071
zcmY+C+ix3H5XOI}Ywy~drKP5Bx>XAFme@(F6a#6oDKrT;hd_FPK*}v!cX2m3cCgn?
z2^UjnA>1SRfd?K?B_t#y5D?W>iWE>E`5$;h^pB{ZbL^D14`<Gqne%-!^PRK0;k$18
z&wnqk0{8LNFZNx=NEi3>pv41<^)udSZ?GN)rNQx_7CH>EUttveP?1dK)8p-Y$txEJ
zCr-@xg)nFFkYb>DEjrM!IY7?gVGatBK!yup-7D4nYJFCtZw2Sep<nc?Ih#irwm78N
zc$0Z8=`g~mA{LaxNv~A*rH@oPuX}ym;R&6J)Pe;+##4$N|NQt(v)9<37?Wsb-@g4e
z+ZlIwhG&~o#>Fn1!yL6ZqUdW*MEf>79OF4fyioPM&_7z4SM;ay&5df;263dVNnW&g
zL9tt|@7O9ahbfLL><(hoFO_8M4x~qWxfm}i%)gfwul{tw=2fOGUQ_gHd_!Mw@HnAx
zYJRBQwULskTO>UeR)caem!7mZsp!6`NGCB;4@xKfs!f5oHbsY11X9$SoAb+p=(+uc
z{zr{#m<(0m4Tlo)8nLj_$tpJ8_AqNLbkRe_VGdL13zgZ~Ak?9%Lv1-7*`~U~O6Z9K
zDlbb~h}KT|`j3c$dn}`>_3Ud7M|Q5)YRZ!o+IppQ=#I8p0@1O|@_clQQi<l0nX=Vo
zOuFP>UTI!2vkha&G={A2*_JfjXwq6CvyMMF&?4L7k?A4xoTZYM8(rZs#fAU=+S{La
z(v7&$M83t-S<AhVicGhd$j025(c<}R+>Iw*YVnF2Gqr2G_HPuXF5xG|f4#+w<OWtK
zD;l!Bsc@~Ir6U7d>=+5Ln~AW6JJ~9>hYWX<<sJ@lFQfA5j>{gfi!<zIkzSVQ<7-lU
zOPXc+Sz!;qv$s9x0*;=Rkh<&<RyoZ)O1OXJOoO*rCnbJhfw!fBj8MJ9yK*fn#P87{
zDn-xpK4(R?Lqh+7oGd9k#)q7f)1urw&qu@rnc-vc<I=`XK9Q5nr|nU0RQOCPba+1(
MUd0z;rTmxI0gq1X9{>OV

delta 309
zcmX|*%Syvg5Qe{#oF0=j&=MsY?-x)}gqo_=ShZR&^;)ms-j$2u#=Q@b2XNy9D8+&<
z`T*{I2cN-(I8u;-A7<wNznQ1rcFz0wd2a*rT)cSQw(U?%Z9Nq%Ds)^Zlsv{L`7E=N
zmi6mEmO)m1${2;Yxob3T@Bc>YJ{!$XGo(_>DK;OSP^o;{a;H7MF?0$4I{k8!hq;*`
zj&zg>7FsMNX7-IlA-blB%(K{RJkd#9(H=A*dHSUKiRDbf2>XmuXPhf0$cn4h!Bb&V
zI?W|pR8f+vvCR&aq$}*QC+uo0=$at3poTf%kc@OWjyRS-PXrMD2kH{&xK72TIFqf#
F`7h~}Dail;

diff --git a/download/target/classes/com/sict/excel/test/ScreeningRankQgExcel.class b/download/target/classes/com/sict/excel/test/ScreeningRankQgExcel.class
index a5685234ed28b76e440d654f2de4b0a7bc086a4e..8a0aed55e86b2d72c152ee272408bb1f2b20d7be 100644
GIT binary patch
delta 1091
zcmY+D?Q;`V6vltIo83*eE5(dyS!o9$VpEt-YqbFyMJXz#R#7UizI930ur*C;vH`6x
zK?@29GmII(@Qq;{Kgr-Aaf*ZEXa5Jj0pq{m7xCPt@-jPn_n!Nl^PF>@dv>wwR=4xl
zzt{f&p61*y&OaUFow9qzW<;@S)<5bG)uXU9G#S<+muDGO7{wq`q%!$|$z{Ccmy1KY
z56=dLC}*=pk#1fv(+!6#+g!%T36X^CC`5I?R12#0IUW6AaK0P`#h{vVc%Bz*wksaJ
z&%6S<yvPnkJS<21{8BxTIx+)!UF%MlmoyZsg$qHPR}|}R-DnzjE*)=n8Qnd1ez+3n
zRe?u_hqpMaXTs$*CY#%gYn={n@TSdfMSpY1?C)`Ti#>`&p&Iy6u%~iNu}S)Du8*a=
z#F7HvW}nSo#YXYpuvX4o_H#htv_p0VrIKRvN=&adb8!wStlQ^L{eAhO!@In1^Pb`<
zP0-K|E*~(haBD%N&6Vy_nFrLJimG9`m>ZDXhZQ~d#c2cM^{_M(R2_U0dI?-Uq$o-K
z`T3wcqv(D3vhGDq>M-fbCv=(RBhfdiv{A)l58cs937zyZ=TgQJ`a)%HE{yciyvxT|
z6R|$ECaOffNTBlah6=NGB+%p1)^JK2G7m;oOWUt?U8QxE+bJw7m(fR$EXyXb`fTLt
zezQZVWb=@fanv;|I%QUGG|yV24I^tAS^FpYQkG|?>?MXf_>*jltu3CL&RQpIm9jl^
ziE+inyEg|nC13Vpo|)X$B0pw(|3k6q7O#)Ry|~e0YAoR;k_TJ7<Hb#FI-c`8{=wfU
zq^uS*EshAbc?s#UA)kuEv#&@+29B%~BxOwzqleY3k;h|@#~EcUTSces^s!gIGpwV=
z6D-O+e#ZvBC(Q+(<T4xim42?1S?+TIS9eQQyb;zVBI+pN{+Xi<j?p10e&iEAl>!Di
z&jO!`+bE~_oG&mX=}Eq%A+qHd;JEB;p_<?;zLwph{GN-PATC9Wi03yXq>MD*%FYoE
V=)RZXv}9=Wo)KOp5henj{SWm1@Mi!3

delta 336
zcmX|*%Su8~6o$WT$D<wv#Yi(XXcAEz@Y2!J?sl=e(IYf!AWa(8AfZ`ML}$>TL4*WN
zBqIuP&;#@i&CKip8Z?Pk1P%5Nd$0fd)^3Il{l?38;~7Y@ac6uvGH#NJ*vI)z`}XL)
zcG0@LZk?RHogSO*t4ga{X*L>e(h4n=NMsHAuzY05+F|V>>Ltdgj~u!}-`Xjcw|9S^
z#(a$5*Y&uvUtQ_yo?EGaz3&+?_(aDgt2gbM$2u?vgNcY1aRyV54CnNrCq@*Kc|}C8
zORWP#vLBCRCmLM@2+>U#Q_`Y`S)wcvr$jGaX%+wUOfV@ojdiA&MhRD7Mvg<cyijxE
nE|{X8XF+O~;6)a3%E&LmW%=id2txnBssMkjHEAgkBeT*E0kb@d

diff --git a/download/target/classes/com/sict/excel/test/ScreeningRankShchyyExcel.class b/download/target/classes/com/sict/excel/test/ScreeningRankShchyyExcel.class
index 12b15aa77dde467c188d97b825b07293c7471ad3..045614707dfb2ef082a2d6c1a9fe4827cb6c152e 100644
GIT binary patch
delta 1081
zcmY+D-*XdH6vsc8&F&`KMKoi;l^{ZZHZYymY6CWkQv8)#3sOPwXP0yhThpW_8_=pm
zEh?hUQ1j*+Gde!W=pd2eh(7Z_FryESzB;_=jCyWT`7t|t_ndpq_j}Iy-n)OTy1LrA
z{LjTpz&(8WtrIgwd&IieW=L_%jDOT0XhdOoU_7ixF8494FiJtBNc9!6<DGcfuapM%
z9G(e^QQl^|BGdZY%rqTx-0w0%UWf#;s~9!>ay_UuW;OaoaG??frJ$B~c#wx|b}DYW
z&b%CSd6->_cvy)J_~k|*ee`7uy4T$<kLXaW9?l1G9#gFU{fkSj3FEHh6S6xrIJn(m
z17j{vGTu6FobPd%V6V*{MQ>}-*qEL?5(F~c)9h0uinYLxf_>Fvimfu^;;)%i;z)1L
zaKL82Vzb7ql|7edIjC^Dh}}WCtk~9tq_vli^PIx^?exh%&Yp32ftPGvRBX}srcQ8q
znJI-^4<hX@&z0)CLD$Ks7FJ66tdu^iSaV&LZeX+#mZyW7gHJ*)fy*nDq^LhP7gVMd
z>6?$~8fsj_WGJ7|WrkNp*{Ir$DsI2&be3D_A<e8y1xx6Q)!ErF(pz&bubrESrIlw!
z)yNkKR6*WQVb-;*ijIUGiRC63H7#tfsJc?CD(6$|=(hOFrj;Gd1gCd~&RsAqrIM|m
ztZd>u7Cmx9e{B6}4L6OPW#sIySeLRqGi5I^xPqU_wb{|;fvKEz!d5BUGnW`uocZ@k
z|JLNAUd%I-kGCm|*xvu4*i@URM&e%FXfrvI@Dj;GZJzhyrgk0A`2qjX_Y_lBo9Q-3
zB(`k{8Lugys=~9sk&X-;S;t7qnj*#;ZsiVnJo>qlVb-!kG}_5J_RDvg_0+kW1-XtN
zvysop@Hv|}%Vxe~3m56_%sG#%r==#@2<s9N4U}+y&Cw>uSRp08<aOSV2KqV8Ja0<c
zFeiD7w=t#Y`y8h!vgOJ0j##!(jqxt;iM1d<<pL*&OA|wq`2h)OBg2PcIl=*}uT}U+
QDs*{I39k}_i3C6S4{KudzW@LL

delta 399
zcmXAj%TB^z6oluurG-L*sft!mBkBSSmZB9YD&A03ym5(ZLI_|0jWmXx3wQ2JUqnMR
z@e&`vw{UOb!kr7_0XCEWoPWMK^W*t-OCNtP?*KI9A0(a|v_oUil7<=yYcaLdDwb-h
z_03I)bFEs_j(O{go0fG3J`xT`B}^jf!V+SZpMUf^;X~YoWe5yH@w{HInw{0E3yJot
z;A1oVMZv5v$mz4fRY9#48f7(WURE3BID@TODV0oyz}@GRknOzV?HjwmSig1a2slIt
zuv5=d>&>BG%V9$Z1?7msD>ixI35$j}`wWADbcI0?@5#zRA`NzR06d1!4-ZB#j1Z{~
z1u={w1uqV%We#I-l0VZsgEg$v#3PFhY=RNHgDoV{M{GWUZ5lZW3R1u>*>w1^hke*6
ibR20MP~Q~X6nz8{#}wu1q8;*t$euq#enuxif4P6oi9n_R

diff --git a/download/target/classes/com/sict/excel/test/SerumTest.class b/download/target/classes/com/sict/excel/test/SerumTest.class
index 76132701f75bb3444d4a7fa52dcea392e071ff4c..8fca8ebf42b2b575edb01163056d89dc7d90cd1d 100644
GIT binary patch
delta 22
ecmZ2%ve;yUg(xHcWJ^(x$rhr#oBKqkvH$>52L{0a

delta 22
ecmZ2%ve;yUg(#!IWJ^(x$rhr#oBKqkvH$>56$Zip

diff --git a/download/target/classes/mapper/DownloadMapper.xml b/download/target/classes/mapper/DownloadMapper.xml
index 7dd71f6..89432ab 100644
--- a/download/target/classes/mapper/DownloadMapper.xml
+++ b/download/target/classes/mapper/DownloadMapper.xml
@@ -163,68 +163,73 @@
 
 	<select id="geteaCancerHospitals"
 		resultType="com.sict.excel.dto.EarlyCancerHospitalDTO">
-		SELECT (@rowNO := @rowNo+1) AS id,a.*
-		FROM(
 		SELECT
-		hospName as
-		hospname,
+		(@rowNO := @rowNo + 1) AS id,
+		a.*
+		FROM
+		(
+		SELECT
+		hospName AS hospname,
 		area province,
 		(
-		count( gastroDetailInfo LIKE '%"a":1%' OR NULL
+		count(
+		gastroDetailInfo LIKE '%"a":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"b":1%'
+		OR NULL
 		) + count(
-		gastroDetailInfo LIKE '%"b":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"c":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"d":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"e":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"f":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"g":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"h":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"i":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"j":1%' OR NULL ) + count(
-		gastroDetailInfo
-		LIKE '%"k":1%' OR NULL ) + count( gastroDetailInfo
-		LIKE '%"l":1%' OR
-		NULL ) + count( gastroDetailInfo LIKE '%"m":1%' OR
-		NULL ) + count(
-		gastroDetailInfo LIKE '%"n":%' OR NULL )
+		gastroDetailInfo LIKE '%"c":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"f":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) + count(
+		gastroDetailInfo LIKE '%"h":1%'
+		OR NULL
+		)
 		) total,
 		count(
-		gastroDetailInfo LIKE '%"a":1%' OR NULL ) AS highEsophagealNeoplasia,
-		count( gastroDetailInfo LIKE '%"b":1%' OR NULL ) AS
-		earlyEsophagealCancer,
-		count( gastroDetailInfo LIKE '%"c":1%' OR NULL )
-		AS
-		advancedEsophagealCancer,
-		count( gastroDetailInfo LIKE '%"f":1%' OR
-		NULL ) AS highGastricNeoplasia,
-		count( gastroDetailInfo LIKE '%"g":1%'
-		OR NULL ) AS
-		earlyGastricCancer,
-		count( gastroDetailInfo LIKE '%"h":1%'
-		OR NULL ) AS advancedGastricCancer
+		gastroDetailInfo LIKE '%"a":1%'
+		OR NULL
+		) AS highEsophagealNeoplasia,
+		count(
+		gastroDetailInfo LIKE '%"b":1%'
+		OR NULL
+		) AS earlyEsophagealCancer,
+		count(
+		gastroDetailInfo LIKE '%"c":1%'
+		OR NULL
+		) AS advancedEsophagealCancer,
+		count(
+		gastroDetailInfo LIKE '%"f":1%'
+		OR NULL
+		) AS highGastricNeoplasia,
+		count(
+		gastroDetailInfo LIKE '%"g":1%'
+		OR NULL
+		) AS earlyGastricCancer,
+		count(
+		gastroDetailInfo LIKE '%"h":1%'
+		OR NULL
+		) AS advancedGastricCancer
 		FROM
 		(
 		SELECT
 		p.id patientId,
 		rel2.number hospNumber,
 		rel2.`name` hospName,
-		rel1.step
-		gastroStep,
+		rel1.step gastroStep,
 		rel1.is_inspect isGastro,
 		rel1.inspect_way gastroWay,
-		rel1.capsule
-		gastroResult,
+		rel1.capsule gastroResult,
 		rel1.precise_way gastroDetailWay,
-		rel1.diagnose_result
-		gastroDetailResult,
-		rel1.diagnose_info
-		gastroDetailInfo,
-		rel1.`status`
-		auditStatus,
+		rel1.diagnose_result gastroDetailResult,
+		rel1.diagnose_info gastroDetailInfo,
+		rel1.`status` auditStatus,
 		rel3.area
 		FROM
 		tb_patient p
@@ -243,23 +248,25 @@
 		tb_gastro_inspect
 		WHERE
 		is_inspect = 1
-		AND
-		`status` NOT IN ( 0, 5 )
+		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
-		INNER JOIN tmp_tb_hosp_area rel3 ON
-		rel2.`name` = rel3.`name`
+		) rel1 ON rel1.patient_id = p.id
+		INNER JOIN (
+		SELECT
+		`name`,
+		number
+		FROM
+		tb_hosp
+		) rel2 ON rel2.number = p.hosp_number
+		INNER JOIN tmp_tb_hosp_area rel3 ON rel2.`name` = rel3.`name`
 		) rel
 		GROUP BY
 		hospName
-		ORDER BY
-		earlyGastricCancer DESC
 		) a,
-		(select @rowNO :=0) b
+		(SELECT @rowNO := 0) b
+WHERE total >0
+		ORDER BY
+		total DESC
 	</select>
 
 	<!-- 运营分析-省份数据 -->
@@ -594,7 +601,8 @@
 		COUNT(NULL) actual
 		FROM
 		tb_patient p1 INNER JOIN tb_risk_assess p2
-		ON p1.id = p2.patient_id RIGHT JOIN (SELECT `name`,number FROM tb_hosp
+		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
@@ -687,7 +695,8 @@
 		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
 		) rel
 
@@ -718,7 +727,9 @@
 		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
+		INNER JOIN
+		(SELECT `name`,number FROM tb_hosp )rel2 ON rel2.number =
+		p.hosp_number
 		) rel
 		GROUP BY
 		胃癌患病风险等级
-- 
2.22.0