Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r21502 -r21528 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21502) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 21528) @@ -789,7 +789,14 @@ return null; } - // 获取质量监测查询的sql，根据监测项的名称，查询登记的质量监测的记录的条数 + /** + * 获取质量监测查询的sql，根据监测项的名称，查询登记的质量监测的记录的条数 + * @param departCoding + * @param queryYear + * @param nextYear + * @param inspectItemName + * @return + */ private String getQualityMonitoringRecordsCountSql(String departCoding, String queryYear, String nextYear, String inspectItemName) { String sql = "select t.datetime,sum(t.amount) from (select "+dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm")+" as datetime," @@ -12347,9 +12354,10 @@ 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) " + "%s group by td.tousseType,t.tousseName having(td.tousseType %s) ", isDisableIDCardSql,taskGroupSql,tousseGroupSql, - departCoding,startDateSql,endDateSql,getAndSql("t.reviewer", operator),tousseTypeSql); + departCoding,startDateSql,endDateSql,Constants.STR_YES,getAndSql("t.reviewer", operator),tousseTypeSql); if (includeForeignTousse) { sql += " union all "; sql += String.format("select 'review' as type,fta.tousseName,count(*),'外来器械包' from TousseInstance t,ForeignTousseApplication fta " Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r21412 -r21528 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 21412) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 21528) @@ -251,15 +251,6 @@ String rootPath = StrutsParamUtils.getRequest().getSession() .getServletContext().getRealPath(""); String realPath = rootPath + "\\jasperRtp\\" + jasperreportName;// 报表文件workload.jasper路径 -// if (StringUtils.equals("workQualityCollection.jasper", jasperreportName)) { -// if (StringUtils.equals(parameters.get("type"),"split")) { -// realPath = rootPath -// + "\\jasperRtp\\workQualityCollection2.jasper"; -// } else if (StringUtils.equals(parameters.get("type"),"compareToLastYear")) { -// realPath = rootPath -// + "\\jasperRtp\\workQualityCollection3.jasper"; -// } -// } return realPath; } @@ -2161,8 +2152,8 @@ public List getQuotaDataSource(String queryYear,String departCoding) { List list = new ArrayList(); - // 清洗器械不合格率 if (StringUtils.isNotBlank(queryYear)) { + // 器械清洗不合格率 EighteenQuotaBean bean = jasperReportManager .getYearWashWorkLoad(queryYear,departCoding); // 灭菌方式选择不正确发生次数 Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r21472 -r21528 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 21472) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 21528) @@ -191,6 +191,19 @@ } /** + * 设置“审核是否算工作量”属性（如果是否审核的值为“是”，则启用之并且设置为“是”，如果是否审核的值为“否”，则禁用之并且设置为“否”） + */ +function setStatisticsReviewWorkload() { + if (top.Ext.getCmp('isReview').getRawValue() == '是') { + top.Ext.getCmp('statisticsReviewWorkload').setValue("是"); + top.Ext.getCmp('statisticsReviewWorkload').enable(); + } else { + top.Ext.getCmp('statisticsReviewWorkload').setValue("否"); + top.Ext.getCmp('statisticsReviewWorkload').disable(); + } +} + +/** * 设置标识牌信息页面的“标识牌标签”属性 * @returns */ @@ -1259,6 +1272,7 @@ top.Ext.getCmp('isReview').enable(); top.Ext.getCmp('autoOutStockForPacking').enable(); } + setStatisticsReviewWorkload(); } } }] @@ -1304,6 +1318,7 @@ top.Ext.getCmp('isPrintOrg').enable(); top.Ext.getCmp('printOrgSource').enable(); } + setStatisticsReviewWorkload(); } } }] @@ -1403,6 +1418,7 @@ top.Ext.getCmp('isReview').setValue("否"); top.Ext.getCmp('isReview').disable(); } + setStatisticsReviewWorkload(); } } @@ -1435,13 +1451,38 @@ }else{ setFieldsHide(false); } + setStatisticsReviewWorkload(); } } }] },{ columnWidth : .25, layout : 'form', + labelWidth : fontSize == 12 ? 120 : 160, + items:[{ + xtype : 'combo', + fieldLabel : '审核是否算工作量', + id : 'statisticsReviewWorkload', + name : 'statisticsReviewWorkload', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore({ + fields : [ 'value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + mode : 'local', + value : '是', + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + + }] + },{ + columnWidth : .25, + layout : 'form', labelWidth : fontSize == 12 ? 90 : 100, labelAlign:"right", items:[{ @@ -1987,6 +2028,7 @@ top.Ext.getCmp('isTraceable').enable(); setFieldsHide(false); } + setStatisticsReviewWorkload(); } } }] @@ -2322,6 +2364,7 @@ top.Ext.getCmp('isRecycling').disable(); //禁用“是否回收”下拉框，并默认赋值为“否” top.Ext.getCmp('isRecycling').setValue('否'); } + setStatisticsReviewWorkload(); setMaterialCountAndMaterialType(materialsPanel); } }); @@ -2490,6 +2533,7 @@ top.Ext.getCmp('isPrint').enable(); top.Ext.getCmp('isTraceable').enable(); top.Ext.getCmp('isReview').enable(); + top.Ext.getCmp('statisticsReviewWorkload').enable(); top.Ext.getCmp('isApplyEntireTousse').enable(); //启用“是否整包申请”下拉框 top.Ext.getCmp('isRecycling').enable(); //启用“是否回收”下拉框 top.Ext.getCmp('isSterile').enable(); //启用“是否灭菌”下拉框 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r21480 -r21528 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 21480) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 21528) @@ -399,6 +399,10 @@ */ private Integer intoBasketMaxAmount; /** + * 审核是否算工作量 + */ + private String statisticsReviewWorkload; + /** * 是否停用 */ private String isDisable = STR_NO; @@ -776,6 +780,14 @@ public void setIsTraceable(String isTraceable) { this.isTraceable = isTraceable; } + public String getStatisticsReviewWorkload() { + return statisticsReviewWorkload; + } + + public void setStatisticsReviewWorkload(String statisticsReviewWorkload) { + this.statisticsReviewWorkload = statisticsReviewWorkload; + } + /** * 判断是否可追溯 * @return 可追溯返回tru,不可追溯返回false