Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js
===================================================================
diff -u -r24558 -r24567
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js	(.../sterilization.js)	(revision 24558)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/sterilization/sterilization.js	(.../sterilization.js)	(revision 24567)
@@ -4,8 +4,9 @@
 alert('currentOrgUnitName=' + currentOrgUnitName);
 */
 $('#addHandle').click(function(){
-    $('#sterilization').val(currentUserCode)//科室
-    allTableDatas();
+    $('#sterilization').val()//科室
+    sterilizationListTotal()
+    addallTableDatas();
 
 })
 $(window).resize(function () {
@@ -371,7 +372,7 @@
 //今天审核的待灭菌物品 details
 $(function(){
     $.ajax({
-        url:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
+        // url:'http://rap2api.taobao.org/app/mock/85153/disinfectSystem/sterilization/sterilizationRecordController/loadSterilizationRecord.mhtml',
         type:'get',
         dataType:'json',
         async:true,
@@ -1156,7 +1157,7 @@
                        if(data.barcodeType==='器械包'){
                            $('#sterilizationListTbale').bootstrapTable('append',datas);
                            $('#barCode').val("")
-
+                           addallTableDatas();
                        }
                        if(data.barcodeType==='用户'){
                     	   $('#sterilization').val(datas[0]['name']);
@@ -1165,6 +1166,7 @@
                        if(data.barcodeType==='灭菌篮筐'){
                     	   $('#sterilizationListTbale').bootstrapTable('append',datas);
                            $('#barCode').val("")
+                           addallTableDatas();
                        }
                        if(data.barcodeType==='灭菌架'){
                     	   $('#sterilization').val(datas[0]['name']);
@@ -1239,26 +1241,29 @@
 
     };
 })
-$('#sterilizationListTotal').bootstrapTable({
-    striped: true,                      //是否显示行间隔色
-    cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-    sortOrder: "asc",                   //排序方式
-    height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
-    uniqueId: "id",                     //每一行的唯一标识，一般为主键列
-    detailView: false,                   //是否显示父子表
-    removeByUniqueId:1,
-    columns: [
-        {
-            field: 'name',
-            title: '器械包统计名称'
-        },
-        {
-            field: 'amount',
-            title: '数量'
-        }
+function sterilizationListTotal(){
+    $('#sterilizationListTotal').bootstrapTable({
+        striped: true,                      //是否显示行间隔色
+        cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        sortOrder: "asc",                   //排序方式
+        height: 200,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+        uniqueId: "id",                     //每一行的唯一标识，一般为主键列
+        detailView: false,                   //是否显示父子表
+        removeByUniqueId:1,
+        columns: [
+            {
+                field: 'name',
+                title: '器械包统计名称'
+            },
+            {
+                field: 'amount',
+                title: '数量'
+            }
 
-    ],
-});
+        ],
+    });
+}
+sterilizationListTotal();
 // 添加灭菌
 $('#addTbale').on('click',function(){
     var sterilization =$('#sterilization').val();
@@ -1351,7 +1356,15 @@
        for(var i =0; i < allTableDatas.length; i++){
            var objs =allTableDatas[i]
            if(allTableDatas[i].type===1){
+               if(objs.type===1){
+                   allchildren.push(objs.type)
+                   if(countResult[objs['name']]){
+                       countResult[objs['name']]=countResult[objs['name']]+1;
+                   }else{
+                       countResult[objs['name']]=1;
+                   }
 
+               }
             alltotle.push(allTableDatas[i].type)
               for(var j=0;j<objs.children.length;j++){
                   allchildren.push(objs.children[j])
@@ -1407,8 +1420,78 @@
     });
     addallTableDatas();
 }
+function addallTableDatas(){
+    var allTableDatas = $('#sterilizationListTbale').bootstrapTable('getData');
+    var alltotle=[] ,allchildren=[],countResult={},countResults=[] ,countResultall;
+    if(allTableDatas==''){
+        $('#addsterils_1').text('0');
+        $('#addsterils_2').text('0');
+        $('#addsterils_3').text('0');
+        $('#addsterils_4').text('0');
+        $('#addsterils_5').text('0');
+        $('#addsterilslor').text('0');
+        countResultall="没有数据"
+        $('#countResults').val(countResultall)
+    }else {
+        for(var i =0; i < allTableDatas.length; i++){
+            var objs =allTableDatas[i]
+            if(allTableDatas[i].type===1){
+                if(objs.type===1){
+                    allchildren.push(objs.type)
+                    if(countResult[objs['name']]){
+                        countResult[objs['name']]=countResult[objs['name']]+1;
+                    }else{
+                        countResult[objs['name']]=1;
+                    }
 
+                }
+                alltotle.push(allTableDatas[i].type)
+                for(var j=0;j<objs.children.length;j++){
+                    allchildren.push(objs.children[j])
+                    //获取children的数据进行统计
+                    var objChildren =objs.children[j]
+                    if(countResult[objChildren["name"]]){
+                        countResult[objChildren["name"]]=countResult[objChildren["name"]] + 1;
+                    }else{
+                        countResult[objChildren["name"]]=1;
+                    }
+                }
+            }else{
 
+                if(objs.type===2){
+                    allchildren.push(objs.type)
+                    if(countResult[objs['name']]){
+                        countResult[objs['name']]=countResult[objs['name']]+1;
+                    }else{
+                        countResult[objs['name']]=1;
+                    }
 
+                }
+            }
+        }
+        $('#addsterils_1').text(alltotle.length);
+        $('#addsterils_2').text(allchildren.length);
+        $('#addspan_color').text(allchildren.length);
+        var countResultarr =countResult
+        for (var prop in countResultarr) {
+            countResults.push({'name':prop,"amount":countResultarr[prop]})
+        }
+        countResultall= JSON.stringify(countResults)
+        $('#countResults').val(countResultall)
 
+    }
+    var Json =$('#countResults').val();
+    if(Json==='没有数据'){
+        $("#sterilizationListTotal").bootstrapTable('destroy');
+        sterilizationListTotal();
+    }else{
+        $('#sterilizationListTotal').bootstrapTable('load',JSON.parse(Json))
+    }
 
+}
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp
===================================================================
diff -u -r24558 -r24567
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24558)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/sterilization/index.jsp	(.../index.jsp)	(revision 24567)
@@ -177,7 +177,7 @@
 								<div class="sterilizationListTotal">
 									<div class="sterilizationList-title">
 										<span class="span_left">灭菌物品统计</span>
-										<span class="span_right">灭菌物品总数量: <span class="span_color">18</span></span>
+										<span class="span_right">灭菌物品总数量: <span class="span_color" id="addspan_color"></span></span>
 									</div>
 									<div class="sterilizationList-title" style="margin-top:5px;">
 										<span class="ster_span">篮筐:<span id="addsterils_1"></span></span>