Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r25173 -r25209 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25173) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25209) @@ -4749,6 +4749,12 @@ tousseInstance.setSterilizationUser(sterileUserName); tousseInstance.setSterilizationUserCode(sterileUserCode); tousseInstance.setTousseDefinition(td); + + tousseInstance.setOperator(operator); + tousseInstance.setOperatorCode(operatorCode); + tousseInstance.setWrapper(wrapper); + tousseInstance.setWrapperCode(wrapperCode); + tousseInstance.setOperationTime(packingDate); //聚合包状态要保持一致 if(DatabaseUtil.isPoIdValid(comboTousseInstanceId)){ if(StringUtils.isBlank(comboTousseStatus)){ @@ -4759,12 +4765,6 @@ tousseInstanceManager.setStatusAccordingToTousseDefinition(tousseInstance); } tousseInstance.setTousseName(td.getName()); - - tousseInstance.setOperator(operator); - tousseInstance.setOperatorCode(operatorCode); - tousseInstance.setWrapper(wrapper); - tousseInstance.setWrapperCode(wrapperCode); - tousseInstance.setOperationTime(packingDate); // 设置临床科室编码 tousseInstance.setDepart(currentPackingTask.getDepartment()); tousseInstance.setDepartCoding(currentPackingTask.getDepartCoding()); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r25208 -r25209 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 25208) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 25209) @@ -5338,13 +5338,17 @@ tousseInstance.setStatus(TousseInstance.STATUS_DISINFECTED); if (TousseDefinition.STR_YES.equals(td.getIsSterile())) { tousseInstance.setStatus(TousseInstance.STATUS_REVIEWED); - //包定义为不装配的话,则包实例的审核时间设置为装配时间 + //包定义为不审核的话,则包实例的审核时间、审核人设置为装配时的信息 tousseInstance.setReviewTime(tousseInstance.getOperationTime()); + tousseInstance.setReviewer(tousseInstance.getOperator()); + tousseInstance.setReviewerCode(tousseInstance.getOperatorCode()); } } else { tousseInstance.setStatus(TousseInstance.STATUS_REVIEWED); - //包定义为不装配的话,则包实例的审核时间设置为装配时间 + //包定义为不审核的话,则包实例的审核时间、审核人设置为装配时的信息 tousseInstance.setReviewTime(tousseInstance.getOperationTime()); + tousseInstance.setReviewer(tousseInstance.getOperator()); + tousseInstance.setReviewerCode(tousseInstance.getOperatorCode()); } } else { tousseInstance.setStatus(TousseInstance.STATUS_PACKED);