Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r21528 -r21538 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21528) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21538) @@ -12354,7 +12354,7 @@ sql += " union all "; sql += String.format("select 'review' as type,t.tousseName,count(*),td.tousseType from TousseInstance t,TousseDefinition td " +" where t.tousseDefinition_id=td.id %s %s %s and t.orgUnitCoding = '%s' and t.reviewTime between %s and %s and t.foreignTousseApp_id is null " - + "and (td.statisticsReviewWorkload='%s' or td.statisticsReviewWorkload is null) " + + "and (td.statisticsReviewWorkload='%s' or td.statisticsReviewWorkload is null or td.statisticsReviewWorkload='') " + "%s group by td.tousseType,t.tousseName having(td.tousseType %s) ", isDisableIDCardSql,taskGroupSql,tousseGroupSql, departCoding,startDateSql,endDateSql,Constants.STR_YES,getAndSql("t.reviewer", operator),tousseTypeSql); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r21532 -r21538 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 21532) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 21538) @@ -2368,6 +2368,10 @@ if (top.Ext.getCmp('isReview').getRawValue() == '否') { top.Ext.getCmp('statisticsReviewWorkload').setValue("否"); top.Ext.getCmp('statisticsReviewWorkload').disable(); + } else { + if (!tousseDefinition.statisticsReviewWorkload || tousseDefinition.statisticsReviewWorkload == 'null') { + top.Ext.getCmp('statisticsReviewWorkload').setValue("是"); + } } } });