Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r25421 -r26815 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 25421) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 26815) @@ -323,7 +323,12 @@ var operatorToPrint = tousseObj.operatorToPrint; var reviewerToPrint = tousseObj.reviewerToPrint; var sterilizationUserToPrint = tousseObj.sterilizationUserToPrint; - var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation; + var packageTypeAbbreviation = tousseObj.packageTypeAbbreviation; + + var storageLocationCode = tousseObj.storageLocationCode; + var simpleName = tousseObj.simpleName; + var operationDate = tousseObj.operationDate; + var inspectorName = tousseObj.inspectorName; //获取申请单需要打印的手术病人信息 var foreignTousseAppInfo = {}; if(tousseType == '外来器械包' || tousseType == '外来器械拆分小包'){ @@ -355,7 +360,8 @@ 'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea, 'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment, 'packageTypeAbbreviation':packageTypeAbbreviation,'applicationItemTotal':foreignTousseAppInfo.applicationItemTotal,'operationRoom':foreignTousseAppInfo.operationRoom, - 'remark':foreignTousseAppInfo.remark + 'remark':foreignTousseAppInfo.remark, + 'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName }; printSummaryObj.washOperator = tousseObj.washOperator; printSummaryObj.tousseType = tousseObj.tousseType; @@ -382,7 +388,7 @@ } var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, - 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation}; + 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName}; obj.washOperator = tousseObj.washOperator; obj.tousseType = tousseObj.tousseType;