Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27871 -r27874 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27871) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27874) @@ -6438,6 +6438,9 @@ if (StringUtils.isNotBlank(batchNumber)) { sql += " and m.batch = '" + batchNumber + "'"; } + if(StringUtils.isNotBlank(handleDeptCode)){ + sql += " and ( m.orgUnitCoding='"+ handleDeptCode +"' or m.departCoding='" + handleDeptCode + "')"; + } //“科室分组”的过滤 if (StringUtils.isNotBlank(invoiceDepartGroup) && !"all".equals(invoiceDepartGroup)) { String[] invoiceDepartGroupArr = invoiceDepartGroup.split(";"); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js =================================================================== diff -u -r27662 -r27874 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 27662) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 27874) @@ -176,7 +176,9 @@ fields : ['value'], data : [ ['全部'],['一次性物品'],['器械']] }); - + var dt = new Date(); + startTime = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate() + " 00:00"; + endTime = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate() + " 23:59"; var summaryTypeStore = new Ext.data.SimpleStore( { fields : ['value'], data : [ ['发货汇总'],['发货明细']] @@ -210,7 +212,7 @@ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', allowBlank : true, readOnly : false, - value: new Date(), + value: new Date(startTime), anchor : '95%' }] }, { @@ -227,7 +229,7 @@ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', format:'Y-m-d H:i', allowBlank : true, - value: new Date(), + value: new Date(endTime), anchor : '95%' }] },{