Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r18473 -r18611
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 18473)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 18611)
@@ -2769,12 +2769,21 @@
tableHtml += "
"
+ operationReservation.consoleName + " | ";
var tousseItemNames = [];
+ //器械包类型的在前面
+ var insideTousseNames = [];
+ //其他的在后面
+ var otherTouseNames = [];
for(var j = 0; j < operationReservation.applicationItems.length;++j){
var item = operationReservation.applicationItems[j];
if(item){
- tousseItemNames.push(item.tousseName);
+ if(item.tousseType == '器械包'){
+ insideTousseNames.push(item.tousseName);
+ }else{
+ otherTouseNames.push(item.tousseName);
+ }
}
}
+ tousseItemNames = insideTousseNames.concat(otherTouseNames);
tableHtml += "" +tousseItemNames.join(' ')+" | ";
tableHtml += "";
}