Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp =================================================================== diff -u -r19566 -r24733 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 19566) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 24733) @@ -60,6 +60,7 @@ var DISINFECTION = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>'; var FOREIGNPROXY = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY%>'; var FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>'; +var FOREIGNSPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>'; var CUSTOM = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>'; Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r24732 -r24733 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24732) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24733) @@ -12369,7 +12369,7 @@ + ") ti where 1=1 %s %s group by ti.tousseType,ti.tousseName ", isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,taskGroupSqlWithAliasOfTousseDefinitionIsTd,tousseGroupSqlWithAliasOfTousseDefinitionIsTd,departCoding,startDateSql,endDateSql, isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,taskGroupSqlWithAliasOfTousseDefinitionIsTd,tousseGroupSqlWithAliasOfTousseDefinitionIsTd,departCoding,startDateSql,endDateSql, - getAndSql("ti.userName", operator),tousseTypeSqlWithAliasOfTousseDefinitionIsTd); + getAndSql("ti.userName", operator),tousseTypeSqlWithAliasOfTousseDefinitionIsTi); //清洗数量(按材料统计) sql += " union all "; @@ -12389,7 +12389,7 @@ + ") ti where 1=1 %s %s group by ti.tousseType,ti.tousseName ", isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,taskGroupSqlWithAliasOfTousseDefinitionIsTd,tousseGroupSqlWithAliasOfTousseDefinitionIsTd,departCoding,startDateSql,endDateSql, isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,taskGroupSqlWithAliasOfTousseDefinitionIsTd,tousseGroupSqlWithAliasOfTousseDefinitionIsTd,departCoding,startDateSql,endDateSql, - getAndSql("ti.userName", operator),tousseTypeSqlWithAliasOfTousseDefinitionIsTd); + getAndSql("ti.userName", operator),tousseTypeSqlWithAliasOfTousseDefinitionIsTi); //装配数量(按包统计) sql += " union all "; Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r21739 -r24733 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 21739) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 24733) @@ -50,7 +50,7 @@ */ var tousseTypeStore = new Ext.data.SimpleStore( { fields : ['value'], - data : [[ALL],[INSIDE],[DRESSING],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[CUSTOM]] + data : [[ALL],[INSIDE],[DRESSING],[DISINFECTION],[FOREIGNPROXY],[FOREIGN],[FOREIGNSPLIT],[CUSTOM]] }); //人员