Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r21059 -r23582 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 21059) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 23582) @@ -422,8 +422,8 @@ items : reportForm }] }); - - if(supplyRoomType == 1 || supplyRoomType == "1" || supplyRoomType == 2 || supplyRoomType == "2"){ + + if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom || supplyRoomType == supplyRoomTypeExpensiveGoods){ departJsonStore.load(); }else{ Ext.getCmp('departCoding').setValue(orgUnitCoding); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r23164 -r23582 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 23164) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 23582) @@ -219,6 +219,22 @@ public EighteenQuotaBean getPackObturationDefective(String queryYear,String departCoding); + /** + * 查询明细核算月报数据 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param depart 科室名称 + * @param departCoding 科室编码 + * @param type 类型 + * @param goodsName 物品名称 + * @param batch 批次号 + * @param searchType + * @param disinfection + * @param disposableGoodsType + * @param goodsType + * @param showCustonTousseAmount + * @return + */ public List getDepartmentMonthDetailList( String startTime,String endTime, String depart,String departCoding,String type, String goodsName, String batch,String searchType,boolean disinfection,String disposableGoodsType,String goodsType,Boolean showCustonTousseAmount); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp =================================================================== diff -u -r17503 -r23582 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp (.../departmentMonthlyDetailDSInvoiceItemView.jsp) (revision 17503) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp (.../departmentMonthlyDetailDSInvoiceItemView.jsp) (revision 23582) @@ -1,4 +1,5 @@ <%@ 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"%> @@ -9,14 +10,20 @@ 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); - %>