Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r12932 -r12933 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 12932) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 12933) @@ -1161,9 +1161,9 @@ //设置处理科室 CssdServiceDepts cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_TOUSSE); if(cssdService != null){ - recyclingApplication.setHandleDepartCoding(cssdService.getClinicOrgUnitCode()); - recyclingApplication.setHandleDepart(cssdService.getClinicOrgUnitName()); - recyclingApplication.setHandleDepartId(cssdService.getClinicOrgUnitId() + ""); + recyclingApplication.setHandleDepartCoding(cssdService.getCssdOrgUnitCode()); + recyclingApplication.setHandleDepart(cssdService.getCssdOrgUnitName()); + recyclingApplication.setHandleDepartId(cssdService.getCssdOrgUnitId() + ""); } try { boolean checkRecyclingStatus = true; @@ -1208,9 +1208,9 @@ recyclingApplication.setApplicationTime(applicationCreateDate); CssdServiceDepts cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_TOUSSE); if(cssdService != null){ - recyclingApplication.setHandleDepartCoding(cssdService.getClinicOrgUnitCode()); - recyclingApplication.setHandleDepart(cssdService.getClinicOrgUnitName()); - recyclingApplication.setHandleDepartId(cssdService.getClinicOrgUnitId() + ""); + recyclingApplication.setHandleDepartCoding(cssdService.getCssdOrgUnitCode()); + recyclingApplication.setHandleDepart(cssdService.getCssdOrgUnitName()); + recyclingApplication.setHandleDepartId(cssdService.getCssdOrgUnitId() + ""); } if (remark != null) { recyclingApplication.setRemark(remark); @@ -3412,9 +3412,9 @@ //设置处理科室为器械包类型服务科室 CssdServiceDepts cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_TOUSSE); if(cssdService != null){ - recyclingApplication.setHandleDepartCoding(cssdService.getClinicOrgUnitCode()); - recyclingApplication.setHandleDepart(cssdService.getClinicOrgUnitName()); - recyclingApplication.setHandleDepartId(cssdService.getClinicOrgUnitId() + ""); + recyclingApplication.setHandleDepartCoding(cssdService.getCssdOrgUnitCode()); + recyclingApplication.setHandleDepart(cssdService.getCssdOrgUnitName()); + recyclingApplication.setHandleDepartId(cssdService.getCssdOrgUnitId() + ""); } recyclingApplication.setSettleAccountsDepart(depart); recyclingApplication.setOperationRoom(operationRoom); @@ -3439,9 +3439,9 @@ //一次性物品申请单,应该改为一次性物品类型的服务科室 cssdService = orgUnitManager.getCssdServiceDepts(departCoding, CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS); if(cssdService != null){ - recyclingApplication.setHandleDepartCoding(cssdService.getClinicOrgUnitCode()); - recyclingApplication.setHandleDepart(cssdService.getClinicOrgUnitName()); - recyclingApplication.setHandleDepartId(cssdService.getClinicOrgUnitId() + ""); + recyclingApplication.setHandleDepartCoding(cssdService.getCssdOrgUnitCode()); + recyclingApplication.setHandleDepart(cssdService.getCssdOrgUnitName()); + recyclingApplication.setHandleDepartId(cssdService.getCssdOrgUnitId() + ""); } for (Entry entry : diposableGoodMap.entrySet()) { TousseItem tousseItem = new TousseItem();