Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js =================================================================== diff -u -r27407 -r28265 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js (.../urgentNeedGoodsProcessingCycleView.js) (revision 27407) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js (.../urgentNeedGoodsProcessingCycleView.js) (revision 28265) @@ -11,7 +11,11 @@ showResult('请正确填写表单各值'); return false; } - + var departCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(departCoding == null || departCoding == ""){ + showResult("请选择供应室。"); + return false; + } var startTime = $Id('startTime').value; var endTime = $Id('endTime').value; var tousseId = Ext.getCmp('tousse').getValue(); @@ -29,6 +33,7 @@ startTime : startTime, endTime : endTime, tousseName : tousseName, + departCoding : departCoding, reportName:'urgentNeedGoodsProcessingCycle' } @@ -41,8 +46,66 @@ var dt = new Date(); var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01"; + var supplyRoomRecord = Ext.data.Record.create([ + {name: 'departCode', type: 'string'}, + {name: 'name', type: 'string'} + ]); + var supplyRoomStore = new Ext.data.SimpleStore({ + fields : ['departCode','name'] + }); - + var supplyRoomRemoteStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', + method : 'POST' + }), + baseParams :{type:"12"}, + // reader : rd, + reader : new Ext.data.JsonReader({ + fields : [ + {name : 'id', mapping : 'id'}, + {name : 'departCode', mapping : 'departId'}, + {name : 'name', mapping : 'name'} + ] + }), + listeners:{ + beforeload : function(){ + loadMask = new Ext.LoadMask(Ext.getBody(), { + msg: '正在加载供应室...，请稍候！',removeMask: true + }); + loadMask.show(); + }, + load :function (thiz,records,options ){ + loadMask.hide(); + var currentOrgUnitIsSupplyRoom = false; + if(records && records.length > 0){ + for (var i = 0; i < records.length; i++) { + var supplyRoomData = records[i].data; + var departCodeTemp = supplyRoomData.departCode; + //如果没有查看其它供应室权限时,只显示是当前用户的科室 + if(SSTS_View_All_Supply_Room_Report){ + if(departCodeTemp == currentOrgUnitCoding){ + supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name})); + currentOrgUnitIsSupplyRoom = true; + } + }else{ + supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name})); + if(departCodeTemp == currentOrgUnitCoding){ + currentOrgUnitIsSupplyRoom = true; + } + } + } + } + if(supplyRoomStore.getCount() > 1){ + supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL})); + } + //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) + if(currentOrgUnitIsSupplyRoom){ + Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding); + } + } + } + }); //“器械包combo”的数据储存器 var tousseStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ @@ -117,6 +180,59 @@ minChars : 0, anchor : '95%' }] + },{ + width : 250, + layout : 'form', + labelWidth : 80, + labelSeparator : '选择供应室:', + items : [{ + xtype : 'multiSelect', + id : 'querySupplyRoom', + name : 'querySupplyRoom', + valueField : 'departCode', + displayField : 'name', + minChars : 0, + allowBlank : true, + editable : false, + store : supplyRoomStore, + forceSelection : false, + mode : 'local', + triggerAction : 'all', + lazyInit : true, + typeAhead : false, + anchor : '95%', + listeners: { + select: function (combo, record, index) { + //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择 + if (record.get('departCode') == ALL) { + if (record.get('checked')) { + combo.selectAll(); + } else { + combo.deselectAll(); + } + } + + //2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择 + var selectAll = true; + combo.store.each(function(record) { + if (record.get('departCode') != ALL && !record.get(this.checkField)) { + selectAll = false; + return; + } + }, combo); + + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + combo.setValue(combo.getCheckedValue()); + } + } + + + }] }] }], buttons:[{ @@ -158,5 +274,5 @@ items : reportForm }] }); - + supplyRoomRemoteStore.load(); }); \ No newline at end of file Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r27889 -r28265 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 27889) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 28265) @@ -752,10 +752,11 @@ * @param startTime 开始时间格式如：2017-01-01 * @param endTime 结束时间格式如：2017-01-01 * @param tousseName 指定想要查询的器械包名称，如果不指定则查询全部器械包 + * @param departCoding 供应室编码 * @return */ public List getUrgentNeedGoodsProcessingCycleData(String startTime, - String endTime, String tousseName); + String endTime, String tousseName, String departCoding); /** * 获取手术仪器追溯查询报表的数据 * @param barcode 器械包条码或者标识牌条码 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r28097 -r28265 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28097) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28265) @@ -1386,8 +1386,9 @@ String startTime = StrutsParamUtils.getPraramValue("startTime", ""); String endTime = StrutsParamUtils.getPraramValue("endTime", ""); String tousseName = StrutsParamUtils.getPraramValue("tousseName", ""); + String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { - return jasperReportManager.getUrgentNeedGoodsProcessingCycleData(startTime, endTime, tousseName); + return jasperReportManager.getUrgentNeedGoodsProcessingCycleData(startTime, endTime, tousseName, departCoding); } }else if ("materialMissItemView".equals(reportName)) {//器械丢失明细统计报表 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp =================================================================== diff -u -r18094 -r28265 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp (.../urgentNeedGoodsProcessingCycleView.jsp) (revision 18094) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp (.../urgentNeedGoodsProcessingCycleView.jsp) (revision 28265) @@ -22,5 +22,18 @@ + + + + \ No newline at end of file Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28065 -r28265 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28065) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28265) @@ -17012,7 +17012,7 @@ @Override public List getUrgentNeedGoodsProcessingCycleData( - String startTime, String endTime, String tousseName) { + String startTime, String endTime, String tousseName, String departCoding) { List list = new ArrayList(); if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { String betweenSql = "and " + dateQueryAdapter.dateAreaSql("temp.回收时间", startTime, endTime, true); @@ -17021,11 +17021,20 @@ if (StringTools.isNotBlank(tousseName)) { tousseNameSql += String.format("and temp.物品名称='%s'", tousseName); } - + String whereSqlForOrgUnitCoding = null; + if(StringUtils.isNotBlank(departCoding) && !departCoding.contains("全部")){ + if(!departCoding.contains(",")){ + whereSqlForOrgUnitCoding = " and temp.orgUnitCoding = '"+ departCoding +"'"; + }else{ + whereSqlForOrgUnitCoding = " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("temp.orgUnitCoding", SqlUtils.splitStringToSet(departCoding, ",")); + } + }else{ + whereSqlForOrgUnitCoding = ""; + } String sql = "select * from (" + //--1.使用记录转申请单后的预回收、回收、清洗交接、装配（全部装配+部分装配） - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17045,7 +17054,7 @@ "union all " + //--2.使用记录转申请单后的预回收、回收、清洗交接 (排除装配的包实例数据) //--2.1 使用记录转申请单后的预回收、回收、清洗交接但还未装配的数据 - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17061,7 +17070,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--2.2使用记录转申请单后的预回收、回收、清洗交接、已经开始装配但未完全装配完的未装配部分的数据 - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17078,7 +17087,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--3.使用记录转申请单后的预回收、回收、装配 (排除清洗交接的数据)（全部装配+部分装配） - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17097,7 +17106,7 @@ "union all " + //--4.使用记录转申请单后的预回收、回收 (排除清洗交接与装配的包实例数据) //--4.1 使用记录转申请单后的预回收、回收、且未装配 - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17112,7 +17121,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--4.2 使用记录转申请单后的预回收、回收、已经开始装配但未完全装配完的未装配部分的数据 - "select ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,ttr.transitionTime '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17128,7 +17137,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--5.使用记录转申请单后的回收、清洗交接、装配 (排除预回收数据)（全部装配+部分装配） - "select null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17147,7 +17156,7 @@ "union all " + //--6.使用记录转申请单后的回收、清洗交接 (排除预回收与装配的包实例数据) //--6.1 使用记录转申请单后的回收、清洗交接、且未装配 - "select null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17162,7 +17171,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--6.2 使用记录转申请单后的回收、清洗交接、已经开始装配但未完全装配完的未装配部分的数据 - "select null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',wtr.transitionTime '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17178,7 +17187,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--7.使用记录转申请单后的回收、装配 (排除预回收与清洗交接数据)（全部装配+部分装配） - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17196,7 +17205,7 @@ "union all " + //--8.使用记录转申请单后的回收 (排除预回收、清洗交接与装配的包实例数据) //--8.1使用记录转申请单后的回收、查询未装配的数据 - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17210,7 +17219,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--8.2.使用记录转申请单后的回收、查询有装配但未装完的未装配部分的数据 - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17225,7 +17234,7 @@ "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--9.手工添加回收(或添加申请单后的回收)后的回收、装配 (排除预回收数据、手工添加的不会做预回收,清洗交接没有意义) - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',tit2.operationTime '装配时间',sr.startDate '灭菌开始时间',sr.endDate '灭菌结束时间',tit2.invoiceSendTime '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',sz.ownGroup '灭菌方式',b2.barcode '器械包条码',tit2.idCardInstanceBarcode '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17240,7 +17249,7 @@ "union all " + //--10.手工添加回收(或添加申请单后的回收)后的回收 (排除预回收、装配的包实例数据、手工添加的不会做预回收,清洗交接没有意义)（全部装配+部分装配） //--10.1.手工添加回收(或添加申请单后的回收)后的回收，未装配的数据 - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17250,7 +17259,7 @@ "and ri.id not in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + "union all " + //--10.2.手工添加回收(或添加申请单后的回收)后的回收，查询有装配但未装完的未装配部分的数据（） - "select null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + + "select rr.orgUnitCoding,null '预回收时间',rr.recyclingTime '回收时间',null '清洗交接时间',null '装配时间',null '灭菌开始时间',null '灭菌结束时间',null '发货时间'," + "ri.tousseName '物品名称',ri.urgentLevel '加急类型',null '灭菌方式',null '器械包条码',null '标识牌条码' " + "from RecyclingRecord rr " + "join RecyclingItem ri on ri.recyclingRecord_id=rr.id " + @@ -17259,7 +17268,7 @@ "where ri.urgentAmount > 0 " + "and ti.id not in (select tousseItemId from TousseInstance where tousseItemId is not null) " + "and ri.id in (select sourceRecyclingItemId from TousseInstance where sourceRecyclingItemId is not null) " + - ") temp where 1=1 " + betweenSql + tousseNameSql + " order by temp.回收时间" + ") temp where 1=1 " + betweenSql + tousseNameSql + whereSqlForOrgUnitCoding + " order by temp.回收时间" ; ResultSet result = objectDao.executeSql(sql); try {