diff --git a/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
index 73174e7..51cd334 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/dev/DevicePerformanceController.cs
@@ -74,10 +74,6 @@ namespace DOAN.Admin.WebApi.Controllers
 				data = "填写日期不能重复";
 
 			}
-			else if (response == -2)
-			{
-				data = "填写日期不能为空";
-			}
 			else
 			{
 				data = "成功";
diff --git a/DOAN.Service/MES/dev/DevicePerformanceService.cs b/DOAN.Service/MES/dev/DevicePerformanceService.cs
index 2e2f6f7..c966acd 100644
--- a/DOAN.Service/MES/dev/DevicePerformanceService.cs
+++ b/DOAN.Service/MES/dev/DevicePerformanceService.cs
@@ -174,11 +174,28 @@ namespace DOAN.Service.MES.dev
                 model.ComprehensiveEquipmentOperatingRate = 0;
 
 			}
-            //MTBF(设备实际运行时间/故障总次数/60
-            model.Mtbf = Math.Round((model.DeviceActualRuntime / model.FaultShutdownQuantity??0) / 60,2);
 
-            //MTTR（设备故障停机时间/故障总次数）
-            model.Mttr = Math.Round(model.AccidentDeviceFailureTime / model.FaultShutdownQuantity ?? 0, 2);
+            if (model.FaultShutdownQuantity != null && model.FaultShutdownQuantity.Value != 0)
+            {
+                //MTBF(设备实际运行时间/故障总次数/60
+                model.Mtbf = Math.Round((model.DeviceActualRuntime / model.FaultShutdownQuantity.Value) / 60, 2);
+            }
+            else
+            {
+                model.Mtbf = 0;
+
+			}
+
+            if (model.FaultShutdownQuantity != null && model.FaultShutdownQuantity.Value != 0)
+            {
+				//MTTR（设备故障停机时间/故障总次数）
+				model.Mttr = Math.Round(model.AccidentDeviceFailureTime / model.FaultShutdownQuantity.Value, 2);
+			}
+            else
+            {
+				model.Mtbf = 0;
+			}
+          
 
 
         }