diff --git a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
index 2473187e..a3185d21 100644
--- a/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
+++ b/Src/Dlhis.Basic/Appointment/Response/AppointmentDetailResponse.cs
@@ -73,18 +73,7 @@ public class AppointmentDetailResponse
///
/// 申请车间区域
///
- public List ApplyWorkplaceAreas
- {
- get
- {
- return ApplyWorkplaceAreasString.IsPresent()
- ? ApplyWorkplaceAreasString.ToObject>()
- : new List(0);
- }
- }
-
- [JsonIgnore]
- public string ApplyWorkplaceAreasString { get; set; }
+ public List ApplyWorkplaceAreas { get; set; }
///
/// 车间访问开始
diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
index 26d1fd17..f6062de7 100644
--- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
@@ -65,11 +65,11 @@ public class AppointmentService : IAppointmentService
Phone = x.Phone,
LicensePlate = x.LicensePlate,
IsEnterDoorArea = x.IsEnterDoorArea,
- ApplyDoorArea = x.ApplyDoorArea,
+ ApplyDoorArea = SqlFunc.Subqueryable().Where(p => p.CustomCode == x.ApplyDoorArea).Select(p => p.Name),
DoorStart = x.DoorStart,
DoorEnd = x.DoorEnd,
IsEnterWorkplace = x.IsEnterWorkplace,
- ApplyWorkplaceAreasString = x.ApplyWorkplaceAreas.ToString(),
+ ApplyWorkplaceAreas = SqlFunc.Subqueryable().Where(p => x.ApplyWorkplaceAreas.ToString().Contains(p.CustomCode)).ToList(p => p.Name),
WorkplaceStart = x.WorkplaceStart,
WorkplaceEnd = x.WorkplaceEnd,
ImageUrl = x.ImageUrl,
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index f756443d..ee020843 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -173,7 +173,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
Id = x.Id,
OriginUserUniqueNo = x.UserUniqueNo,
- OutsourceSupplier = device.Supplier,
+ OutsourceSupplier = os.Supplier,
SapUserCode = os.SapCode,
SapUserName = SqlFunc.Subqueryable().Where(p => p.Code == os.SapCode).Select(p => p.Name),
DeviceUniqueNo = x.DeviceUniqueNo,