diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
index 557100dc..cc72eb4f 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs
@@ -99,7 +99,8 @@ public class BusinessPlacesController : ControllerBase
///
///
///
- public async Task GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
+ [HttpGet("devicenos")]
+ public async Task> GetDevicesByCode([FromQuery]BusinessPlaceGetByCodeRequest request)
{
return await _businessPlaceShiftService.GetDevicesByCode(request);
}
diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
index 7aaa6060..5177dd0c 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs
@@ -1,8 +1,9 @@
-using System.ComponentModel.DataAnnotations;
+using Kurisu.Core.DataAccess.Dto;
+using System.ComponentModel.DataAnnotations;
namespace Dlhis.Basic.BusinessPlace.Request
{
- public class BusinessPlaceGetByCodeRequest
+ public class BusinessPlaceGetByCodeRequest : PageDto
{
///
/// 营业点号
diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs b/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
index fb7d0426..0841c315 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs
@@ -2,5 +2,7 @@
{
public class DeviceCodeNameDetail
{
+ public string UniqueNo { get; set; }
+ public string UniqueName { get; set; }
}
}
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
index 70b32573..3a88f5db 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs
@@ -18,5 +18,5 @@ public interface IBusinessPlaceShiftService : IScopeDependency
Task GetShiftsByPlaceCustomCodeAsync(string placeCustomCode);
- Task GetDevicesByCode(BusinessPlaceGetByCodeRequest request);
+ Task> GetDevicesByCode(BusinessPlaceGetByCodeRequest request);
}
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
index ec61ffb4..a0636ae0 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
@@ -3,6 +3,7 @@ using Dlhis.Basic.BusinessPlace.Response;
using Dlhis.Basic.BusinessShift.Request;
using Dlhis.Basic.BusinessShift.Response;
using Dlhis.Entity.Basic.Entity;
+using Dlhis.Entity.Device.Entities;
using Dlhis.Sys.Api;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.CustomClass;
@@ -189,9 +190,33 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
};
}
- public async Task> GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
+ public async Task> GetDevicesByCode(BusinessPlaceGetByCodeRequest request)
{
+ var regiss = await _dbContext.Queryable()
+ .Where(x => x.BusinessPlaceCode.ToString() == request.Code)
+ .ToListAsync();
+ var devices = await _dbContext.Queryable().ToListAsync();
+
+ var list = new List();
+ if (regiss.Count > 0)
+ {
+ foreach (var regis in regiss)
+ {
+ var device = devices.Where(x => x.UniqueNo == regis.DeviceUniqueNo)
+ .FirstOrDefault();
+ if (device != null)
+ {
+ var detail = new DeviceCodeNameDetail
+ {
+ UniqueNo = regis.DeviceUniqueNo,
+ UniqueName = device.Supplier
+ };
+ list.Add(detail);
+ }
+ }
+ }
+ return list;
}
//*********************************************** help methods ***************************************************//