Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r40938 -r40939 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40938) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40939) @@ -1720,12 +1720,19 @@ if(methodOfSplitRecyclingApplication == 0){ save(record, rc); }else{ - JSONObject jsonParamObject = rc.getJsonParamObject(); - //拆分回收的物品 - rc.setRecyclingApplicationId(params.optString("recyclingApplicationId")); - jsonParamObject.put("splitTousseJson", params.optJSONArray("splitTousseJson")); - // 保存并根据科室拆分回收记录(PYQZYY-173 多手术室器械包流转功能改造) - saveAndSplitRecyclingRecord(rc, record); + JSONArray splitJsonArray = params.optJSONArray("splitTousseJson"); + if((splitJsonArray != null && splitJsonArray.size() > 0)){ + JSONObject jsonParamObject = rc.getJsonParamObject(); + //拆分回收的物品 + rc.setRecyclingApplicationId(params.optString("recyclingApplicationId")); + jsonParamObject.put("splitTousseJson", splitJsonArray); + // 保存并根据科室拆分回收记录(PYQZYY-173 多手术室器械包流转功能改造) + rc.setDepart(record.getDepart()); + rc.setDepartCode((record.getDepartCode())); + saveAndSplitRecyclingRecord(rc, record); + }else{ + save(record, rc); + } } } @@ -10398,11 +10405,7 @@ tempRecyclingContext.setDepartCode(ou == null ? "" : ou.getOrgUnitCoding()); } //不拆分回收 - if(recyclingRecord != null){ - this.save(recyclingRecord, recyclingContext); - }else{ - this.save(recyclingContext); - } + this.save(tempRecyclingContext); } } else { //不拆分回收