Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css
===================================================================
diff -u -r24948 -r24950
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 24948)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/sterilization/sterilization.css	(.../sterilization.css)	(revision 24950)
@@ -1,5 +1,10 @@
 /*common*/
-
+.modal-footer{
+	text-align: center;
+}
+h4{
+	font-size: 14px;
+}
 select::-ms-expand {
 	display: none;
 }
@@ -10,11 +15,15 @@
 	width: 180px;top:30%;
 }
 .modal-header{
-	background: #72B142;
+	background: #31b546;
+	height: 37px;
+	padding: 0 15px;
+	color: #fff;
 
 }
 .modal-title{
 	font-weight: bold;
+	line-height: 37px;
 }
 #modal-footer,#modal-footers{
 	padding: 10px 15px;
@@ -45,6 +54,16 @@
 .progress{
 	margin-bottom: 0;
 }
+.AddRecord{
+	background: #7ae271;
+	color: #fff;
+	border: 1px solid #7ae271;
+}
+.btn_default{
+	background: #fff;
+	color: #5bc069;
+	border: 1px solid #7ae271;
+}
 /*common*/
 /*
 .content{
@@ -256,13 +275,36 @@
 	width:100%;
 }
 .sterilizationList-span,.sterilizationList-title{
+	/*display: inline-block;*/
+	/*width: 100%;*/
+	/*background: #72B142;*/
+	/*font-size: 14px;*/
+	/*font-weight: bold;*/
+	/*padding: 5px ;*/
+}
+.icon_i{
 	display: inline-block;
+	width: 2px;
+	border-right: 2px solid #31b546;
+	height: 14px;
+	/* line-height: 18px; */
+	margin: 0 3px 0 8px;
+	vertical-align: middle;
+}
+
+.modal_span,.sterilizationList-title{
+	margin-bottom: 10px;
+	background: #f2f2f2;
+	display: inline-block;
 	width: 100%;
-	background: #72B142;
+	height: 33px;
+	line-height: 33px;
 	font-size: 14px;
-	font-weight: bold;
-	padding: 5px ;
+	color: #58be66;
 }
+.sterilizationList-title{
+	margin: 10px 0 5px 0;
+}
 .yijiang{
 	text-align: center;
 	display: inline-block;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp
===================================================================
diff -u -r24948 -r24950
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24948)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24950)
@@ -33,13 +33,10 @@
 	<input type="hidden" value="" id="sterilizationPurposes">
 	<input type="hidden" value="" id="od">
 	<input type="hidden" value="" id="countResults">
-
 	<input type="hidden" value="" class="AllData">
-
-
 	<input type="hidden" class="totalPagesAll">
 	<input type="hidden" id="addCleanGetCodeArr" >
-
+	<input type="hidden" class="repetitionBarCod" >
 	<div class="Nan-content">
 		<div class="Nab-Btn">
 			<button type="button" class="dx-btn-primary mainNav-shop-btn" id="addHandle" data-toggle="modal" data-target="#mymodal-data">添加</button>
@@ -82,7 +79,6 @@
 		<div id="HomeMyGrid" style="height:600px;"></div>
 		<div id="pager"></div>
 	</div>
-
 	<!-- add s-->
 	<div  class="modal" id="mymodal-data" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
 		<div class="modal-dialog"  id="modalDialog">
@@ -92,13 +88,13 @@
 						<span aria-hidden="true">×</span>
 						<span class="sr-only">Close</span>
 					</button>
-					<h4 class="modal-title">灭菌记录</h4>
+					<h4 class="modal-title"> <span class="glyphicon glyphicon-list-alt"></span> 灭菌记录</h4>
 				</div>
 				<div class="modal-body" id="modalBody">
 					<!-- <p>弹出层主体内容</p> -->
 					<div class="modalLeft">
 						<div class="Sterilization">
-							<span class="sterilizationList-span">灭菌参数</span>
+							<span class="sterilizationList-span modal_span"><i class="icon_i"></i>灭菌参数</span>
 							<ul>
 								<li class="fonm-Li">
 									<div class="form-li">
@@ -185,7 +181,7 @@
 							</ul>
 							<div class="sterilizationList">
 								<div class="sterilizationList-left">
-									<span class="sterilizationList-span">灭菌物品列表</span>
+									<span class="sterilizationList-span modal_span"><i class="icon_i"></i>灭菌物品列表</span>
 									<div class="sterilizationList-table sterilizationList-Table">
 										<div >
 											<div id="sterilizationListTbale" style="height:200px;"></div>
@@ -196,7 +192,7 @@
 							</div>
 							<div class="sterilizationListTotal">
 								<div class="sterilizationList-title">
-									<span class="span_left">灭菌物品统计</span>
+									<span class=" span_left" ><i class="icon_i"></i>灭菌物品统计</span>
 									<span class="span_right">灭菌物品总数量: <span class="span_color" id="addspan_color"></span></span>
 								</div>
 								<div class="sterilizationList-title" style="margin-top:5px;">
@@ -211,7 +207,7 @@
 								</div>
 							</div>
 							<div class="monitoring ">
-								<span class="sterilizationList-span">监测结果</span>
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>监测结果</span>
 								<ul>
 									<li class="fonm-Li">
 										<div class="form-li">
@@ -284,7 +280,7 @@
 								</ul>
 							</div>
 							<div class="sterilizationListTotal">
-								<span class="sterilizationList-span">中断记录列表</span>
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>中断记录列表</span>
 								<div >
 									<table id="Interruptrecord"></table>
 								</div>
@@ -294,7 +290,7 @@
 					<div class="modalRight">
 						<div class="sterilizationList">
 							<div class="sterilizationList-left sterilizationList-right" >
-								<span class="sterilizationList-span">今天审核的待灭菌物品</span>
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>今天审核的待灭菌物品</span>
 								<div class="sterilizationList-table">
 									<div >
 										<table id="sterilized"></table>
@@ -303,7 +299,7 @@
 							</div>
 						</div>
 						<div class="uninstall">
-							<span class="sterilizationList-span">卸载物品统计列表</span>
+							<span class="sterilizationList-span modal_span"><i class="icon_i"></i>卸载物品统计列表</span>
 							<span class="unistall_span">已卸载物品总数: <span class="span_color">0</span></span>
 							<div class="sterilizationList-table">
 								<div >
@@ -315,8 +311,8 @@
 
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-					<button type="button" class="btn btn-primary" id="addTbale">保存</button>
+					<button type="button" class="btn btn-default btn_default" data-dismiss="modal">关闭</button>
+					<button type="button" class="btn btn-primary AddRecord" id="addTbale">保存</button>
 				</div>
 			</div>
 		</div>
@@ -331,13 +327,13 @@
 						<span aria-hidden="true">×</span>
 						<span class="sr-only">Close</span>
 					</button>
-					<h4 class="modal-title">灭菌记录</h4>
+					<h4 class="modal-title"> <span class="glyphicon glyphicon-list-alt"></span> 灭菌记录</h4>
 				</div>
 				<div class="modal-body" id="modalBodys">
 					<!-- <p>弹出层主体内容</p> -->
 					<div class="modalLeft">
 						<div class="Sterilization">
-							<span class="sterilizationList-span">灭菌参数</span>
+							<span class="sterilizationList-span modal_span"><i class="icon_i"></i>灭菌参数</span>
 							<ul class="sterilizationList_ul" id="sterilizationList_ul">
 								<li class="fonm-Li">
 									<div class="form-li">
@@ -432,12 +428,7 @@
 							</ul>
 							<div class="sterilizationList">
 								<div class="sterilizationList-left">
-									<span class="sterilizationList-span">灭菌物品列表</span>
-									<!--<div class="sterilizationList-table sterilizationList-Table">
-										<div >
-											<div id="udsterilizationListTbale" style="height:200px;"></div>
-										</div>
-									</div>-->
+									<span class="sterilizationList-span modal_span"><i class="icon_i"></i>灭菌物品列表</span>
 									<div class="sterilizationList-table sterilizationList-Table">
 										<div >
 											<div id="udsterilizationListTbale" style="height:200px;"></div>
@@ -462,7 +453,7 @@
 								</div>
 							</div>
 							<div class="monitoring ">
-								<span class="sterilizationList-span">监测结果</span>
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>监测结果</span>
 								<ul id="sterilizationList_li">
 									<li class="fonm-Li">
 										<div class="form-li">
@@ -537,7 +528,7 @@
 								</ul>
 							</div>
 							<div class="sterilizationListTotal">
-								<span class="sterilizationList-span">中断记录列表</span>
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>中断记录列表</span>
 								<div >
 									<table id="udInterruptrecord"></table>
 								</div>
@@ -547,8 +538,7 @@
 					<div class="modalRight">
 						<div class="sterilizationList">
 							<div class="sterilizationList-left sterilizationList-right" >
-								<span class="sterilizationList-span">今天审核的待灭菌物品 <a class="yijiang">一键入炉</a></span>
-
+								<span class="sterilizationList-span modal_span"><i class="icon_i"></i>今天审核的待灭菌物品 <a class="yijiang">一键入炉</a></span>
 								<div class="sterilizationList-table">
 									<div >
 										<table id="udsterilized"></table>
@@ -557,7 +547,7 @@
 							</div>
 						</div>
 						<div class="uninstall">
-							<span class="sterilizationList-span">卸载物品统计列表</span>
+							<span class="sterilizationList-span modal_span"><i class="icon_i"></i>卸载物品统计列表 </span>
 							<span class="unistall_span">已卸载物品总数: <span class="span_color">10</span></span>
 							<div class="sterilizationList-table">
 								<div >
@@ -568,8 +558,8 @@
 					</div>
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-default Close" data-dismiss="modal">关闭</button>
-					<button type="button" class="btn btn-primary" id="conservation" data-toggle="modal" data-target="#SaveAlert ">保存</button>
+					<button type="button" class="btn btn-default Close btn_default" data-dismiss="modal">关闭</button>
+					<button type="button" class="btn btn-primary AddRecord" id="conservation" data-toggle="modal" data-target="#SaveAlert ">保存</button>
 
 				</div>
 			</div>
@@ -621,7 +611,6 @@
 		</div>
 	</div>
 	<!--删除 e-->
-
 </div>
 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
 	<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/firebugx.js"></script>
@@ -651,10 +640,6 @@
 	<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js"></script>
 	<script src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 	<script src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.zh-CN.js"></script>
-	<%--<script src="${basePath}/dx-disinfectsystem/js/sterilization/sterilization.js"></script>--%>
 	<script src="${basePath}/dx-disinfectsystem/js/sterilization/sterilization1.js"></script>
-	<script>
-
-	</script>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js
===================================================================
diff -u -r24948 -r24950
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24948)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization1.js	(.../sterilization1.js)	(revision 24950)
@@ -328,8 +328,6 @@
     }
 })
 //灭菌物品列表
-
-
 //父子表
 var indent = 0;
 var parents = [];
@@ -501,53 +499,63 @@
 //扫描条码
 $("#barCode").keydown(function(e){
     if(e.keyCode == 13){
-        var addItem;
-        $.ajax({
-            url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-            type:"get",
-            dataType:'json',
-            data:{barcode:$(this).val()},
-            success:function(data){
-                if(data.success==true){
-                    addItem = data.rows[0];
-                    console.log(addItem)
-                    if(data.barcodeType==='用户'){
-                        $('#sterilization').val(addItem.name);
-                        $('#barCode').val("");
-                        return false
-                    }
-                    if(data.barcodeType==='灭菌架'){
-                        $('#sterilization').val(addItem.name);
-                        $('#barCode').val("")
-                        return false
-                    }
-                    if(data.barcodeType==='器械包'){
-                        BasketData.push(addItem);
-                        addCleanBaskets(BasketData);
-                        $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
-                        $('#barCode').val("")
-                        addallTableDatas();
-                        return false
-                    }
-                    if(data.barcodeType==='灭菌篮筐'){
-                        BasketData.push(addItem);
-                        addCleanBaskets(BasketData);
-                        $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
-                        $('#barCode').val("")
-                        addallTableDatas();
-                        return false
-                    }
+        if($('.repetitionBarCod').val()==$(this).val()){
+            alert('不能重复输入条码');
+            return false;
+        }else{
+            var addItem;
+            $.ajax({
+                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                type:"get",
+                dataType:'json',
+                data:{barcode:$(this).val()},
+                success:function(data){
+                    if(data.success==true){
+                        addItem = data.rows[0];
+                        console.log(addItem)
+                        if(data.barcodeType==='用户'){
+                            $('#sterilization').val(addItem.name);
+                            $('#barCode').val("");
+                            $('.repetitionBarCod').val($('#barCode').val())
+                            return false
+                        }
+                        if(data.barcodeType==='灭菌架'){
+                            $('#sterilization').val(addItem.name);
+                            $('#barCode').val("")
+                            $('.repetitionBarCod').val($('#barCode').val())
+                            return false
+                        }
+                        if(data.barcodeType==='器械包'){
+                            BasketData.push(addItem);
+                            addCleanBaskets(BasketData);
+                            $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                            $('.repetitionBarCod').val($('#barCode').val())
+                            $('#barCode').val("")
+                            addallTableDatas();
+                            return false
+                        }
+                        if(data.barcodeType==='灭菌篮筐'){
+                            BasketData.push(addItem);
+                            addCleanBaskets(BasketData);
+                            $("#addCleanGetCodeArr").val(JSON.stringify(BasketData));
+                            $('.repetitionBarCod').val($('#barCode').val())
+                            $('#barCode').val("")
+                            addallTableDatas();
 
+                            return false
+                        }
 
-                } else{
-                    alert(data.message);
-                    return false;
+                    } else{
+                        alert(data.message);
+                        return false;
+                    }
+
                 }
+            });
+            addCleanAfterAjax();
+            // $("#addCleanGetCode").val("");
+        }
 
-            }
-        });
-        addCleanAfterAjax();
-        $("#addCleanGetCode").val("");
     }
 });
 //父子表end
@@ -1015,7 +1023,7 @@
             loadData=[];
             return false;
         }
-        // loadData=[];
+        loadData=[];
         // console.log(data)
         indent = 0;
         var tempId = 0;
@@ -1090,7 +1098,6 @@
                 e.stopImmediatePropagation();
             }
         });
-        // console.log(loadData)
         dataView2.setItems(loadData);
         dataView2.setFilter(myFilter);
         sterilizationGird.render()
@@ -1113,6 +1120,7 @@
                         $('.AllData').val(JSON.stringify(additemGood))
                         BasketData.push(data.rows[i])
                     }
+                    console.log(BasketData)
                     addCleanBaskets(BasketData);
                     allTableDatas();
                 }
@@ -1126,54 +1134,64 @@
     });
     $("#udbarCode").keydown(function(e){
         if(e.keyCode == 13){
-            var addItem;
-            $.ajax({
-                url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
-                type:"get",
-                dataType:'json',
-                data:{barcode:$(this).val()},
-                success:function(data){
-                    if(data.success===true){
-                        addItem = data.rows[0];
-                        // additemGood.push(addItem)
-                        if(data.barcodeType==='用户'){
-                            $('#udsterilization').val(addItem.name);
-                            $('#udbarCode').val("");
-                            return false
+            if($('.repetitionBarCod').val()==$(this).val()){
+                alert('不能输入重复条码');
+                return false;
+            }else{
+                var addItem;
+                $.ajax({
+                    url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/scanBarcode.mhtml',
+                    type:"get",
+                    dataType:'json',
+                    data:{barcode:$(this).val()},
+                    success:function(data){
+                        if(data.success===true){
+                            addItem = data.rows[0];
+                            // additemGood.push(addItem)
+                            if(data.barcodeType==='用户'){
+                                $('#udsterilization').val(addItem.name);
+                                $('.repetitionBarCod').val($('#udbarCode').val())
+                                $('#udbarCode').val("");
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌架'){
+                                $('#udsterilizationName').val(addItem.name);
+                                $('.repetitionBarCod').val($('#udbarCode').val())
+                                $('#udbarCode').val("")
+                                return false
+                            }
+                            if(data.barcodeType==='器械包'){
+                                additemGood.push(addItem)
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $('.repetitionBarCod').val($('#udbarCode').val())
+                                $('#udbarCode').val("")
+                                $('.AllData').val(JSON.stringify(additemGood))
+                                allTableDatas();
+                                return false
+                            }
+                            if(data.barcodeType==='灭菌篮筐'){
+                                additemGood.push(addItem)
+                                BasketData.push(addItem);
+                                addCleanBaskets(BasketData);
+                                $('.repetitionBarCod').val($('#udbarCode').val())
+                                $('#udbarCode').val("")
+                                $('.AllData').val(JSON.stringify(additemGood))
+                                allTableDatas();
+                                return false
+                            }
+
+                        } else{
+                            alert(data.message);
+                            return false;
                         }
-                        if(data.barcodeType==='灭菌架'){
-                            $('#udsterilizationName').val(addItem.name);
-                            $('#udbarCode').val("")
-                            return false
-                        }
-                        if(data.barcodeType==='器械包'){
-                            additemGood.push(addItem)
-                            BasketData.push(addItem);
-                            addCleanBaskets(BasketData);
-                            $('#udbarCode').val("")
-                            $('.AllData').val(JSON.stringify(additemGood))
-                            allTableDatas();
-                            return false
-                        }
-                        if(data.barcodeType==='灭菌篮筐'){
-                            additemGood.push(addItem)
-                            BasketData.push(addItem);
-                            addCleanBaskets(BasketData);
-                            $('#udbarCode').val("")
-                            $('.AllData').val(JSON.stringify(additemGood))
-                            allTableDatas();
-                            return false
-                        }
 
-                    } else{
-                        alert(data.message);
-                        return false;
                     }
+                });
+                addCleanAfterAjax();
+                // $("#addCleanGetCode").val("");
+            }
 
-                }
-            });
-            addCleanAfterAjax();
-            $("#addCleanGetCode").val("");
         }
     });
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js
===================================================================
diff -u -r24943 -r24950
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24943)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/useRecord/slickGridRecord.js	(.../slickGridRecord.js)	(revision 24950)
@@ -870,22 +870,6 @@
                         alert('不能重复输入条码')
                         return false;
                     }else{
-                        // var ModifiedDataGood =[];
-                        // var ModifiedDataGoosd= JSON.parse($('.ModifiedData').val())
-                        // for(var i=0;i<ModifiedDataGoosd.length;i++){
-                        //     ModifiedDataGood.push(ModifiedDataGoosd[i].barcode)
-                        // }
-                        // console.log(ModifiedDataGood)
-                        // for(var j=0;j<ModifiedDataGood.length;j++){
-                        //
-                        //     var tempBarcodeAll =$('#tempBarcodes').val()
-                        //     if(ModifiedDataGood.indexOf(ModifiedDataGood[j])==-1){
-                        //
-                        //         alert('条码'+tempBarcodeAll+'已经存在');
-                        //         return false;
-                        //     }
-                        // }
-                        // console.log(ModifiedDataGood)
                         $.ajax({
                             url:WWWROOT+'/disinfectSystem/useRecord/useRecordController/loadScanedGoods.mhtml',
                             type:'get',