Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
===================================================================
diff -u -r37737 -r37762
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java	(.../OperationTousseOperationRepartHelper.java)	(revision 37737)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java	(.../OperationTousseOperationRepartHelper.java)	(revision 37762)
@@ -970,7 +970,9 @@
 				+ ",lastInvoiceOpe.operationTime lastInvoiceOpeOperationTime,ur.enteringDate,ur.operator useRecordOperator "
 				+ ",(select count(*) from "
 				+ TousseOperation.class.getSimpleName() 
-				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货')) tousseOperationAmount "
+				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货')"
+				+ " and t.operationTime>=(select max(sri.time) from "+ StorageRecord.class.getSimpleName() +" sri where sri.tousseInstanceId=t.tousseInstanceId and sri.status='取出') "
+				+ ") tousseOperationAmount "
 				+ ",case when (lastManualOpe.nextOperationTime > lastManualOpe.nextOperationLimitTime "
 				+ "or (lastManualOpe.nextOperationTime is null and lastManualOpe.nextOperationLimitTime < "+ todaySql +")) "
 				+ "and ti.status in ('" + TousseInstance.STATUS_SHIPPED + "','" + TousseInstance.STATUS_SIGNED + "') "			
@@ -1012,7 +1014,9 @@
 				+ ",lastInvoiceOpe.operationTime lastInvoiceOpeOperationTime,ur.enteringDate,ur.operator useRecordOperator "
 				+ ",(select count(*) from "
 				+ TousseOperation.class.getSimpleName() 
-				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货')) tousseOperationAmount "
+				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货') "
+				+ " and t.operationTime>=(select max(sri.time) from "+ StorageRecord.class.getSimpleName() +" sri where sri.tousseInstanceId=t.tousseInstanceId and sri.status='取出') "
+				+ ") tousseOperationAmount "
 				+ ",case when (lastManualOpe.nextOperationTime > lastManualOpe.nextOperationLimitTime "
 				+ "or (lastManualOpe.nextOperationTime is null and lastManualOpe.nextOperationLimitTime < "+ todaySql +")) "
 				+ "and ti.status in ('" + TousseInstance.STATUS_SHIPPED + "','" + TousseInstance.STATUS_SIGNED + "') "			
@@ -1054,7 +1058,9 @@
 				+ ",lastInvoiceOpe.operationTime lastInvoiceOpeOperationTime,ur.enteringDate,ur.operator useRecordOperator "
 				+ ",(select count(*) from "
 				+ TousseOperation.class.getSimpleName() 
-				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货')) tousseOperationAmount "
+				+" t where t.tousseInstanceId=ti.id and t.operation in('回退','发货') "
+				+ " and t.operationTime>=(select max(sri.time) from "+ StorageRecord.class.getSimpleName() +" sri where sri.tousseInstanceId=t.tousseInstanceId and sri.status='取出') "
+				+ ") tousseOperationAmount "
 				+ ",case when (lastManualOpe.nextOperationTime > lastManualOpe.nextOperationLimitTime "
 				+ "or (lastManualOpe.nextOperationTime is null and lastManualOpe.nextOperationLimitTime < "+ todaySql +")) "
 				+ "and ti.status in ('" + TousseInstance.STATUS_SHIPPED + "','" + TousseInstance.STATUS_SIGNED + "') "			
@@ -1107,12 +1113,6 @@
 				}else{
 					vo.setNoOperationRecord(Constants.STR_NO);
 				}
-				int tousseOperationAmount = rs.getInt("tousseOperationAmount");
-				if(tousseOperationAmount < 1){
-					vo.setTousseOperationAmount("");
-				}else{
-					vo.setTousseOperationAmount(Integer.toString(tousseOperationAmount));
-				}
 				vo.setSender(rs.getString("sender"));
 				Date sendTime = rs.getTimestamp("sendTime");
 				if(sendTime != null){
@@ -1147,6 +1147,12 @@
 						vo.setLastInvoiceOpeOperationTime(df.format(lastInvoiceOpeOperationTime));
 					}
 					vo.setLastInvoiceOpeOperator(rs.getString("lastInvoiceOpeOperator"));
+					int tousseOperationAmount = rs.getInt("tousseOperationAmount");
+					if(tousseOperationAmount < 1){
+						vo.setTousseOperationAmount("");
+					}else{
+						vo.setTousseOperationAmount(Integer.toString(tousseOperationAmount));
+					}
 				}
 				vo.setUseRecordOperator(rs.getString("useRecordOperator"));
 				if(StringUtils.isNotBlank(vo.getUseRecordEnteringDate())){