Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r14167 -r14172 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14167) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 14172) @@ -2618,14 +2618,6 @@ // Thread.currentThread().getName() + ",准备批量装配器械包:" // + tousseName); - - //logger.debug("Thread " + Thread.currentThread().getName() + ",完成批量装配器械包:" + tousseName); - // 先创建PackingRecord - PackingRecord packingRecord = createPackingRecord(inspector, - operator, wrapper, orgUnitCoding, taskGroup, - sterilizerName, sterileFrequency, td, packingDate, - packingAmountForThisTask, currentPackingTask); - //对于器械包名称含有下划线的,将对参数进行特殊处理 if(tousseName.indexOf("_") != -1){ currentPackingTaskAsList.add(currentPackingTask); @@ -2635,7 +2627,15 @@ }else{ currentPackingTaskAsList = packingTasks; } + + //logger.debug("Thread " + Thread.currentThread().getName() + ",完成批量装配器械包:" + tousseName); + // 先创建PackingRecord + PackingRecord packingRecord = createPackingRecord(inspector, + operator, wrapper, orgUnitCoding, taskGroup, + sterilizerName, sterileFrequency, td, packingDate, + packingAmountForThisTask, currentPackingTask); + JSONObject result = batchCreateTousseInstance( operator, operatorCode, reviewer, reviewerCode, packageType,