Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27559 -r27567 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27559) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27567) @@ -18808,15 +18808,22 @@ @Override public List getDisposableGoodsInvoiceStatistics( - String startDay, String endDay, String orgUnitCoding) { + String startDay, String endDay, String orgUnitCoding, String departCoding) { List list = null; ResultSet rs = null; try { + String departCodingSql = null; + if(StringUtils.isNotBlank(departCoding)){ + departCodingSql = " and departCoding='" + departCoding + "'"; + }else{ + departCodingSql = ""; + } 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 " + dateQueryAdapter.dateAreaSql("i.sendTime", startDay + " 00:00:00", endDay + " 23:59:59") + SqlUtils.get_InSql_Extra("i.orgUnitCoding", orgUnitCoding) + + departCodingSql + " 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/disposableGoodsDeliverStatisticsView.js =================================================================== diff -u -r25250 -r27567 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.js (.../disposableGoodsDeliverStatisticsView.js) (revision 25250) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.js (.../disposableGoodsDeliverStatisticsView.js) (revision 27567) @@ -14,10 +14,17 @@ var startTime= $Id('startTime').value; var endTime = $Id('endTime').value; - var departCoding = Ext.getCmp('querySupplyRoom').getValue(); - if(departCoding.indexOf(ALL) == 0){ - departCoding = ""; + var orgUnitCoding = Ext.getCmp('querySupplyRoom').getValue(); + if(orgUnitCoding.indexOf(ALL) == 0){ + orgUnitCoding = ""; } + var departSearch = Ext.getCmp('departSearch').getRawValue(); + var departCoding = null; + if(departSearch == ''){ + departCoding = ''; + }else{ + departCoding = Ext.getCmp('departCoding').getValue(); + } myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载，请稍候！', removeMask: true @@ -27,7 +34,8 @@ "?jasperreportName=disposableGoodsInvoiceStatistics.jasper&reportName=disposableGoodsInvoiceStatistics" + "&startDay=" + startTime + "&endDay=" + endTime + - "&orgUnitCoding=" + departCoding, + "&orgUnitCoding=" + orgUnitCoding + + "&departCoding=" + departCoding, 'thisIframe', '_self'); } @@ -43,7 +51,20 @@ var supplyRoomStore = new Ext.data.SimpleStore({ fields : ['departCode','name'] }); - + var departJsonStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + root : 'data' + },[ + {name : 'id',mapping : 'id'}, + {name : 'name',mapping : 'name'} + ] + ) + }); + departJsonStore.load(); var supplyRoomRemoteStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', @@ -142,6 +163,10 @@ width : 200, layout : 'form', items : [{ + xtype : 'hidden', + name : 'departCoding', + id : 'departCoding' + },{ xtype : 'datefield', fieldLabel : '开始日期', id : 'startTime', @@ -264,6 +289,32 @@ // } // }] // + },{ + width : 200, + layout : 'form', + items : [{ + xtype : 'combo', + id : 'departSearch', + name : 'departSearch', + queryParam : 'spell', + fieldLabel : '科室', + minChars : 0, + valueField : 'id', + displayField : 'name', + store : departJsonStore, + forceSelection : true, + lazyInit : true, + triggerAction : 'all', + hideTrigger : true, + typeAhead : false, + allowBlank : true, + anchor : '95%', + listeners:{ + select:function(combo, record, index){ + Ext.getCmp("departCoding").setValue(record.get('id')); + } + } + }] }] }], buttons:[{ @@ -315,6 +366,10 @@ var servertime = result.serverTime; Ext.getCmp('startTime').setValue(new Date(servertime)); Ext.getCmp('endTime').setValue(new Date(servertime)); + if(supplyRoomType != supplyRoomTypeFirstSupplyRoom && supplyRoomType != supplyRoomTypeSecondSupplyRoom && supplyRoomType != supplyRoomTypeExpensiveGoods){ + Ext.getCmp('departCoding').setValue(orgUnitCoding); + Ext.getCmp('departSearch').setValue(orgUnitName); + } reloadReport(); } }, Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js =================================================================== diff -u -r27499 -r27567 --- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27499) +++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27567) @@ -646,6 +646,7 @@ {hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DisposableGoodsDeliverReport,text:"一次性物品发放表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r27537 -r27567 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27537) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27567) @@ -1357,8 +1357,9 @@ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", ""); + String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); if (StringTools.isNotBlank(startDay) && StringTools.isNotBlank(endDay)) { - List disposableGoodsInvoiceStatisticsData = jasperReportManager.getDisposableGoodsInvoiceStatistics(startDay, endDay, orgUnitCoding); + List disposableGoodsInvoiceStatisticsData = jasperReportManager.getDisposableGoodsInvoiceStatistics(startDay, endDay, orgUnitCoding, departCoding); return disposableGoodsInvoiceStatisticsData; } }else if("biologicalMonitoringReport".equals(reportName)){//生物监测统计报表 Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp =================================================================== diff -u -r25237 -r27567 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp (.../disposableGoodsDeliverStatisticsView.jsp) (revision 25237) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/disposableGoodsDeliverStatisticsView.jsp (.../disposableGoodsDeliverStatisticsView.jsp) (revision 27567) @@ -1,5 +1,28 @@ <%@ page contentType="text/html; charset=UTF-8"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> +<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@ include file="/common/taglibs.jsp"%> +<% + SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); + String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); + String orgUnitName = AcegiHelper.getLoginUser().getOrgUnitNameCodingFromSupplyRoomConfig(); + int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding); + //是否高值耗材处理科室 + if(supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser()){ + supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY; + } + request.setAttribute("orgUnitName",orgUnitName); + request.setAttribute("orgUnitCoding",orgUnitCoding); + request.setAttribute("supplyRoomType",supplyRoomType); + %> + Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r27543 -r27567 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 27543) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 27567) @@ -889,9 +889,10 @@ * @param startDay 开始日期 * @param endDay 结束日期 * @param orgUnitCoding 发放的供应室编码 + * @param departCoding 收货科室编码 * @return */ - public List getDisposableGoodsInvoiceStatistics(String startDay,String endDay, String orgUnitCoding); + public List getDisposableGoodsInvoiceStatistics(String startDay,String endDay, String orgUnitCoding, String departCoding); public double addMonitoringDataToList(String departCoding, List returnList,