Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r36537 -r36556 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36537) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36556) @@ -1007,13 +1007,6 @@ obj.put("depart", foreignProxyDisinfection.getDepart()); } obj.put("tousseDefinitionId", td.getId()); - obj.put("inspector", tousseInstance.getInspector()); - obj.put("inspectorCode", tousseInstance.getInspectorCode()); - if (isPrintUserName) { - obj.put("inspectorToPrint", tousseInstance.getInspector()); - }else{ - obj.put("inspectorToPrint", tousseInstance.getInspectorCode()); - } array.add(obj); //KSDQDYRMYY-21【日志管理】的“打印”功能模块新增器械包信息打印记录 savePrintLog(tousseInstance); @@ -3660,13 +3653,6 @@ obj.put("tousseDefinitionId", td.getId()); obj.put("logPrintTousse", true); obj.put("printCause", "审核打印"); - obj.put("inspector", tousseInstance.getInspector()); - obj.put("inspectorCode", tousseInstance.getInspectorCode()); - if (isPrintUserName) { - obj.put("inspectorToPrint", tousseInstance.getInspector()); - }else{ - obj.put("inspectorToPrint", tousseInstance.getInspectorCode()); - } toussesArray.add(obj); JSONObject logObj = new JSONObject(); JSONUtil.addLogProperty(logObj, "tousseInstanceId", tousseInstance.getId()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r36526 -r36556 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 36526) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 36556) @@ -1865,6 +1865,13 @@ obj.put("operatorToPrint", names.optString("operatorToPrint")); obj.put("wrapperForPrint", names.optString("wrapperForPrint")); obj.put("reviewerToPrint", names.optString("reviewerToPrint")); + obj.put("inspector", tousseInstance.getInspector()); + obj.put("inspectorCode", tousseInstance.getInspectorCode()); + if (isPrintUserName) { + obj.put("inspectorToPrint", tousseInstance.getInspector()); + }else{ + obj.put("inspectorToPrint", tousseInstance.getInspectorCode()); + } obj.put("wrapper", tousseInstance.getWrapper()); obj.put("wrapperCode", tousseInstance.getWrapperCode()); String operationTimeStr = ForgonDateUtils.safelyFormatDate(tousseInstance.getOperationTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, null);