Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r13871 -r13914 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 13871) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 13914) @@ -113,11 +113,8 @@ int implantsAmount = 0; // 获取器械包材料件数 if (ls != null && ls.size() > 0) { - String tousseDefinitionName = ls.get(0).getTousseName(); TousseDefinition td = tousseDefinitionManager - .getTousseDefinitionByName(tousseDefinitionName); - - + .getTousseDefinitionByTousseItem(ls.get(0)); if (td != null) { List materialList = td .getMaterialInstances(); Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r13689 -r13914 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 13689) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 13914) @@ -149,7 +149,7 @@ 'foreignPackageObjectArray':applicationItems,'sterilizer':sterilizer,'frequency':frequency,'markTousse':markTousse,'hospitalName':hospitalName,'total':total, 'labelType':foreignDefaultLabelpaper,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime, 'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea, - 'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment, + 'bedNumber':foreignTousseAppInfo.bedNumber,'depart':foreignTousseAppInfo.ascriptionDepartment,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment, 'packageTypeAbbreviation':packageTypeAbbreviation }; printSummaryObj.washOperator = tousseObj.washOperator;