Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r17909 -r17921 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 17909) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 17921) @@ -2689,8 +2689,25 @@ group.consoleNames.push(operationReservations[i].consoleName); group.operationReservations.push(operationReservations[i]); } - //把字母顺序排序,添加对中文的排序 - groupNames.sort(function (a, b) { return a.localeCompare(b); }); + //把字母顺序排序,添加对中文的排序。如果groupNames中包含有'四楼DSA','四楼MR',则把四楼DSA排第一,四楼MR排第二(中大附一的需求) + groupNames.sort(function (a, b) { + if(a == '四楼DSA'){ + return -1; + } + if(b == '四楼DSA'){ + return 1; + } + //到这里,a和b都不可能是'四楼DSA' + if(a == '四楼MR'){ + return -1; + } + if(b == '四楼MR'){ + return 1; + } + //到这里,a和b都不可能是'四楼MR' + return a.localeCompare(b); + }); + var title = '手术器械安排'; if(printObj.operationTime){ title = printObj.operationTime + title;