Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r26856 -r30365 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 26856) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 30365) @@ -1576,39 +1576,48 @@ var tousses = printSummaryObj.tousses; if(tousses && tousses.length > 0){ - for(var i = 0;i < tousses.length;i++){ - var tousse = printSummaryObj.tousses && printSummaryObj.tousses.length > 0?printSummaryObj.tousses[0]:{}; - var tousseName = tousse.tousseName?tousse.tousseName:" "; - var splitNumber = tousse.splitNumber?tousse.splitNumber:" "; - var foreignToussePrintAmount = tousse.foreignToussePrintAmount?tousse.foreignToussePrintAmount:0; - - var materials = tousse.materials && tousse.materials.length>0?tousse.materials:[]; - var goods = []; - for(var i = 0; i < materials.length;++i){ - if(materials[i].tousseName && materials[i].amount > 0){ //tousseName是 undefined、false、''，都是false - goods.push(materials[i].tousseName+ 'x' + materials[i].amount); + var tousse = tousses[0] + var tousseName = tousse.tousseName?tousse.tousseName:" "; + var amount1 = 0; + var amount2 = 0; + var splitNumber = 0; + for(var i=0;i 0){ //tousseName是 undefined、false、''，都是false + if(materials[j].tousseName == '工具'){ + amount1 += materials[j].amount; + } + if(materials[j].tousseName == '植入物'){ + amount2 += materials[j].amount; + } } } - var details = goods.length > 0?goods.join("、"):" "; - var tableHtml = ""; - tableHtml += ""; - tableHtml += "

"; - tableHtml += "

外来器械交接单

"; - tableHtml += "

厂家名称:

"+supplierName+"

"; - tableHtml += "

器械名称:

"+tousseName+"

"; - tableHtml += "

手术名称:

"+surgery+"

"; - tableHtml += "

接收时间:

"+applicationTime+"

医生:

"+doctor+"

"; - tableHtml += "

包含物:

"+details+"

包份数:

"+splitNumber+"

"; - tableHtml += "

备注:

"+remark+"

"; - tableHtml += "

"; - tableHtml += ""; - var i = 0; - do{ - LODOP.NEWPAGE(); - LODOP.ADD_PRINT_HTM("0", "0", "100%", "100%", tableHtml); - ++i; - }while(i < foreignToussePrintAmount) + splitNumber += tousses[i].splitNumber; } + var details = ""; + if(amount1 > 0){ + details += '工具x'+amount1 + " "; + } + if(amount2 > 0){ + details += '植入物x'+amount2 + " "; + } + var tableHtml = ""; + tableHtml += ""; + tableHtml += "

"; + tableHtml += "

外来器械交接单

"; + tableHtml += "

厂家名称:

"+supplierName+"

"; + tableHtml += "

器械名称:

"+tousseName+"

"; + tableHtml += "

手术名称:

"+surgery+"

"; + tableHtml += "

接收时间:

"+applicationTime+"

医生:

"+doctor+"

"; + + tableHtml += "

包含物:

"+details+"

包份数:

"+splitNumber+"

"; + + tableHtml += "

备注:

"+remark+"

"; + tableHtml += "

"; + tableHtml += ""; + LODOP.NEWPAGE(); + LODOP.ADD_PRINT_HTM("0", "0", "100%", "100%", tableHtml); if(printSummaryObj.printType == 1){ LODOP.PREVIEW(); }else{