Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r18293 -r18332 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18293) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 18332) @@ -670,12 +670,12 @@ for(var i=3;i 0){ - sterilingType = array[4]; - top.Ext.getCmp('sterilizationType').setValue(array[4]); - showResultWithoutSpeak("超大、超重外来器械必须用"+array[4]+"灭菌!"); + if(array[5] != null && array[5].length > 0){ + sterilingType = array[5]; + top.Ext.getCmp('sterilizationType').setValue(array[5]); + showResultWithoutSpeak("超大、超重外来器械必须用"+array[5]+"灭菌!"); }else{ showResultWithoutSpeak("超大超重外来器械需要配置灭菌方式!"); } @@ -717,7 +717,7 @@ }); if(!exists){ //此包没有扫描过并且没有入审核篮筐 var name = array[1]; - var tousseDepart = str[3];//科室 + var tousseDepart = array[3];//科室 var parentNode = createNode(true,barcode,name,tousseDepart,'器械包',true,position); var firstChildNode = rootNode.item(0); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r18225 -r18332 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 18225) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 18332) @@ -703,7 +703,7 @@ Collections.sort(tousseInstanceList);//增加按id降序排序 TousseInstance tousseInstance = null; if(barcodeDevice instanceof TousseInstance){ - result = "success,3,"; + result = "success,3"; //判断是否有已装入至灭菌篮筐或虚拟篮筐的器械包实例,如果有,则返回失败并进行提示 for(int i = 0;i < tousseInstanceList.size();i++){ tousseInstance = (TousseInstance)tousseInstanceList.get(i); @@ -734,7 +734,7 @@ } } }else if(barcodeDevice instanceof Container){ - result = "success,4,"; + result = "success,4"; for(int i = 0;i < tousseInstanceList.size();i++){ tousseInstance = (TousseInstance)tousseInstanceList.get(i); if (tousseInstance != null