Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js (.../sterilizationRecordInfoView.js) (revision 25250) @@ -114,6 +114,10 @@ var endDate = $Id('endDate').value; var sterilizerName = Ext.getCmp('sterilizerName').getValue(); var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } + var sendDepart = Ext.getCmp('sendDepart').getRawValue(); var frequency = Ext.getCmp('frequency').getValue(); var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWashReportChartView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWashReportChartView.js (.../yearWashReportChartView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWashReportChartView.js (.../yearWashReportChartView.js) (revision 25250) @@ -95,6 +95,9 @@ function reloadReport(){ var queryYear= $Id('monthSearch').value; var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.js (.../foreignTousseSterilizationMonitorAndDelivery.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.js (.../foreignTousseSterilizationMonitorAndDelivery.js) (revision 25250) @@ -18,6 +18,9 @@ var flag = $Id('flag').value; var deliverySituation = $Id('deliverySituation').value; var departCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.js (.../packingUnqualifieReportView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/packingUnqualifieReportView.js (.../packingUnqualifieReportView.js) (revision 25250) @@ -97,7 +97,9 @@ function reloadReport(){ var monthSearch= $Id('monthSearch').value; var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); - var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225 + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js (.../foreignTousseAfterUseDelivery.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.js (.../foreignTousseAfterUseDelivery.js) (revision 25250) @@ -17,6 +17,9 @@ return false; } var departCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/statisticalWorkloadView.js (.../statisticalWorkloadView.js) (revision 25250) @@ -203,18 +203,19 @@ } }] },{ - width : 250, + width : 220, layout : 'form', labelWidth : 70, //labelSeparator : '选择供应室:', items : [{//20181225 xtype : 'multiSelect', - fieldLabel : '选择供应室:', + fieldLabel : '选择供应室', id : 'querySupplyRoom', name : 'querySupplyRoom', valueField : 'departCode', displayField : 'name', minChars : 0, + listWidth : 260, allowBlank : true, editable : false, store : supplyRoomStore, Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationWorkloadReportView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationWorkloadReportView.js (.../sterilizationWorkloadReportView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationWorkloadReportView.js (.../sterilizationWorkloadReportView.js) (revision 25250) @@ -80,6 +80,9 @@ function reloadReport(){ var monthSearch= $Id('monthSearch').value; var departCoding= Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js (.../qualityMonitoringMonthView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js (.../qualityMonitoringMonthView.js) (revision 25250) @@ -96,6 +96,10 @@ function reloadReport(){ var departCoding = Ext.getCmp('querySupplyRoom').getValue(); var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } + var queryYear = $Id('monthSearch').value; // 监测项类型 var monitoringType = $Id('monitoringType').value; Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/apparatusInfusionisTypeView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/apparatusInfusionisTypeView.js (.../apparatusInfusionisTypeView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/apparatusInfusionisTypeView.js (.../apparatusInfusionisTypeView.js) (revision 25250) @@ -9,6 +9,9 @@ var endTime = $Id('endTime').value; var showDetail = $Id('showDetail').value; var departCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceAmountContrastChartView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceAmountContrastChartView.js (.../invoiceAmountContrastChartView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceAmountContrastChartView.js (.../invoiceAmountContrastChartView.js) (revision 25250) @@ -12,6 +12,9 @@ goodsName = goodsName.replace(/\%/g,'%25'); goodsName = goodsName.replace('#','%23'); var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225 + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } if(startMonth == "" || endMonth == ""){ showResult("请输入查询年月！"); return; Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.js (.../tousseDeliverStatisticsView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseDeliverStatisticsView.js (.../tousseDeliverStatisticsView.js) (revision 25250) @@ -15,6 +15,9 @@ var startTime= $Id('startTime').value; var endTime = $Id('endTime').value; var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225 + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r25235 -r25250 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25235) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25250) @@ -1717,8 +1717,6 @@ for (String queryDate : dateOfMonth) { String startDate = queryDate + " 00:00:00"; String endDate = queryDate + " 23:59:59"; - String supplyroomType = AcegiHelper.getLoginUser() - .getOrgUnitCodingFromSupplyRoomConfig(); // String sql = "select case d.tousseType when '外来器械拆分小包' then '外来器械包' else d.tousseType end,sum(case d.tousseType when '" + TousseDefinition.PACKAGE_TYPE_DISINFECTION + "' then t.statisticsAmount else 1 end) " // + "from TousseInstance t,TousseDefinition d where t.tousseDefinition_id = d.id and t.operationTime between " @@ -1729,7 +1727,7 @@ params.betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDate), dateQueryAdapter.dateAdapter(endDate)); - params.querySupplyRoom = supplyroomType; + params.querySupplyRoom = deptCode ; params.sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); // 取配包数量 @@ -1792,7 +1790,7 @@ + "where qi.id = fi.id and fi.formDefinition_id = fd.id and fd.id = qd.id " + " and qi.id=qmd.qualityMonitoringInstance_id and qd.responsibilitypart = '装配管理' " + "and fd.departcodes like '%"+deptCode+"%' " - + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", deptCode)+"' and fd.formType = '质量监测' and " + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", deptCode)+" and fd.formType = '质量监测' and " + " qi.datetime between " + dateQueryAdapter.dateAdapter(startDate) + " and " @@ -2052,7 +2050,7 @@ String monitoringSql = "select fd.formName,sum(qmd.amount) from QualityMonitoringInstance qi ,FormInstance fi," + "FormDefinition fd,QualityMonitoringDefinition qd,QualityMonitoringGoods qmd " + " where qi.id = fi.id and fi.formDefinition_id = fd.id and fd.id = qd.id " - + " and qi.id=qmd.qualityMonitoringInstance_id and fi.orgUnitCoding = '"+departCoding+"'" + + " and qi.id=qmd.qualityMonitoringInstance_id " + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", departCoding) + " and qd.responsibilitypart = '灭菌管理' and fd.formType = '质量监测' and fd.departcodes like '%"+departCoding+"%' " + " and qi.datetime between " + dateQueryAdapter.dateAdapter(startDate) @@ -2229,13 +2227,13 @@ queryMonth = queryYear + "-" + i; } String sql = String.format("select * from (select sum(washMaterialAmount) as wamount " - + "from washanddisinfectrecord w where %s like '%s%%' and w.orgUnitCoding = '%s')temp1," + + "from washanddisinfectrecord w where %s like '%s%%' %s)temp1," + "(select sum(qmd.amount)as amount from QualityMonitoringInstance qi,FormInstance fi,FormDefinition fd," + "QualityMonitoringDefinition qd ,QualityMonitoringGoods qmd where qi.id = fi.id and fi.formDefinition_id = fd.id " + " and qd.id = fd.id and qi.id=qmd.qualityMonitoringInstance_id " + " and fd.departCodes like '%%%s%%' and qd.responsibilitypart = '清洗消毒' and fd.formType = '质量监测' " - + " and %s like '%s%%' and fi.orgUnitCoding = '%s')temp2", dateQueryAdapter.dateConverAdapter("w.enddate","yyyy-mm"), - queryMonth,querySupplyRoom,querySupplyRoom,dateQueryAdapter.dateConverAdapter("qi.datetime","yyyy-mm"),queryMonth,querySupplyRoom); + + " and %s like '%s%%' %s)temp2", dateQueryAdapter.dateConverAdapter("w.enddate","yyyy-mm"), + queryMonth,SqlUtils.get_InSql_Extra("orgUnitCoding", querySupplyRoom),querySupplyRoom,dateQueryAdapter.dateConverAdapter("qi.datetime","yyyy-mm"),queryMonth,SqlUtils.get_InSql_Extra("fi.orgUnitCoding", querySupplyRoom) ); ResultSet rs = objectDao.executeSql(sql); Integer washAmount = 0; @@ -2350,11 +2348,11 @@ } else {//查所有的一次性物品 String startMonthSql = "where " + dateQueryAdapter.dateConverAdapter("po.invoice.sendTime", "yyyy-mm") + " = '" + startMonth + "' " - + "and po.invoice.orgUnitCoding = '" + departCoding + "' "; + + SqlUtils.get_InSql_Extra("po.invoice.orgUnitCoding", departCoding); String endMonthSql = "where " + dateQueryAdapter.dateConverAdapter("po.invoice.sendTime", "yyyy-mm") + " = '" + endMonth + "' " - + "and po.invoice.orgUnitCoding = '" + departCoding + "' "; + + SqlUtils.get_InSql_Extra("po.invoice.orgUnitCoding", departCoding); List startMonthGoodsItemList = objectDao .findBySql(DiposableGoodsItem.class.getSimpleName(), @@ -2440,9 +2438,9 @@ String endMonth, String departCoding, String goodsName) { goodsName = "3M环氧乙烷灭菌包内指示卡"; String startMonthSql = "where "+dateQueryAdapter.dateConverAdapter("po.invoice.sendTime","yyyy-mm")+" like '" - + startMonth + "%' and po.name = '" + goodsName + "' and po.invoice.orgUnitCoding='" + departCoding + "' "; + + startMonth + "%' and po.name = '" + goodsName + SqlUtils.get_InSql_Extra("po.invoice.orgUnitCoding", departCoding); String endMonthSql = "where "+dateQueryAdapter.dateConverAdapter("po.invoice.sendTime","yyyy-mm")+" like '" - + endMonth + "%' and po.name = '" + goodsName + "' and po.invoice.orgUnitCoding='" + departCoding + "' "; + + endMonth + "%' and po.name = '" + goodsName + SqlUtils.get_InSql_Extra("po.invoice.orgUnitCoding", departCoding); @SuppressWarnings("unchecked") List startMonthGoodsItemList = objectDao.findBySql( DiposableGoodsItem.class.getSimpleName(), startMonthSql); @@ -10552,15 +10550,15 @@ + " and ms.materialdefinition_id = m.id and i.itemType in ('"+ ClassifiedItem.TYPE_TOUSSE +"','"+ ClassifiedItem.TYPE_DISINFECTION_GOODS +"','"+ ClassifiedItem.TYPE_FOREIGN_TOUSSE +"','"+ ClassifiedItem.TYPE_CUSTOM_TOUSSE +"')" + "and r.enddate between " +dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + " and " + dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") - + " and r.orgUnitCoding = '" + querySupplyRoom+"'" + + SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom) + " group by i.itemType,i.orgUnitName,i.isSencondWashForForeignTousse " + " union all " + " select td.tousseType type,i.orgUnitName orgUnitName,i.isSencondWashForForeignTousse isSencondWashForForeignTousse,sum(i.amount) amount from washanddisinfectrecord r ,ClassifyBasket_WashRecord cw ,ClassifyBasket b," + " ClassifiedItem i,materialdefinition m,TousseDefinition td where r.id = cw.washanddisinfectrecord_id and cw.classifybasket_id = b.id" + " and i.tousseDefinitionID=td.id" + " and b.id = i.classifybasket_id and i.materialdefinition_id = m.id and r.enddate between " +dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + " and " +dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") - + " and r.orgUnitCoding = '" + querySupplyRoom+"'" + + SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom) + " group by td.tousseType,i.orgUnitName,i.isSencondWashForForeignTousse) t1" + " group by t1.type,t1.orgUnitName,t1.isSencondWashForForeignTousse"; Map amountMap = getWashWorkloadAmountMap(sql); @@ -10570,9 +10568,9 @@ + " where qi.id = fi.id and fi.formDefinition_id = fd.id and fd.id = qd.id " + " and qi.id=qmd.qualityMonitoringInstance_id " + " and fd.formName like '%器械清洗不合格%' and fd.formType = '质量监测'" - +" and qi.datetime between "+dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") - +" and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") - +" and fi.orgUnitCoding = '"+querySupplyRoom+"'"; + + " and qi.datetime between "+dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + + " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", querySupplyRoom); Integer unQualityAmount = getAmountBySql(unQualitySql); CrossTableBean ctBean = getCrossTableBean("普通器械",titleColumnNumMap,statDate,amountMap.get("普通器械"),null); @@ -12190,7 +12188,7 @@ sql +=" and t.sendtime between " + dateQueryAdapter.dateAdapter(startDay) + " and " + dateQueryAdapter.dateAdapter(endDay) - + " and t.orgUnitCoding='" + departCoding + "' "; + + SqlUtils.get_InSql_Extra("t.orgUnitCoding", departCoding); GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_APPARATUS, departCoding); Collection goodsNames = new ArrayList(); @@ -13579,25 +13577,30 @@ sql += "b.id = i.classifybasket_id and i.toussedefinition_id = t.id and t.id = ms.tousse_id and ms.materialdefinition_id = m.id "; sql += "and i.itemType='"+ ClassifiedItem.TYPE_TOUSSE +"' "; sql += "and r.enddate between " + dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + " and "; - sql += dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd")+ " and r.orgUnitCoding = '" + querySupplyRoom + "' group by i.id,m.type "; + sql += dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom) + " group by i.id,m.type "; sql += " union all "; sql += "select m.type as type,sum(i.amount) as amount from "; sql += "washanddisinfectrecord r ,ClassifyBasket_WashRecord cw ,ClassifyBasket b, ClassifiedItem i,materialdefinition "; sql += "m where r.id = cw.washanddisinfectrecord_id and cw.classifybasket_id = b.id and b.id = i.classifybasket_id and "; sql += "i.materialdefinition_id = m.id and r.enddate between " + dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd") + " and "; - sql += dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + " and r.orgUnitCoding = '" + querySupplyRoom + "' group by m.type"; + sql += dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd") + SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom) + " group by m.type"; sql += ") t1 group by t1.type"; + + String likeSql = ""; + if (StringUtils.isNotBlank(querySupplyRoom)){ + likeSql = "and fd.departcodes like '%" + querySupplyRoom + "%'"; + } String sql2 = "select qmd.material,sum(qmd.amount) as amount from QualityMonitoringInstance qi ,FormInstance fi,FormDefinition fd," + " QualityMonitoringDefinition qd,QualityMonitoringGoods qmd " + " where qi.id = fi.id and fi.formDefinition_id = fd.id and fd.id = qd.id " - + " and qi.id=qmd.qualityMonitoringInstance_id and fd.departcodes like '%" + querySupplyRoom + "%'"; + + " and qi.id=qmd.qualityMonitoringInstance_id " + likeSql; sql2 += " and qd.responsibilitypart = '清洗消毒' and fd.formType = '质量监测'"; sql2 += " and qi.datetime between "+dateQueryAdapter.dateConverAdapter2(statDate,"yyyy-mm-dd"); sql2 += " and "+dateQueryAdapter.dateConverAdapter2(endDate,"yyyy-mm-dd"); - sql2 += " and fi.orgUnitCoding = '"+querySupplyRoom+"'"; + sql2 += SqlUtils.get_InSql_Extra("fi.orgUnitCoding", querySupplyRoom); sql2 += " group by qmd.material "; ResultSet rs2 = objectDao.executeSql(sql2); @@ -13975,8 +13978,7 @@ List list = new ArrayList(); if (StringTools.isNotBlank(startTime) - && StringTools.isNotBlank(endTime) - && StringTools.isNotBlank(departCoding)) { + && StringTools.isNotBlank(endTime)) { String tempSql = ""; if (StringTools.isBlank(flag) @@ -14015,7 +14017,7 @@ + "left join UseRecord ur on ur.id=t.useRecord_id " + "where td.includeImplant = 0 " - + "and sr.orgUnitCoding='" + departCoding + "' " + + SqlUtils.get_InSql_Extra("sr.orgUnitCoding", departCoding) + "and sr.endDate " + betweenSql + tempSql + "order by sr.endDate desc" @@ -14132,7 +14134,7 @@ + "left join WashAndDisinfectRecord wr on wr.id=cw.WashAndDisinfectRecord_ID " + "where ci.isSencondWashForForeignTousse=1 " - + "and rr.orgUnitCoding='" + departCoding + "' " + + SqlUtils.get_InSql_Extra("rr.orgUnitCoding", departCoding) + "and " + betweenSql + "order by rr.id desc" ; @@ -14725,7 +14727,7 @@ if(StringUtils.isNotBlank(responsibilityType)){ resultNameList = getResultMameList(monitoringType,inspectItem,null,responsibilityType); sql = getQualityMonitoringInspectMonthByResponsibilityTypeSql(queryYear,monitoringType,responsibilityType); - }else if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ + }else if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(inspectItem)){ String startYear = queryYear + "-01-01 00:00:00"; String nextYear = dataIndex.getNextYear(queryYear) + " 00:00:00"; if(StringUtils.isBlank(inspectDetail)){ @@ -14738,7 +14740,7 @@ + " left join FormInstanceOptionValue fiov on fiItem.id = fiov.formInstanceItem_id " + " where fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and fiov.id is not null " + " and fiov.id = (select MIN(id) from FormInstanceOptionValue where formInstanceItem_id = fiItem.id) " + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear) @@ -14752,7 +14754,7 @@ + " left join FormInstanceOptionValue fiov on fiItem.id = fiov.formInstanceItem_id " + " where fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and fiov.id is null " + " and fdi.type != '" + FormDefinitionItem.TYPE_RADIO + "' " + " and fdi.type != '" + FormDefinitionItem.TYPE_CHECK + "' " @@ -14768,7 +14770,7 @@ + " and fiOption.formInstanceItem_id = fiItem.id and qmi.id=qmd.qualityMonitoringInstance_id " + " and fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and fdi.name = '" + inspectDetail + "'" + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear) + "and "+dateQueryAdapter.dateAdapter(nextYear) @@ -14813,7 +14815,7 @@ + " and qmi.id=qmd.qualityMonitoringInstance_id " + " and fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and (fiItem.id in (select formInstanceItem_id from FormInstanceOptionValue )) " + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startTime) + "and "+dateQueryAdapter.dateAdapter(endTime) @@ -14827,7 +14829,7 @@ + " and qmi.id=qmd.qualityMonitoringInstance_id " + " and fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and fdi.name = '" + inspectDetail + "'" + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startTime) + "and "+dateQueryAdapter.dateAdapter(endTime) @@ -14860,7 +14862,7 @@ List list = new ArrayList(); Map map = new HashMap(); try{ - if(StringUtils.isNotBlank(orgUnitCoding) && StringUtils.isNotBlank(queryYear)){ + if(StringUtils.isNotBlank(queryYear)){ Map> startAndEndDays = null; if ( "firstSecondHalfForm".equals(type) ) { startAndEndDays = getStartAndEndDay(queryYear, "split", null); @@ -14887,7 +14889,7 @@ + " and qmi.id=qmg.qualityMonitoringInstance_id " + " and qmd.responsibilityPart='" + responsibilityType + "' " + "and fd.formType='" + monitoringType + "'" - + " and fi.orgUnitCoding='" + orgUnitCoding + "' " + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay) + " and "+dateQueryAdapter.dateAdapter(endDay) + " group by fd.formName "; @@ -14901,7 +14903,7 @@ + " and fiItem.formDefinitionItem_id = fdi.id and qmi.id=qmg.qualityMonitoringInstance_id " + " and fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and (fiItem.id in (select formInstanceItem_id from FormInstanceOptionValue)) " + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay) + "and "+dateQueryAdapter.dateAdapter(endDay) @@ -14917,7 +14919,7 @@ + " and qmi.id=qmg.qualityMonitoringInstance_id " + " and fd.formName = '" + inspectItem + "'" + " and fd.formType = '" + monitoringType + "'" - + " and fi.orgUnitCoding = '"+ orgUnitCoding + "'" + + SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding) + " and fdi.name = '" + inspectDetail + "'" + " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay) + "and "+dateQueryAdapter.dateAdapter(endDay) @@ -20109,7 +20111,7 @@ String queryCondition = " where 1=1 "; queryCondition += " and " + dateQueryAdapter.dateAreaSql("alias.startDate", startDate + " 00:00:00", endDate + " 23:59:59"); if(StringUtils.isNotBlank(querySupplyRoom)){ - queryCondition += " and alias.orgUnitCoding='"+ querySupplyRoom +"'"; + queryCondition += SqlUtils.get_InSql_Extra("alias.orgUnitCoding", querySupplyRoom); } if(StringUtils.isNotBlank(rinserName)){ queryCondition += " and alias.rinserName='"+ rinserName +"'"; @@ -20190,7 +20192,8 @@ String querySql = "select dg.name,dg.specification,dg.unit,di.fluctuationPrice price,sum(di.amount) amount,sum(di.amount * di.fluctuationPrice) totalPrice from "+ Invoice.class.getSimpleName() +" i " + " join "+ DiposableGoodsItem.class.getSimpleName() +" di on i.id=di.id " + " join "+ DisposableGoods.class.getSimpleName() +" dg on dg.id=di.disposableGoodsID " - + " where i.orgUnitCoding='"+ orgUnitCoding +"' and " + dateQueryAdapter.dateAreaSql("i.sendTime", startDay + " 00:00:00", endDay + " 23:59:59") + + " where " + dateQueryAdapter.dateAreaSql("i.sendTime", startDay + " 00:00:00", endDay + " 23:59:59") + + SqlUtils.get_InSql_Extra("i.orgUnitCoding", orgUnitCoding) + " group by dg.name,dg.specification,dg.unit,di.fluctuationPrice"; rs = objectDao.executeSql(querySql); long sequence = 1; Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js (.../materialTypeWorkloadReportView.js) (revision 25250) @@ -97,6 +97,9 @@ function reloadReport(){ var monthSearch= $Id('monthSearch').value; var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washWorkloadReportView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/washWorkloadReportView.js (.../washWorkloadReportView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washWorkloadReportView.js (.../washWorkloadReportView.js) (revision 25250) @@ -98,6 +98,9 @@ function reloadReport(){ var monthSearch= $Id('monthSearch').value; var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r25231 -r25250 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 25231) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 25250) @@ -106,6 +106,7 @@ import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; +import com.forgon.tools.util.SqlUtils; /** * @author wangyi 2012-08-15 下午12:04 @@ -462,7 +463,7 @@ String queryYear = StrutsParamUtils.getPraramValue("queryYear", null); String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", - null); + ""); if (StringUtils.isNotBlank(queryYear)) { return jasperReportManager .getWashFractionDefectiveChart(queryYear,querySupplyRoom); @@ -496,8 +497,7 @@ String goodsName = StrutsParamUtils.getPraramValue("goodsName", null); if (StringUtils.isNotBlank(startMonth) - && StringUtils.isNotBlank(endMonth) - && StringUtils.isNotBlank(departCoding)) { + && StringUtils.isNotBlank(endMonth)) { return jasperReportManager.getAmountContrastBeanList(startMonth, endMonth, departCoding, goodsName); } @@ -512,7 +512,7 @@ } } else if (reportName.equals("workQualityCollection")) {// 工作质量持续收集统计报表 Map params = StrutsParamUtils.getParameters(); - String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", null); + String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", ""); String year = StrutsParamUtils.getPraramValue("year", null); String type = StrutsParamUtils.getPraramValue("type", null); if (year != null) { @@ -987,8 +987,7 @@ String isDisableIDCard = StrutsParamUtils.getPraramValue("isDisableIDCard", ""); String taskGroup = StrutsParamUtils.getPraramValue("taskGroup", ""); String tousseGroupName = StrutsParamUtils.getPraramValue("tousseGroupName", ""); - if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay) - && StringUtils.isNotBlank(departCoding)){ + if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){ return jasperReportManager.getTousseWorkLoadData(startDay,endDay,departCoding,tousseTypes,operator,isDisableIDCard,taskGroup,tousseGroupName); } }else if(reportName.equals("waitPackingTaskReport")){ //待装配任务工作表 @@ -1006,8 +1005,7 @@ String endDay = StrutsParamUtils.getPraramValue("endDay", ""); String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); String showDetail = StrutsParamUtils.getPraramValue("showDetail", ""); - if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay) - && StringUtils.isNotBlank(departCoding)){ + if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){ return jasperReportManager.getApparatusInfusionis( startDay, endDay, departCoding, showDetail); } @@ -1077,8 +1075,7 @@ String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); if (StringTools.isNotBlank(startTime) - && StringTools.isNotBlank(endTime) - && StringTools.isNotBlank(departCoding)) { + && StringTools.isNotBlank(endTime)) { return jasperReportManager .getForeignTousseSterilizationMonitorAndDeliveryVOList(startTime, endTime, departCoding, flag, deliverySituation); } @@ -1194,9 +1191,6 @@ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", ""); - if(StringUtils.isBlank(orgUnitCoding)){ - orgUnitCoding = AcegiHelper.getCurrentOrgUnitCode(); - } if (StringTools.isNotBlank(startDay) && StringTools.isNotBlank(endDay)) { List disposableGoodsInvoiceStatisticsData = jasperReportManager.getDisposableGoodsInvoiceStatistics(startDay, endDay, orgUnitCoding); return disposableGoodsInvoiceStatisticsData; @@ -2787,7 +2781,7 @@ // 器械包的供应室 if(StringUtils.isNotBlank(querySupplyRoom)){ - sql += " and ti.orgUnitCoding = '" + querySupplyRoom + "'"; + sql += SqlUtils.get_InSql_Extra("ti.orgUnitCoding", querySupplyRoom); } // 送货科室 if(StringUtils.isNotBlank(sendDepart)){ @@ -3605,7 +3599,7 @@ map.put("querySql", " and i.sendTime between " + dateQueryAdapter.dateAdapter(startDay +" 00:00:00") + " and " + dateQueryAdapter.dateAdapter(endDay) - + " and i.orgUnitCoding='" + departCoding + "' "); + + SqlUtils.get_InSql_Extra("i.orgUnitCoding", departCoding)); GoodsOption option = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_TOUSSEDELIVER, departCoding); Collection goodsNames = new ArrayList(); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.js (.../disposableGoodsDeliverStatisticsView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.js (.../disposableGoodsDeliverStatisticsView.js) (revision 25250) @@ -15,6 +15,9 @@ var startTime= $Id('startTime').value; var endTime = $Id('endTime').value; var departCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding.indexOf(ALL) == 0){ + departCoding = ""; + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.js =================================================================== diff -u -r25237 -r25250 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.js (.../washAndDisinfectRecordInfoView.js) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.js (.../washAndDisinfectRecordInfoView.js) (revision 25250) @@ -100,6 +100,10 @@ var endDate = $Id('endDate').value; var rinserName = Ext.getCmp('rinserName').getValue(); var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue(); + if(querySupplyRoom.indexOf(ALL) == 0){ + querySupplyRoom = ""; + } + var disinfectProgram = Ext.getCmp('disinfectProgram').getRawValue(); var tousseName = Ext.getCmp('tousseName').getValue();