Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r13474 -r13475 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13474) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 13475) @@ -1051,6 +1051,15 @@ if(application != null){ List applicationItemList = application .getApplicationItems(); + //回收申请单修改科室名称 + if (InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(application + .getType()) && !application.getDepartCoding().equals( + record.getDepartCode())) { + application.setDepartCoding(record.getDepartCode()); + application.setDepart(record.getDepart()); + application.setSettleAccountsDepart(record.getDepart()); + application.setSettleAccountsDepartCoding(record.getDepartCode()); + } Map appTousseItemMap = new HashMap(); if(applicationItemList != null){ for (TousseItem tousseItem : applicationItemList) { Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r13461 -r13475 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13461) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13475) @@ -418,7 +418,7 @@ recyclingRecord.setStatus(RecyclingRecord.STATUS_SAVED); String paramStr = StrutsParamUtils.getPraramValue("jsonParam", ""); - System.out.println("---------》" + paramStr); +// System.out.println("---------》" + paramStr); JSONObject params = JSONObject.fromObject(paramStr); try { recyclingRecordManager.saveOrUpdate(recyclingRecord,params);