Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r32961 -r33040
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 32961)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 33040)
@@ -971,14 +971,14 @@
 			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(%s) amount ,ti.sterilizationUser userName "
-								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
+								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id "
 								+ " %s where ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s "
 								+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null %s %s %s %s "
 								+ "group by ti.sterilizationUser",
 								amountColumnSql,
 								joinMaterialInstanceSql,
 								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
+								SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom),
 								obj.sqlLengthFunctionName,
 								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
 								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
@@ -991,14 +991,14 @@
 				}
 				amountSql += String
 						.format("select sum(%s) amount ,ti.sterilizationUser userName "
-								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
+								+ "from TousseInstance ti join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
 								+ " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseDefinitionId is not null and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s "
 								+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 and ti.sterilizationRecord_id is not null %s %s %s "
 								+ "group by ti.sterilizationUser",
 								amountColumnSql,
 								joinMaterialInstanceSql,
 								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
+								SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom),
 								obj.sqlLengthFunctionName,
 								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
 								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replace("td", "ti"),
@@ -1642,7 +1642,7 @@
 			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select %s count(*) amount %s %s %s %s "
-								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id %s "
+								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id %s "
 								+ "where ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s %s and %s %s %s "
 								+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 "
 								+ "and ti.sterilizationRecord_id is not null %s %s %s %s %s "
@@ -1654,7 +1654,7 @@
 								obj.extraSelectColumns,
 								obj.extraJoinCondition,
 								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
+								SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom),
 								SqlUtils.get_InSql_Extra("ti.depart", obj.applicationDepart),
 								SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "),
 								obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd,
@@ -1673,7 +1673,7 @@
 				}
 				amountSql += String
 						.format("select %s count(*) amount %s %s %s %s "
-								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id %s "
+								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join SterilizationRecord sr on sr.id=ti.sterilizationRecord_id %s "
 								+ "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is not null and " + dateQueryAdapter.stringFieldToDate("ti.sterileEndTime") + " %s %s %s and %s %s %s "
 								+ "and ti.sterilizationUser is not null and %s(ti.sterilizationUser)<>0 "
 								+ "and ti.sterilizationRecord_id is not null %s %s %s %s "
@@ -1685,7 +1685,7 @@
 								obj.extraSelectColumns,
 								obj.extraJoinCondition,
 								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
+								SqlUtils.get_InSql_Extra("sr.orgUnitCoding", obj.querySupplyRoom),
 								SqlUtils.get_InSql_Extra("ti.depart", obj.applicationDepart),
 								SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "),
 								obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd,