Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp
===================================================================
diff -u -r24562 -r24570
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24562)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/useRecord/index.jsp	(.../index.jsp)	(revision 24570)
@@ -25,6 +25,7 @@
 		<input type="hidden" value="" id="ModifySaveStr">
 		<input type="hidden" value="" id="ModifySaveId">
 		<input type="hidden" value="" id="RecordGoodes">
+		<input type="hidden" value="" id="Barcode">
 		<div class="content-header">
 			<span>使用记录列表</span>
 		</div>
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js
===================================================================
diff -u -r24562 -r24570
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js	(.../record.js)	(revision 24562)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/record.js	(.../record.js)	(revision 24570)
@@ -726,23 +726,31 @@
 })
 //添加使用记录
 $('#tempBarcode').on('keydown',function(e){
+
     if (e.keyCode == "13") {
         if($(this).val()==""){
             alert('请输入条码')
             return false;
         }else{
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
-                type:'get',
-                dataType:'json',
-                async:false,
-                success:function(data){
-                    if(data.success===true){
-                        $('#addGoods-table').bootstrapTable('append',data.data);
+
+            if($('#Barcode').val()==$(this).val()){
+                alert('不能重复输入条码')
+            }else{
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
+                    type:'get',
+                    dataType:'json',
+                    async:false,
+                    success:function(data){
+                        if(data.success===true){
+                            $('#addGoods-table').bootstrapTable('append',data.data);
+                            $('#Barcode').val(data.data.barcode)
+                        }
                     }
-                }
 
-            })
+                })
+            }
+
         }
     }
 })
@@ -785,13 +793,24 @@
     }
     var recordGoodsArrays= JSON.stringify(recordGoodsArray)
     console.log(recordGoodsArrays)
+    if(addwashHandNurse==''){
+        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>洗手护士不能为空')
+        $ ('#Alert').show ().delay (1500).fadeOut ();
+        return;
+    }
+    if(addcircuitNurse==''){
+        $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>巡回护士不能为空')
+        $ ('#Alert').show ().delay (1500).fadeOut ();
+        return;
+    }
     if(addhospitalNum==''&&addtreatmentNum==''&&addpatientName==''){
         $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>请输入诊疗号或者住院号或者病人姓名')
         $ ('#Alert').show ().delay (1500).fadeOut ();
     }else{
         if(tempBarcode==''){
             $('#Alert').html('<spna class="close" data-dismiss="alert">x</spna>机械包信息不能为空')
             $ ('#Alert').show ().delay (1500).fadeOut ();
+            return;
         }else{
             $.ajax({
                 url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/saveUseRecord.mhtml',
@@ -822,18 +841,24 @@
             alert('请输入条码')
             return false;
         }else{
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
-                type:'get',
-                dataType:'json',
-                async:false,
-                success:function(data){
-                    if(data.success===true){
-                        $('#Goods-table').bootstrapTable('append',data.data);
+            if( $('#Barcode').val()==$(this).val()){
+                alert('不能输入同样的条码')
+            }else{
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml?barcode='+$(this).val(),
+                    type:'get',
+                    dataType:'json',
+                    async:false,
+                    success:function(data){
+                        if(data.success===true){
+                            $('#Goods-table').bootstrapTable('append',data.data);
+                            $('#tempBarcodes').val('')
+                            $('#Barcode').val(data.data.barcode)
+                        }
                     }
-                }
 
-            })
+                })
+            }
         }
     }
 })