Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r29857 -r29916 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 29857) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 29916) @@ -1118,5 +1118,9 @@ } return orgJson; } - + @Override + public String getDefaultSettleAccountDepartName(String orgUnitCode) { + JSONObject orgJson = getApplyDepartDefaultSettleDepartJSON(orgUnitCode); + return orgJson.optString("name"); + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r29839 -r29916 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 29839) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 29916) @@ -308,5 +308,11 @@ * @param orgUnitCode 申请科室编码 */ public JSONObject getApplyDepartDefaultSettleDepartJSON(String orgUnitCode); + /** + * 获取登录科室的结算科室名称 + * @param orgUnitCode + * @return + */ + public String getDefaultSettleAccountDepartName(String orgUnitCode); } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp =================================================================== diff -u -r29897 -r29916 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp (.../departmentMonthlyView.jsp) (revision 29897) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp (.../departmentMonthlyView.jsp) (revision 29916) @@ -29,10 +29,8 @@ if(SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM == supplyRoomType || SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM == supplyRoomType || SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY == supplyRoomType){ request.setAttribute("orgUnitName",orgUnitName); }else{ - SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getApplyDepartDefaultSettleDepart(orgUnitCoding); - if(supplyRoomConfig!=null){ - request.setAttribute("orgUnitName",supplyRoomConfig.getOrgUnitName()); - } + orgUnitName = supplyRoomConfigManager.getDefaultSettleAccountDepartName(orgUnitCoding); + request.setAttribute("orgUnitName",orgUnitName); } request.setAttribute("supplyRoomType",supplyRoomType); %>