Index: ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport_child.jasper
===================================================================
diff -u
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseTournoverDaysStatisticsReportHelper.java
===================================================================
diff -u -r36366 -r37005
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseTournoverDaysStatisticsReportHelper.java	(.../TousseTournoverDaysStatisticsReportHelper.java)	(revision 36366)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseTournoverDaysStatisticsReportHelper.java	(.../TousseTournoverDaysStatisticsReportHelper.java)	(revision 37005)
@@ -2,6 +2,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,9 +22,9 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
+import com.forgon.disinfectsystem.jasperreports.javabeansource.FirstColumnVo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseTournoverDaysStatisticsReportVo;
 import com.forgon.systemsetting.model.HttpOption;
-import com.forgon.tools.MathTools;
 import com.forgon.tools.util.SqlUtils;
 
 /**
@@ -44,44 +45,38 @@
 	 * @param parametMap 报表参数
 	 * @return
 	 */
-	public List<TousseTournoverDaysStatisticsReportVo> getTousseTournoverDaysStatisticsReportData(Map<String,String> requestParameters, Map<String, Object> parametMap){
-		String startYear = requestParameters.get("startYear");
-		String endYear = requestParameters.get("endYear");
+	public List<FirstColumnVo> getTousseTournoverDaysStatisticsReportData(Map<String,String> requestParameters, Map<String, Object> parametMap){
+		String startDate = requestParameters.get("startDate");
+		String endDate = requestParameters.get("endDate");
 		parametMap.put("amountFormat", "#0.00");
 		parametMap.put("title", "器械包周转天数统计报表");
-		if(startYear.equals(endYear)){
-			parametMap.put("dateStr", startYear+"年");
-		}else{
-			parametMap.put("dateStr", startYear+ "至" + endYear + "年度");
-		}
-		String startDate = requestParameters.get("startYear") + "-01-01 00:00:00";
-		String endDate = Integer.parseInt(requestParameters.get("endYear")) + 1 + "-01-01 00:00:00" ;
-		String sql = getSql(startDate, endDate, requestParameters.get("packageTypes"),requestParameters.get("orgUnitCoding"));
-		return jdbcTemplate.query(sql, new ResultSetExtractor<List<TousseTournoverDaysStatisticsReportVo>>() {
+		parametMap.put("dateStr", startDate+ " ~ " + endDate);
+		startDate = startDate + " 00:00:00";
+		endDate = endDate + " 23:59:59" ;
+		DecimalFormat df = new DecimalFormat("0.00");
+		String startValueStr = requestParameters.get("startValue");
+		final boolean compareSizes = StringUtils.isNotBlank(startValueStr)?true:false;//是否对比代销  初始值有值 说明要对比大小
+		Double endValue = compareSizes&&StringUtils.isNotBlank(requestParameters.get("endValue"))?Double.parseDouble(requestParameters.get("endValue")):0.00;		
+		Double startValue = compareSizes?Double.parseDouble(startValueStr):0.00;
+		String comparisonOperators = compareSizes?requestParameters.get("comparisonOperators"):null;//对比符
+		
+		String sql = getSql(startDate, endDate, requestParameters.get("packageTypes"),requestParameters.get("orgUnitCoding"),requestParameters.get("tousseName"));
+		return jdbcTemplate.query(sql, new ResultSetExtractor<List<FirstColumnVo>>() {
 
 			@Override
-			public List<TousseTournoverDaysStatisticsReportVo> extractData(
+			public List<FirstColumnVo> extractData(
 					ResultSet rs) throws SQLException, DataAccessException {
-				List<TousseTournoverDaysStatisticsReportVo> vos = new ArrayList<TousseTournoverDaysStatisticsReportVo>();
+				List<FirstColumnVo> firstColumnVos = new ArrayList<FirstColumnVo>();
 				Map<String, String> packageTypeMap = null;
 				boolean first = false;
-				Map<String,Map<String, TousseTournoverDaysStatisticsReportVo>> dateMap = new HashMap<String, Map<String,TousseTournoverDaysStatisticsReportVo>>();
-				Map<String,Integer> validDateMap = null;
+				Map<String,FirstColumnVo> firstColumnVosMap = new HashMap<String, FirstColumnVo>();
 				while(rs.next()){
 					if(!first){
 						packageTypeMap = new HashMap<String, String>();
-						validDateMap = new HashMap<String, Integer>();
-						setPackageTypeMap(packageTypeMap,validDateMap);
+						setPackageTypeMap(packageTypeMap);
 						first = true;
 					}
-					String dateStr = rs.getString("dateStr");
-					Map<String, TousseTournoverDaysStatisticsReportVo> tousseTournoverDaysStatisticsReportVoMap = null;
-					if(dateMap.containsKey(dateStr)){
-						tousseTournoverDaysStatisticsReportVoMap = dateMap.get(dateStr);
-					}else{
-						tousseTournoverDaysStatisticsReportVoMap = new HashMap<String, TousseTournoverDaysStatisticsReportVo>();
-						dateMap.put(dateStr, tousseTournoverDaysStatisticsReportVoMap);
-					}
+					TousseTournoverDaysStatisticsReportVo vo = new TousseTournoverDaysStatisticsReportVo();					
 					String packageType = rs.getString("packageType");
 					if(StringUtils.isBlank(packageType) && !"".equals(packageType)){
 						packageType = "";
@@ -94,55 +89,76 @@
 					}
 					Long amount = rs.getLong("amount");
 					Long subday = rs.getLong("subday");
-					TousseTournoverDaysStatisticsReportVo vo = null;
-					if(tousseTournoverDaysStatisticsReportVoMap.containsKey(validDate)){
-						vo = tousseTournoverDaysStatisticsReportVoMap.get(validDate);
-						vo.setAmount(MathTools.add(vo.getAmount(), amount).longValue());
-						vo.setSubDays(MathTools.add(vo.getSubDays(), subday).longValue());
+					vo.setTousseAmount(amount);
+					vo.setPeriodOfValidity(validDate);
+					if(amount == null || amount == 0L || subday == 0L){
+						vo.setAverageDays("0.00");
 					}else{
-						vo = new TousseTournoverDaysStatisticsReportVo();
-						vo.setAmount(amount);
-						vo.setSubDays(subday);
-						vo.setColumnTitle(dateStr);
-						vo.setColumnName("包数");
-						if(validDateMap != null){
-							vo.setSequence(validDateMap.get(packageType));
-						}
-						vo.setValidDateStr(validDate);
-						tousseTournoverDaysStatisticsReportVoMap.put(validDate, vo);
+						vo.setAverageDays(df.format(1.00 * subday / amount));
 					}
-				}
-				if(dateMap.size() > 0){
-					for (Map<String, TousseTournoverDaysStatisticsReportVo> tousseTournoverDaysStatisticsReportVoMap : dateMap.values()) {
-						for (TousseTournoverDaysStatisticsReportVo vo : tousseTournoverDaysStatisticsReportVoMap.values()) {
-							if(vo.getAmount() == null || vo.getAmount() == 0L){
-								vo.setAverageDays(0.00d);
-							}else{
-								vo.setAverageDays(1.00 * vo.getSubDays() / vo.getAmount());
+					if(compareSizes){//因为显示的值是四舍五入后的值，所以对比也必须对比四舍五入后的值
+						Double averageDaysDoubleValue = Double.parseDouble(vo.getAverageDays());
+						if("介于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, endValue) >=0 || Double.compare(averageDaysDoubleValue, startValue) <= 0){
+								continue;
 							}
-							vos.add(vo);
-							vos.add(vo.getDayBean());
+						}else if("小于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, startValue) >=0){
+								continue;
+							}
+						}else if("小于等于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, startValue) >0){
+								continue;
+							}
+						}else if("等于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, startValue) !=0){
+								continue;
+							}
+						}else if("大于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, startValue) <=0){
+								continue;
+							}
+						}else if("大于等于".equals(comparisonOperators)){
+							if(Double.compare(averageDaysDoubleValue, startValue) <0){
+								continue;
+							}
 						}
 					}
+					
+					String tousseName = rs.getString("tousseName").trim();
+					FirstColumnVo firstColumnVo = null;
+					List<TousseTournoverDaysStatisticsReportVo> firstColumnDetaileds = null;
+					if(firstColumnVosMap.containsKey(tousseName)){
+						firstColumnVo = firstColumnVosMap.get(tousseName);
+						firstColumnDetaileds = firstColumnVo.getFirstColumnDetaileds();
+					}else{
+						firstColumnVosMap.clear();
+						firstColumnVo = new FirstColumnVo();
+						firstColumnVo.setFirstColumnName(tousseName);
+						firstColumnDetaileds = new ArrayList<TousseTournoverDaysStatisticsReportVo>();
+						firstColumnVo.setFirstColumnDetaileds(firstColumnDetaileds);
+						firstColumnVosMap.put(tousseName, firstColumnVo);
+						firstColumnVos.add(firstColumnVo);
+					}
+					firstColumnDetaileds.add(vo);
 				}
-				return vos;
+				return firstColumnVos;
 			}
 		});
 	}
 	/**
 	 * 获取包装类型对应的有效期 和 排序号
 	 * @param packageTypeMap 包装类型对应的有效期
-	 * @param validDateMap  包装类型对应的排序号 
 	 */
-	private void setPackageTypeMap(Map<String, String> packageTypeMap, Map<String,Integer> validDateMap){
+	private void setPackageTypeMap(Map<String, String> packageTypeMap){
 		StringBuffer sbf = new StringBuffer();
-		sbf.append("select ho.optionText,ed.validDate,ed.validDateUnit,ed.warningDate from ");
+		sbf.append("select ho.optionText,ed.validDate,ed.validDateUnit from ");
 		sbf.append(HttpOption.class.getSimpleName());
 		sbf.append(" ho join ");
 		sbf.append(ExpirationDateInfo.class.getSimpleName());
 		sbf.append(" ed on ho.optionText=ed.packageType where ho.optionListId='");
 		sbf.append(HttpOption.SYSTEMSETTING_PACKAGING_TYPE);
-		sbf.append("' order by ed.validDate , ed.validDateUnit");
+		sbf.append("' ");
 		jdbcTemplate.query(sbf.toString(), new ResultSetExtractor<Integer>(){
 
 			@Override
@@ -151,8 +167,7 @@
 				int i = 0;
 				while(rs.next()){
 					String optionText = rs.getString("optionText");
-					packageTypeMap.put(optionText, rs.getInt("validDate") + rs.getString("validDateUnit"));
-					validDateMap.put(optionText, i++);
+					packageTypeMap.put(optionText, optionText + "("+rs.getInt("validDate") + rs.getString("validDateUnit")+")");
 				}
 				return i;
 			}
@@ -165,12 +180,13 @@
 	 * @param endDate
 	 * @param packageTypes 包装类型
 	 * @param orgUnitCoding 供应室编码
+	 * @param tousseName 器械包名称
 	 * @return
 	 */
-	private String getSql(String startDate, String endDate, String packageTypes, String orgUnitCoding){
+	private String getSql(String startDate, String endDate, String packageTypes, String orgUnitCoding, String tousseName){
 		String orgUnitCodingsSql = SqlUtils.getStringFieldInLargeCollectionsPredicate("i.orgUnitCoding", SqlUtils.splitStringToSet(orgUnitCoding, ","));
 		StringBuffer sbf = new StringBuffer();
-		sbf.append("select year(sendTime) dateStr,count(*) amount,sum(subday) subday,packageType from (select 1 amount,DATEDIFF(day, endDate,i.sendTime) subday,i.sendTime, ti.packageType from ");
+		sbf.append("select count(*) amount,sum(subday) subday,packageType,tousseName from (select 1 amount,DATEDIFF(day, endDate,i.sendTime) subday,i.sendTime, ti.packageType,td.name tousseName from ");
 		sbf.append(TousseInstance.class.getSimpleName());
 		sbf.append(" ti join ");
 		sbf.append(TousseDefinition.class.getSimpleName());
@@ -180,7 +196,7 @@
 		sbf.append(SterilizationRecord.class.getSimpleName());
 		sbf.append(" sr on sr.id=ti.sterilizationRecord_id where sr.endDate is not null and ti.invoice2_id is null and ");
 		sbf.append(orgUnitCodingsSql);
-		sbf.append(" union all select 1 amount ,DATEDIFF(day, endDate,i.sendTime) subday,i.sendTime,ti.packageType from ");
+		sbf.append(" union all select 1 amount ,DATEDIFF(day, endDate,i.sendTime) subday,i.sendTime,ti.packageType,td.name tousseName from ");
 		sbf.append(TousseInstance.class.getSimpleName());
 		sbf.append(" ti join ");
 		sbf.append(TousseDefinition.class.getSimpleName());
@@ -198,7 +214,12 @@
 			sbf.append(" and ");
 			sbf.append(SqlUtils.getStringFieldInLargeCollectionsPredicate("packageType", SqlUtils.splitStringToSet(packageTypes, ",")));
 		}
-		sbf.append(" group by packageType ,year(sendTime) ");
+		if(StringUtils.isNotBlank(tousseName)){
+			sbf.append(" and tousseName='");
+			sbf.append(tousseName);
+			sbf.append("' ");
+		}
+		sbf.append(" group by packageType ,tousseName order by tousseName");
 		return sbf.toString();
 	}
 }
Index: ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jasper
===================================================================
diff -u -r36324 -r37005
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseTournoverDaysStatisticsReportVo.java
===================================================================
diff -u -r36271 -r37005
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseTournoverDaysStatisticsReportVo.java	(.../TousseTournoverDaysStatisticsReportVo.java)	(revision 36271)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseTournoverDaysStatisticsReportVo.java	(.../TousseTournoverDaysStatisticsReportVo.java)	(revision 37005)
@@ -4,112 +4,41 @@
  * 器械包周转天数统计报表vo
  *
  */
-public class TousseTournoverDaysStatisticsReportVo implements Cloneable{
-
-	private String rowNum;
+public class TousseTournoverDaysStatisticsReportVo {
 	/**
 	 * 有效期
 	 */
-	private String validDateStr;
-
-	private String columnNum;
-
-	private String columnTitle;
-
-	private String columnName;
-
-	private Double averageDays;
-	
-	private Long subDays;
-	private Long amount;
+	private String periodOfValidity;
 	/**
-	 * 序号用于报表排序
+	 * 周转天数字符串 用于报表显示
 	 */
-	private Integer sequence = 5000;
-
-	public String getRowNum() {
-		return rowNum;
+	private String averageDays;
+	/**
+	 * 包数
+	 */
+	private Long tousseAmount;
+	
+	public String getAverageDays() {
+		return averageDays;
 	}
 
-	public void setRowNum(String rowNum) {
-		this.rowNum = rowNum;
+	public void setAverageDays(String averageDays) {
+		this.averageDays = averageDays;
 	}
-
-	public String getColumnNum() {
-		return columnNum;
+	
+	public String getPeriodOfValidity() {
+		return periodOfValidity;
 	}
 
-	public void setColumnNum(String columnNum) {
-		this.columnNum = columnNum;
+	public void setPeriodOfValidity(String periodOfValidity) {
+		this.periodOfValidity = periodOfValidity;
 	}
 
-	public String getColumnTitle() {
-		return columnTitle;
+	public Long getTousseAmount() {
+		return tousseAmount;
 	}
 
-	public void setColumnTitle(String columnTitle) {
-		this.columnTitle = columnTitle;
+	public void setTousseAmount(Long tousseAmount) {
+		this.tousseAmount = tousseAmount;
 	}
-
-	public String getColumnName() {
-		return columnName;
-	}
-
-	public void setColumnName(String columnName) {
-		this.columnName = columnName;
-	}
-
-	public Long getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Long amount) {
-		this.amount = amount;
-	}
-
-	public Integer getSequence() {
-		return sequence;
-	}
-
-	public void setSequence(Integer sequence) {
-		this.sequence = sequence;
-	}
-
-	public String getValidDateStr() {
-		return validDateStr;
-	}
-
-	public void setValidDateStr(String validDateStr) {
-		this.validDateStr = validDateStr;
-	}
-
-	public Double getAverageDays() {
-		return averageDays;
-	}
-
-	public void setAverageDays(Double averageDays) {
-		this.averageDays = averageDays;
-	}
-
-	public Long getSubDays() {
-		return subDays;
-	}
-
-	public void setSubDays(Long subDays) {
-		this.subDays = subDays;
-	}
-	public TousseTournoverDaysStatisticsReportVo getDayBean(){
-		TousseTournoverDaysStatisticsReportVo vo = null;
-		try {
-			vo = this.clone();
-		} catch (CloneNotSupportedException e) {
-			vo = new TousseTournoverDaysStatisticsReportVo();
-		}
-		vo.setColumnName("周转天数");
-		return vo;
-	}
-	@Override
-	protected TousseTournoverDaysStatisticsReportVo clone() throws CloneNotSupportedException {
-		return (TousseTournoverDaysStatisticsReportVo)super.clone();
-	}
 }
Index: ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport_child.jrxml
===================================================================
diff -u
--- ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport_child.jrxml	(revision 0)
+++ ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport_child.jrxml	(revision 37005)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="400" pageHeight="802" columnWidth="400" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<field name="periodOfValidity" class="java.lang.String">
+		<fieldDescription><![CDATA[periodOfValidity]]></fieldDescription>
+	</field>
+	<field name="tousseAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[tousseAmount]]></fieldDescription>
+	</field>
+	<field name="averageDays" class="java.lang.String">
+		<fieldDescription><![CDATA[averageDays]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<detail>
+		<band height="33" splitType="Stretch">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="dbc743b7-1172-4a5f-ba72-d9b47373cdcf" stretchType="RelativeToBandHeight" x="0" y="0" width="200" height="33"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{periodOfValidity}]]></textFieldExpression>
+			</textField>
+			<textField pattern="#0" isBlankWhenNull="true">
+				<reportElement uuid="5c6203d7-c69f-4c80-a1de-56b92d87f3e5" stretchType="RelativeToBandHeight" x="200" y="0" width="100" height="33"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{tousseAmount}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="300" y="0" width="100" height="33"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{averageDays}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+</jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml
===================================================================
diff -u -r36324 -r37005
--- ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml	(.../tousseTournoverDaysStatisticsReport.jrxml)	(revision 36324)
+++ ssts-web/src/main/webapp/jasperRtp/tousseTournoverDaysStatisticsReport.jrxml	(.../tousseTournoverDaysStatisticsReport.jrxml)	(revision 37005)
@@ -1,316 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="monthReport" language="groovy" pageWidth="159" pageHeight="824" columnWidth="159" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="0b195264-631a-48d7-860e-601786ed4b22">
-	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
-	<style name="table">
-		<box>
-			<pen lineWidth="1.0" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
-		<box>
-			<pen lineWidth="0.5" lineColor="#000000"/>
-		</box>
-	</style>
-	<subDataset name="Table Dataset 1" uuid="559f627a-03c4-45be-9fc8-a07d3fb83984"/>
-	<parameter name="title" class="java.lang.String">
-		<parameterDescription><![CDATA[""]]></parameterDescription>
-	</parameter>
-	<parameter name="amountFormat" class="java.lang.String">
-		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
-	</parameter>
-	<parameter name="dateStr" class="java.lang.String">
-		<defaultValueExpression><![CDATA[dateStr]]></defaultValueExpression>
-	</parameter>
-	<queryString>
-		<![CDATA[]]>
-	</queryString>
-	<field name="rowNum" class="java.lang.String">
-		<fieldDescription><![CDATA[rowNum]]></fieldDescription>
-	</field>
-	<field name="columnNum" class="java.lang.String">
-		<fieldDescription><![CDATA[columnNum]]></fieldDescription>
-	</field>
-	<field name="columnName" class="java.lang.String">
-		<fieldDescription><![CDATA[columnName]]></fieldDescription>
-	</field>
-	<field name="validDateStr" class="java.lang.String">
-		<fieldDescription><![CDATA[validDateStr]]></fieldDescription>
-	</field>
-	<field name="amount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[amount]]></fieldDescription>
-	</field>
-	<field name="averageDays" class="java.lang.Double">
-		<fieldDescription><![CDATA[averageDays]]></fieldDescription>
-	</field>
-	<field name="columnTitle" class="java.lang.String">
-		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
-	</field>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
-	</field>
-	<background>
-		<band splitType="Stretch"/>
-	</background>
-	<title>
-		<band height="64" splitType="Stretch">
-			<textField isStretchWithOverflow="true">
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="240" height="34"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="34" width="159" height="30"/>
-				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="12" isBold="false"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$P{dateStr}]]></textFieldExpression>
-			</textField>
-		</band>
-	</title>
-	<summary>
-		<band height="127" splitType="Stretch">
-			<crosstab>
-				<reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="159" height="103"/>
-				<crosstabParameter name="amountFormatParam">
-					<parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabParameter name="parameter1">
-					<parameterValueExpression><![CDATA[$F{columnTitle}]]></parameterValueExpression>
-				</crosstabParameter>
-				<crosstabHeaderCell>
-					<cellContents>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="80" height="40" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font isBold="true"/>
-							</textElement>
-							<text><![CDATA[年度]]></text>
-						</staticText>
-						<staticText>
-							<reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="40" width="80" height="40" backcolor="#FFFFFF"/>
-							<textElement textAlignment="Center" verticalAlignment="Middle">
-								<font isBold="true"/>
-							</textElement>
-							<text><![CDATA[有效期]]></text>
-						</staticText>
-					</cellContents>
-				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{validDateStr}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<rowGroup name="validDateStr" width="80" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{validDateStr}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="80" height="25"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{validDateStr}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#BFE1FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
-				<columnGroup name="columnNum" height="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnNum}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#005FB3" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnTitle" height="40" totalPosition="End" headerPosition="Stretch">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<textField>
-								<reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="40"/>
-								<textElement verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnTitle}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<columnGroup name="columnName" height="40" headerPosition="Center">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
-					</bucket>
-					<crosstabColumnHeader>
-						<cellContents>
-							<textField>
-								<reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="40" backcolor="#FFFFFF"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
-							</textField>
-						</cellContents>
-					</crosstabColumnHeader>
-					<crosstabTotalColumnHeader>
-						<cellContents/>
-					</crosstabTotalColumnHeader>
-				</columnGroup>
-				<measure name="averageDaysMeasure" class="java.lang.Double" calculation="Sum">
-					<measureExpression><![CDATA[$F{averageDays}]]></measureExpression>
-				</measure>
-				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
-					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
-				</measure>
-				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
-				</measure>
-				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
-					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
-				</measure>
-				<crosstabCell width="79" height="25">
-					<cellContents>
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField isStretchWithOverflow="true" pattern="###0.0000">
-							<reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$V{columnName}.contains("包数")?$V{amountMeasure}:$V{averageDaysMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[$V{columnName}.contains("包数")?"###0":$P{amountFormatParam}]]></patternExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="25" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="79" height="0" rowTotalGroup="validDateStr">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="validDateStr" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="0" height="0" rowTotalGroup="validDateStr" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="validDateStr" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
-			</crosstab>
-		</band>
-	</summary>
-</jasperReport>
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="monthDetail_main_1" language="groovy" pageWidth="600" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="11526d02-b294-4d96-bde0-a51b05c04838"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String">
+		<defaultValueExpression><![CDATA["D:\\ireport\\"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="title" class="java.lang.String"/>
+	<parameter name="totalRate" class="java.lang.String"/>
+	<parameter name="totalEventCount" class="java.lang.Integer"/>
+	<field name="firstColumnName" class="java.lang.String">
+		<fieldDescription><![CDATA[firstColumnName]]></fieldDescription>
+	</field>
+	<field name="firstColumnDetaileds" class="java.util.List">
+		<fieldDescription><![CDATA[firstColumnDetaileds]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<columnHeader>
+		<band height="60" splitType="Stretch">
+			<staticText>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="500" y="27" width="100" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[周转天数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="400" y="27" width="100" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[包数]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="0" y="27" width="200" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[器械包名称]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="600" height="27"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="16" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" stretchType="RelativeToBandHeight" x="200" y="27" width="200" height="33" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[有效期]]></text>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band height="33" splitType="Stretch">
+			<subreport>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="200" y="0" width="400" height="33" isPrintWhenDetailOverflows="true"/>
+				<subreportParameter name="rootPath">
+					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
+				</subreportParameter>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{firstColumnDetaileds})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseTournoverDaysStatisticsReport_child.jasper"]]></subreportExpression>
+			</subreport>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="false">
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" positionType="Float" stretchType="RelativeToTallestObject" x="0" y="0" width="200" height="33" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{firstColumnName}]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<summary>
+		<band height="1">
+			<textField>
+				<reportElement uuid="f796cd98-8784-4d1e-a24e-b64be030ae0a" x="0" y="0" width="600" height="0"/>
+				<textElement/>
+			</textField>
+		</band>
+	</summary>
+</jasperReport>