diff --git a/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs b/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs
deleted file mode 100644
index 982077ad..00000000
--- a/Src/Dlhis.Basic/Device/Dtos/DeviceTimePeriodDto.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Dlhis.Basic.Device.Dtos;
-
-public class DeviceTimePeriodDto
-{
- public int CardType { get; set; }
- public TimeOnly OnStart { get; set; }
- public TimeOnly OnEnd { get; set; }
-
- public TimeOnly OffStart { get; set; }
- public TimeOnly OffEnd { get; set; }
-}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
index ffec74b3..31f98c05 100644
--- a/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DeviceTimePeriodSaveRequest.cs
@@ -1,9 +1,10 @@
using System.ComponentModel.DataAnnotations;
using Dlhis.Entity.Device.Enums;
+using Dlhis.Entity.Device.Models;
namespace Dlhis.Basic.Device.Request;
-public class DeviceTimePeriodSaveRequest : IValidatableObject
+public class DeviceTimePeriodSaveRequest
{
public long? Id { get; set; }
diff --git a/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
index 70266d5d..23dd992c 100644
--- a/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
@@ -3,9 +3,12 @@ using Dlhis.Entity.Device.Models;
namespace Dlhis.Basic.Device.Response;
-public class DeviceTimePeriodResponse
+public class DeviceTimePeriodResponse
{
- public long Id { get; set; }
+ ///
+ /// 名称
+ ///
+ public string Name { get; set; }
///
/// 名称
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
index e05a706d..1ab79451 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
@@ -1,4 +1,3 @@
-using Dlhis.Basic.Device.Dtos;
using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Device.Response;
using Dlhis.Entity.Basic.Entity;
@@ -27,7 +26,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
{
var pageOri = await _dbContext.Queryable()
.Where(x => x.AssignType == request.AssignType)
- .Select()
.ToPageListAsync(request);
var page = pageOri.Adapt>();
@@ -195,7 +193,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
.Where(item => item.AssignType == DeviceTimePeriodAssignEnumType.Device && item.Value == x.Code)
.ToList();
-
foreach (var setting in dSettings)
{
var s = tSettings.FirstOrDefault(item => item.CardType == setting.CardType);