Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/images/playEnabled.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/images/user.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/js/index.js
===================================================================
diff -u -r35501 -r37431
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/js/index.js	(.../index.js)	(revision 35501)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/js/index.js	(.../index.js)	(revision 37431)
@@ -29,8 +29,43 @@
     }
     setInterval(getTime, 1000);
     initToTime();
+    if(urgentBroadcast == '是'){
+        $('#playDisabled').show();
+    }
 })();
 
+var urgentMessage = '';
+var playTime = null;
+var speaker = new Speaker();
+
+function playEnabled() {
+    speaker.enable(true);
+    if (!playTime) {
+        playVideoToTime();
+    }
+    $('#playDisabled').hide();
+    $('#playEnabled').show();
+}
+
+function playVideoToTime() {
+    var time = 30 * 60 * 1000;
+    if (urgentBroadcastFrequency && urgentBroadcastFrequency > 0) {
+        time = urgentBroadcastFrequency * 60 * 1000;
+    }
+    if (urgentMessage !== '') {
+        speaker.speak(urgentMessage);
+    }
+    playTime = setTimeout(function () {
+        playVideoToTime();
+    }, time);
+}
+
+function playDisabled() {
+    speaker.enable(false);
+    $('#playDisabled').show();
+    $('#playEnabled').hide();
+}
+
 function initToTime() {
     init();
     var time = 1 * 60 * 1000;
@@ -102,6 +137,13 @@
         }
     }
     var option = {
+        title: {
+            text: '',
+            subtext: '单位(包)',
+            subtextStyle: {
+                color: '#fff'
+            }
+        },
         // 工具提示
         tooltip: {
             // 触发类型  经过轴触发axis  经过轴触发item
@@ -184,68 +226,17 @@
     myechart.setOption(option);
 }
 
-function createChartsForGauge(dom, onlineUserAmount, userAmount) {
-    var myechart = echarts.init($(dom)[0]);
-    var series = [
-        {
-            type: 'gauge',  //类型：仪表盘图
-            name: '当前在线',
-            title: {
-                offsetCenter: [0, '120%'],
-                color: "#fff",
-                fontSize: 16,
-            },
-            center: ['50%', '45%'],   //仪表盘图的中心点相对于dom容器的位置
-            detail: {
-                formatter: '{value} / ' + userAmount,
-                offsetCenter: [0, 0],
-                color: "#FFF",
-                fontSize: 18
-            },
-            data: [{
-                value: onlineUserAmount, //此处要改数据
-                name: '当前在线 / 人员总数'
-            }],
-            radius: '80%',  //环形的大小
-            clockwise: true,
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: [
-                        [onlineUserAmount / userAmount, '#1A8FC5'], //占总数的30.25%，即value/100，颜色为'#1A8FC5'
-                        [1, '#fefefe']  //基底大圈比例为1，颜色为'#E1E8EE'，
-                    ],
-                    width: 10,  //环形的粗细
-                }
-            },
-            splitLine: {
-                show: false   //不显示分隔线
-            },
-            axisTick: {
-                show: false  //不显示仪表盘刻度
-            },
-            axisLabel: {
-                show: false
-            },
-            pointer: {
-                show: false  //不显示仪表盘指针
-            }
-        }
-    ]
-    var option = {
-        tooltip: {
-            formatter: '{a} <br/>{b} : {c}%'
-        },
-        color: ['#53f1f2', '#4ebefd'],
-        series: series
-    }
-    myechart.setOption(option);
-}
-
 function createChartsForLine(dom, xAxisData, seriesData) {
     var myechart = echarts.init($(dom)[0]);
     var xAxisData1 = xAxisData;
     var option = {
+        title: {
+            text: ' ',
+            subtext: '单位(包)',
+            subtextStyle: {
+                color: '#fff'
+            }
+        },
         tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -355,7 +346,7 @@
         success: function (result) {
             var userAmount = result.data.userAmount;
             var onlineUserAmount = result.data.onlineUserAmount;
-            createChartsForGauge('#gauge', onlineUserAmount, userAmount);
+            $('#onlineUserAmount').html(onlineUserAmount)
         }
     })
 }
@@ -378,6 +369,7 @@
                     }
                     html += '<span class="col">' + result.data[i].name + '</span>';
                     html += '<span class="col">' + result.data[i].status + '</span>';
+                    html += '<span class="col">' + (result.data[i].dateStr || "") + '</span>';
                     html += '<span class="icon-dot"></span>';
                     html += '</div>';
                 }
@@ -398,12 +390,6 @@
         dataType: 'json',
         url: url,
         success: function (result) {
-            var invoicedUrgentAmount = result.data.invoicedUrgentAmount;
-            var toBeInvoiceUrgentAmount = result.data.toBeInvoiceUrgentAmount;
-            var invoicedAmount = result.data.invoicedAmount;
-            $('#invoicedUrgentAmount').html(invoicedUrgentAmount)
-            $('#toBeInvoiceUrgentAmount').html(toBeInvoiceUrgentAmount)
-            $('#invoicedAmount').html(invoicedAmount);
             //待处理 外来器械
             var foreignToBeRecycledAmount = result.data.foreignToBeRecycledAmount || 0;
             var foreignTobeWashAmount = result.data.foreignTobeWashAmount || 0;
@@ -419,6 +405,13 @@
             var foreignSterilizationedAmount = result.data.foreignSterilizationedAmount || 0;
             var foreignInvoicedAmount = result.data.foreignInvoicedAmount || 0;
             var foreignSignedAmount = result.data.foreignSignedAmount || 0;
+            //总数量 外来器械
+            var sumForeignRecycledAmount = foreignToBeRecycledAmount + foreignRecycledAmount;
+            var sumForeignWashedAmount = foreignTobeWashAmount + foreignWashedAmount;
+            var sumForeignPackedAmount = foreignToBePackAmount + foreignPackedAmount;
+            var sumForeignSterilizationedAmount = foreignToBeSterilizationAmount + foreignSterilizationedAmount;
+            var sumForeignInvoicedAmount = foreignToBeInvoiceAmount + foreignInvoicedAmount;
+            var sumForeignSignedAmount = foreignSignedAmount + foreignToBeSignAmount;
             //待处理 器械包处理量
             var toBeRecycledAmount = result.data.toBeRecycledAmount || 0;
             var tobeWashAmount = result.data.tobeWashAmount || 0;
@@ -435,19 +428,26 @@
             var sterilizationedAmount = result.data.sterilizationedAmount || 0;
             var invoicedAmount = result.data.invoicedAmount || 0;
             var signedAmount = result.data.signedAmount || 0;
+            //总数量 器械包处理量
+            var sumApplyAmount = toBeRecycledAmount + recycledAmount;
+            var sumWashedAmount = tobeWashAmount + washedAmount;
+            var sumPackAmount = toBePackAmount + packedAmount;
+            var sumSterilizationAmount = toBeSterilizationAmount + sterilizationedAmount;
+            var sumInvoiceAmount = toBeInvoiceAmount + invoicedAmount;
+
             /************************ 外来器械包汇总 开始*********************/
             var xAxisData2 = ['申请', '回收', '清洗消毒', '装配管理', '灭菌管理', '发货', '签收'];
             var seriesData2 = [{
-                name: '待处理',
+                name: '全部物品',
                 color: ['#46afab', '#049391', '#146f8e', '#2c3e7e', '#545a96'],
-                data: [foreignApplyAmount, foreignToBeRecycledAmount, foreignTobeWashAmount, foreignToBePackAmount, foreignToBeSterilizationAmount, foreignToBeInvoiceAmount, foreignToBeSignAmount]
+                data: [foreignApplyAmount, sumForeignRecycledAmount, sumForeignWashedAmount, sumForeignPackedAmount, sumForeignSterilizationedAmount, sumForeignInvoicedAmount, sumForeignSignedAmount]
             },
             {
                 name: '已处理',
                 color: ['#e99b29', '#9a5037', '#923f49', '#353281', '#5a59a5'],
                 data: [foreignApplyAmount, foreignRecycledAmount, foreignWashedAmount, foreignPackedAmount, foreignSterilizationedAmount, foreignInvoicedAmount, foreignSignedAmount]
             }];
-            var legendData2 = ['待处理', '已处理'];
+            var legendData2 = ['全部物品', '已处理'];
             createChartsForColunm('#histogramChart2', xAxisData2, seriesData2, legendData2);
             /************************ 外来器械包汇总 结束*********************/
 
@@ -460,19 +460,43 @@
             /************************ 器械包处理量 开始***********************/
             var xAxisData3 = ['回收清点', '清洗消毒', '装配管理', '灭菌管理', '发货计划'];
             var seriesData3 = [{
-                name: '待处理',
+                name: '全部物品',
                 color: ['#2289ff', '#4077f6', '#5d5ef6', '#6557de', '#8c70f8'],
-                data: [toBeRecycledAmount, tobeWashAmount, toBePackAmount, toBeSterilizationAmount, toBeInvoiceAmount]
+                data: [sumApplyAmount, sumWashedAmount, sumPackAmount, sumSterilizationAmount, sumInvoiceAmount]
             },
             {
                 name: '已处理',
                 color: ['#f9de50', '#ffb028', '#f2a229', '#f98a42', '#e98352'],
                 data: [recycledAmount, washedAmount, packedAmount, sterilizationedAmount, invoicedAmount]
             }];
-            var legendData3 = ['待处理', '已处理'];
+            var legendData3 = ['全部物品', '已处理'];
             var colorData = ['#87cefa', '#FBA923'];
             createChartsForColunm('#histogramChart', xAxisData3, seriesData3, legendData3)
             /************************ 器械包处理量 结束***********************/
+
+            /************************ 加急物品列表 开始***********************/
+            var toBeInvoiceUrgentSum = result.data.toBeInvoiceUrgentSum || [];
+            if (toBeInvoiceUrgentSum.length > 0) {
+                var html = '';
+                var message = '当前待发货加急物品';
+                for (var i = 0; i < toBeInvoiceUrgentSum.length; i++) {
+                    html += '<div class="row" style="color: ' + toBeInvoiceUrgentSum[i].colorCode + '">';
+                    html += '<span class="col">' + toBeInvoiceUrgentSum[i].tousseName + '</span>';
+                    html += '<span class="col">' + toBeInvoiceUrgentSum[i].name + '</span>';
+                    html += '<span class="col">' + toBeInvoiceUrgentSum[i].urgentAmount + '</span>';
+                    html += '<span class="icon-dot"></span>';
+                    html += '</div>';
+                    if (i < 10) {
+                        message += toBeInvoiceUrgentSum[i].tousseName + '共' + toBeInvoiceUrgentSum[i].urgentAmount + '个、';
+                    }
+                }
+                urgentMessage = message;
+                $('#urgentSum').html(html)
+                if (toBeInvoiceUrgentSum.length < 5) {
+                    $('#urgentSum').removeClass('marquee');
+                }
+            }
+            /************************ 加急物品列表 结束***********************/
             $(".loading").fadeOut()
         }
     })
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/images/playDisabled.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/css/index.css
===================================================================
diff -u -r35501 -r37431
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/css/index.css	(.../index.css)	(revision 35501)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/css/index.css	(.../index.css)	(revision 37431)
@@ -127,38 +127,45 @@
   color: #4c9bfd;
 }
 
-.columnLeft_2 {
+.columnLeft_2,
+.columnRight_2 {
   height: 75%;
 }
 
-.columnLeft_2 .inner {
+.columnLeft_2 .inner,
+.columnRight_2 .inner {
   padding: 1rem 0;
   display: flex;
   flex-direction: column;
 }
 
-.columnLeft_2 .inner h3 {
+.columnLeft_2 .inner h3,
+.columnRight_2 .inner h3 {
   margin-left: 1.5rem;
   margin-bottom: 1rem;
 }
 
-.columnLeft_2 .tabs {
+.columnLeft_2 .tabs,
+.columnRight_2 .tabs {
   padding: 0 1.5rem;
   margin-bottom: 0.75rem;
 }
 
-.columnLeft_2 .tabs a {
+.columnLeft_2 .tabs a,
+.columnRight_2 .tabs a {
   color: #fff;
   font-size: 0.75rem;
   padding: 0 1.125rem;
 }
 
-.columnLeft_2 .content {
+.columnLeft_2 .content,
+.columnRight_2 .content {
   flex: 1;
   position: relative;
 }
 
-.columnLeft_2 .head {
+.columnLeft_2 .head,
+.columnRight_2 .head {
   background: rgba(255, 255, 255, 0.1);
   font-size: 0.583rem;
   padding: 0.5rem 1.5rem;
@@ -168,26 +175,37 @@
   line-height: 1.05;
 }
 
-.columnLeft_2 .col:nth-child(1) {
-  width: 11.6rem;
+.columnLeft_2 .col:nth-child(1),
+.columnRight_2 .col:nth-child(1) {
+  width: 7.4rem;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
-.columnLeft_2 .col:nth-child(2) {
+.columnLeft_2 .col:nth-child(2),
+.columnRight_2 .col:nth-child(2) {
   width: 3.2rem;
+  text-align: center;
 }
 
-.columnLeft_2 .marquee-view {
+.columnLeft_2 .col:nth-child(3),
+.columnRight_2 .col:nth-child(3) {
+  width: 4.2rem;
+  text-align: right;
+}
+
+.columnLeft_2 .marquee-view,
+.columnRight_2 .marquee-view {
   position: absolute;
   top: 1.6rem;
   bottom: 0;
   width: 100%;
   overflow: hidden;
 }
 
-.columnLeft_2 .row {
+.columnLeft_2 .row,
+.columnRight_2 .row {
   line-height: 1.05;
   padding: 0.5rem 1.5rem;
   color: #fff;
@@ -197,29 +215,24 @@
   justify-content: space-between;
 }
 
-.columnLeft_2 .row:hover {
+.columnLeft_2 .row:hover,
+.columnRight_2 .row:hover {
   color: #68d8ff;
   background: rgba(255, 255, 255, 0.1);
 }
 
-.columnLeft_2 .row:hover .icon-dot {
+.columnLeft_2 .row:hover .icon-dot,
+.columnRight_2 .row:hover .icon-dot {
   opacity: 1;
 }
 
-.columnLeft_2 .icon-dot {
+.columnLeft_2 .icon-dot,
+.columnRight_2 .icon-dot {
   position: absolute;
   left: 0.64rem;
   opacity: 0;
 }
 
-.columnLeft_2 .marquee-view {
-  position: absolute;
-  top: 1.6rem;
-  bottom: 0;
-  width: 100%;
-  overflow: hidden;
-}
-
 /* ------------------------------------------------------------动画 */
 @keyframes row {
   0% {}
@@ -230,13 +243,15 @@
 }
 
 /* 调用动画 */
-.columnLeft_2 .marquee {
+.columnLeft_2 .marquee,
+.columnRight_2 .marquee {
   /* //infinite永久调用动画 */
   animation: row 20s linear infinite;
 }
 
 /*鼠标划入 停止动画  */
-.columnLeft_2 .marquee:hover {
+.columnLeft_2 .marquee:hover,
+.columnRight_2 .marquee:hover {
   animation-play-state: paused;
 }
 
@@ -673,10 +688,10 @@
   align-items: center;
 }
 
-.columnLeft_1 .noUrgent span{
+.columnLeft_1 .noUrgent span {
   font-size: 1.2rem;
 }
 
-.columnLeft_1 .noUrgent h4{
+.columnLeft_1 .noUrgent h4 {
   margin-bottom: 0;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r37417 -r37431
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 37417)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 37431)
@@ -1166,11 +1166,124 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 200 : 230,
+							labelWidth: 180,
 							columnWidth: .25,
-							hidden: SSTS_RealTimeDashboards,
+							hidden: SSTS_WriteSign_manager,
 							items: [{
+								xtype: 'combo',
+								fieldLabel: '手写签名方式',
+								id: 'handWrittenSignatureMode',
+								name: 'handWrittenSignatureMode',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['只允许手写签名'], ['支持扫码加载']]
+								}),
+								forceSelection: true,
+								allowBlank: true,
+								value: '只允许手写签名',
+								triggerAction: 'all'
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 180,
+							columnWidth: .25,
+							hidden: !(sstsConfig.enableInstrumentRepairManagement && sstsConfig.InstrumentRepairManagementVersion == 2),
+							items: [{
+								xtype: 'hidden',
+								id: 'instrumentRepairRemindOrgUnitIds',
+								name: 'instrumentRepairRemindOrgUnitIds'
+							}, {
+								fieldLabel: '器械维修结果提醒科室',
+								anchor: '100%',
+								xtype: 'trigger',
+								name: 'instrumentRepairRemindOrgUnitNames',
+								id: 'instrumentRepairRemindOrgUnitNames',
+								allowBlank: true,
+								blankText: '',
+								msgTarget: 'side',
+								readOnly: true,
+								onTriggerClick: function () {
+									openSelectOrgUnit('instrumentRepairRemindOrgUnit');
+								},
+								triggerClass: 'x-form-search-trigger'
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 270,
+							columnWidth: .25,
+							hidden: !sstsConfig.showCameraPhoto,
+							items: [{
 								xtype: 'numberfield',
+								fieldLabel: '器械包拍摄图片/视频保留时长（天）',
+								id: 'tousseCamImgVidRetentionTime',
+								name: 'tousseCamImgVidRetentionTime',
+								allowDecimals: false,
+								minValue: 1,
+								maxValue: 100000,
+								anchor: '100%',
+								allowBlank: true
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 290,
+							columnWidth: .25,
+							hidden: !sstsConfig.showCameraPhoto,
+							items: [{
+								xtype: 'numberfield',
+								fieldLabel: '外来器械包拍摄图片/视频保留时长（天）',
+								id: 'ftCamImgVidRetentionTime',
+								name: 'ftCamImgVidRetentionTime',
+								allowDecimals: false,
+								minValue: 1,
+								maxValue: 100000,
+								anchor: '100%',
+								allowBlank: true
+							}]
+						}, {
+							layout: 'form',
+							labelWidth: 180,
+							columnWidth: .25,
+							hidden: !sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: '使用记录结算科室取值范围',
+								id: 'useRecordTiSettlementDepart',
+								name: 'useRecordTiSettlementDepart',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['资产归属和病人所在科室'], ['仅病人所在科室']]
+								}),
+								forceSelection: true,
+								allowBlank: true,
+								value: '仅病人所在科室',
+								triggerAction: 'all'
+							}]
+						}
+					]
+				},{
+					xtype: "fieldset",
+					title: '数据实时看板设置',
+					layout: 'column',
+					width: itemWidth,
+					height: 90,
+					labelWidth: fontSize == 12 ? 180 : 210,
+					hidden:SSTS_RealTimeDashboards,
+					items: [
+						{
+							layout: 'form',
+							columnWidth: .25,
+							items: [{
+								xtype: 'numberfield',
 								fieldLabel: '数据实时看板刷新频率（分钟）',
 								id: 'dashboardsRefreshFrequency',
 								name: 'dashboardsRefreshFrequency',
@@ -1190,9 +1303,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 180 : 210,
 							columnWidth: .25,
-							hidden: SSTS_RealTimeDashboards,
 							items: [{
 								xtype: 'combo',
 								fieldLabel: '闲置时将实时看板设为屏保',
@@ -1214,9 +1325,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 200 : 230,
 							columnWidth: .25,
-							hidden: SSTS_RealTimeDashboards,
 							items: [{
 								xtype: 'numberfield',
 								fieldLabel: '无操作切换为闲置（分钟）',
@@ -1238,9 +1347,7 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 200 : 230,
 							columnWidth: .25,
-							hidden: SSTS_RealTimeDashboards,
 							items: [{
 								xtype: 'numberfield',
 								fieldLabel: '数据实时看板待处理查询周期',
@@ -1262,108 +1369,57 @@
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
 							columnWidth: .25,
-							hidden: SSTS_WriteSign_manager,
 							items: [{
 								xtype: 'combo',
-								fieldLabel: '手写签名方式',
-								id: 'handWrittenSignatureMode',
-								name: 'handWrittenSignatureMode',
-								valueField: 'value',
-								displayField: 'value',
+								fieldLabel: '加急物品进行语音播报',
+								id: 'urgentBroadcast',
+								name: 'urgentBroadcast',
+								valueField: 'name',
+								displayField: 'name',
 								mode: 'local',
 								anchor: '100%',
 								editable: false,
 								store: new Ext.data.SimpleStore({
-									fields: ['value'],
-									data: [['只允许手写签名'], ['支持扫码加载']]
+									fields: ['name'],
+									data: [['否'], ['是']]
 								}),
 								forceSelection: true,
-								allowBlank: true,
-								value: '只允许手写签名',
-								triggerAction: 'all'
+								allowBlank: false,
+								value: '否',
+								triggerAction: 'all',
+								listeners:{
+									select: function (combo, record, index) {
+										if (combo.getRawValue() == '否') {
+											Ext.getCmp("urgentBroadcastFrequencyBox").hide();
+										} else {
+											Ext.getCmp("urgentBroadcastFrequencyBox").show();
+										}
+									}
+								}
 							}]
 						}, {
 							layout: 'form',
-							labelWidth: 180,
 							columnWidth: .25,
-							hidden: !(sstsConfig.enableInstrumentRepairManagement && sstsConfig.InstrumentRepairManagementVersion == 2),
+							id:'urgentBroadcastFrequencyBox',
 							items: [{
-								xtype: 'hidden',
-								id: 'instrumentRepairRemindOrgUnitIds',
-								name: 'instrumentRepairRemindOrgUnitIds'
-							}, {
-								fieldLabel: '器械维修结果提醒科室',
-								anchor: '100%',
-								xtype: 'trigger',
-								name: 'instrumentRepairRemindOrgUnitNames',
-								id: 'instrumentRepairRemindOrgUnitNames',
-								allowBlank: true,
-								blankText: '',
-								msgTarget: 'side',
-								readOnly: true,
-								onTriggerClick: function () {
-									openSelectOrgUnit('instrumentRepairRemindOrgUnit');
-								},
-								triggerClass: 'x-form-search-trigger'
-							}]
-						}, {
-							layout: 'form',
-							labelWidth: 270,
-							columnWidth: .25,
-							hidden: !sstsConfig.showCameraPhoto,
-							items: [{
 								xtype: 'numberfield',
-								fieldLabel: '器械包拍摄图片/视频保留时长（天）',
-								id: 'tousseCamImgVidRetentionTime',
-								name: 'tousseCamImgVidRetentionTime',
-								allowDecimals: false,
+								fieldLabel: '加急物品语音播报频率(分钟)',
+								id: 'urgentBroadcastFrequency',
+								name: 'urgentBroadcastFrequency',
 								minValue: 1,
-								maxValue: 100000,
+								value: 30,
+								maxValue: 9999,
+								allowNegative: false,
 								anchor: '100%',
-								allowBlank: true
+								listeners: {
+									blur: function (thiz, e, eOpts) {
+										if (this.value.length > 4) {
+											this.setValue(9999)
+										}
+									}
+								}
 							}]
-						}, {
-							layout: 'form',
-							labelWidth: 290,
-							columnWidth: .25,
-							hidden: !sstsConfig.showCameraPhoto,
-							items: [{
-								xtype: 'numberfield',
-								fieldLabel: '外来器械包拍摄图片/视频保留时长（天）',
-								id: 'ftCamImgVidRetentionTime',
-								name: 'ftCamImgVidRetentionTime',
-								allowDecimals: false,
-								minValue: 1,
-								maxValue: 100000,
-								anchor: '100%',
-								allowBlank: true
-							}]
-						}, {
-							layout: 'form',
-							labelWidth: 180,
-							columnWidth: .25,
-							hidden: !sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction,
-							items: [{
-								xtype: 'combo',
-								fieldLabel: '使用记录结算科室取值范围',
-								id: 'useRecordTiSettlementDepart',
-								name: 'useRecordTiSettlementDepart',
-								valueField: 'value',
-								displayField: 'value',
-								mode: 'local',
-								anchor: '100%',
-								editable: false,
-								store: new Ext.data.SimpleStore({
-									fields: ['value'],
-									data: [['资产归属和病人所在科室'], ['仅病人所在科室']]
-								}),
-								forceSelection: true,
-								allowBlank: true,
-								value: '仅病人所在科室',
-								triggerAction: 'all'
-							}]
 						}
 					]
 				}, {
@@ -3921,12 +3977,17 @@
 					var dashboardsScreenSaver = ''
 					var noOperationTime = ''
 					var dashboardsQueryCycle = '';
+					var urgentBroadcast = '否';
+					var urgentBroadcastFrequency = 30;
 
 					if (!SSTS_RealTimeDashboards) {
 						dashboardsRefreshFrequency = Ext.getCmp("dashboardsRefreshFrequency").getValue();
 						dashboardsScreenSaver = Ext.getCmp("dashboardsScreenSaver").getValue();
 						noOperationTime = Ext.getCmp("noOperationTime").getValue();
 						dashboardsQueryCycle = Ext.getCmp("dashboardsQueryCycle").getValue();
+						//ZJYY-145：新增字段
+						urgentBroadcast = Ext.getCmp("urgentBroadcast").getValue();
+						urgentBroadcastFrequency = Ext.getCmp("urgentBroadcastFrequency").getValue();
 					}
 
 					var handWrittenSignatureMode = '只允许手写签名';
@@ -4043,6 +4104,8 @@
 							quickJumpGroupStorage: quickJumpGroupStorage,
 							noOperationTime: noOperationTime,
 							dashboardsQueryCycle: dashboardsQueryCycle,
+							urgentBroadcast: urgentBroadcast,
+							urgentBroadcastFrequency: urgentBroadcastFrequency,
 							handWrittenSignatureMode: handWrittenSignatureMode,
 							instrumentRepairRemindOrgUnitIds: instrumentRepairRemindOrgUnitIds,
 							instrumentRepairRemindOrgUnitNames: instrumentRepairRemindOrgUnitNames,
@@ -4331,6 +4394,19 @@
 			if (supplyRoomConfig.dashboardsQueryCycle) {
 				Ext.getCmp('dashboardsQueryCycle').setValue(supplyRoomConfig.dashboardsQueryCycle);
 			}
+			if (supplyRoomConfig.urgentBroadcast) {
+				Ext.getCmp('urgentBroadcast').setValue(supplyRoomConfig.urgentBroadcast);
+				if(supplyRoomConfig.urgentBroadcast == '是'){
+					Ext.getCmp("urgentBroadcastFrequencyBox").show();
+				}else {
+					Ext.getCmp("urgentBroadcastFrequencyBox").hide();
+				}
+			}else {
+				Ext.getCmp("urgentBroadcastFrequencyBox").hide();
+			}
+			if (supplyRoomConfig.urgentBroadcastFrequency) {
+				Ext.getCmp('urgentBroadcastFrequency').setValue(supplyRoomConfig.urgentBroadcastFrequency);
+			}
 			if (!SSTS_WriteSign_manager) {
 				Ext.getCmp('handWrittenSignatureMode').setValue(supplyRoomConfig.handWrittenSignatureMode || '');
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/index.jsp
===================================================================
diff -u -r35501 -r37431
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 35501)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/index.jsp	(.../index.jsp)	(revision 37431)
@@ -9,6 +9,8 @@
     SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
     SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj();
     request.setAttribute("dashboardsRefreshFrequency", syscfg.getDashboardsRefreshFrequency());
+    request.setAttribute("urgentBroadcast", syscfg.getUrgentBroadcast());
+    request.setAttribute("urgentBroadcastFrequency", syscfg.getUrgentBroadcastFrequency());
 %>
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -18,10 +20,13 @@
 </head>
 <script>
   var dashboardsRefreshFrequency = '${dashboardsRefreshFrequency}';
+  var urgentBroadcast = '${urgentBroadcast}';
+  var urgentBroadcastFrequency = '${urgentBroadcastFrequency}';
   var WWWROOT = '${ctx}';
 </script>
 <link href="css/index.css" rel="stylesheet">
 <link rel="stylesheet" href="./fonts/icomoon.css">
+<script type="text/javascript" src="${ctx}/js/speaker.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="../config.js?version=${svnRevision}"></script>
 <body>
@@ -32,43 +37,20 @@
       <div class="column">
           <div class="panel columnLeft_1">
               <div class="inner urgent" style="top: -2.5rem;">
-                  <div class="item">
-                      <h4 id="invoicedAmount">0</h4>
-                      <span style="color: #fff">
-                          <i class="icon-dot" style="color: #006cff"></i>
-                          今日已处理物品
-                      </span>
+                  <div class="item" style="line-height: 75px;">
+                      <img src="images/user.png" style="vertical-align: middle;width: 50px;height: 50px;" />
+                      <span style="color: #fff;vertical-align: middle;font-size: 26px;margin-left: 20px;">在线人数：<label id="onlineUserAmount"></label></span>
                   </div>
-                  <div class="item">
-                      <h4 id="toBeInvoiceUrgentAmount" style="color: #ed3f35">0</h4>
-                      <span style="color: #fff">
-                          <i class="icon-dot" style="color: #ed3f35"></i>
-                          待处理加急物品
-                      </span>
-                  </div>
-                  <div class="item">
-                      <h4 id="invoicedUrgentAmount">0</h4>
-                      <span style="color: #fff">
-                          <i class="icon-dot" style="color: #6acca3"></i>
-                          已处理加急物品
-                      </span>
-                  </div>
               </div>
-              <div class="inner noUrgent">
-                  <span style="color: #fff">
-                    <i class="icon-dot" style="color: #006cff"></i>
-                    今日已处理物品
-                  </span>
-                  <h4 id="invoicedAmount">0</h4>
-              </div>
           </div>
           <div class="panel columnLeft_2">
               <div class="inner">
-                  <h3>本日设备使用情况</h3>
+                  <h3>今日设备使用情况</h3>
                   <div class="content">
                       <div class="head">
                           <span class="col">设备名称</span>
                           <span class="col">当前状态</span>
+                          <span class="col">预计结束时间</span>
                       </div>
                       <div class="marquee-view">
                           <div class="marquee" id="equipment">
@@ -82,15 +64,15 @@
       <div class="column">
           <div class="panel columnCenter">
               <div class="inner">
-                  <h3>今日器械包处理量</h3>
+                  <h3>今日器械包汇总</h3>
                   <div class="chart">
                       <div class="bar" id="histogramChart"></div>
                   </div>
               </div>
           </div>
           <div class="panel columnCenter">
               <div class="inner">
-                  <h3>外来器械包汇总</h3>
+                  <h3>今日外来器械包汇总</h3>
                   <div class="chart">
                       <div class="bar" id="histogramChart2"></div>
                   </div>
@@ -110,16 +92,32 @@
               </div>
           </div>
           <div class="panel columnRight columnRight_2">
-              <div class="inner">
-                  <h3>在线人数</h3>
-                  <div class="chart" style="position: relative;">
-                      <div class="bar" id="gauge" style="height: 9rem"></div>
-                  </div>
+                <div class="inner">
+                    <h3 style="margin-right: 1.5rem;">待发货加急物品列表
+                        <a id="playEnabled" href="javascript:void(0)" onclick="playDisabled()" style="display: none">
+                        <img src="images/playEnabled.png" style="vertical-align: middle;height: 25px;float: right;"  />
+                        </a>
+                        <a id="playDisabled" href="javascript:void(0)" onclick="playEnabled()" style="display: none">
+                            <img src="images/playDisabled.png" style="vertical-align: middle;height: 25px;float: right;"  />
+                        </a>
+                    </h3>
+                  <div class="content">
+                    <div class="head">
+                        <span class="col">物品名称</span>
+                        <span class="col">加急级别</span>
+                        <span class="col">加急数量</span>
+                    </div>
+                    <div class="marquee-view">
+                        <div class="marquee" id="urgentSum">
+                            
+                        </div>
+                    </div>
+                </div>
               </div>
           </div>
           <div class="panel columnRight columnRight_3">
               <div class="inner">
-                  <h3>本日工作量统计</h3>
+                  <h3>今日工作量统计</h3>
                   <div class="chart">
                       <div class="bar" id="line" style="height: 14rem"></div>
                   </div>
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/realTimeDashboards/images/logo.png
===================================================================
diff -u -r35501 -r37431
Binary files differ