From 572c0f9772420c36adb57f17f826adadde79aad1 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 15 May 2024 18:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MyUser/ListByOperatorTypeDto.cs | 2 ++
.../MyUser/OperatorTypeIuputDto.cs | 4 ++--
src/Shentun.Peis.Application/MyUser/MyUserAppService.cs | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Shentun.Peis.Application.Contracts/MyUser/ListByOperatorTypeDto.cs b/src/Shentun.Peis.Application.Contracts/MyUser/ListByOperatorTypeDto.cs
index f1ff68a..21e8273 100644
--- a/src/Shentun.Peis.Application.Contracts/MyUser/ListByOperatorTypeDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/MyUser/ListByOperatorTypeDto.cs
@@ -25,5 +25,7 @@ namespace Shentun.Peis.MyUser
/// 快捷码
///
public string SimpleCode { get; set; }
+
+
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/MyUser/OperatorTypeIuputDto.cs b/src/Shentun.Peis.Application.Contracts/MyUser/OperatorTypeIuputDto.cs
index 009d85f..bf07d04 100644
--- a/src/Shentun.Peis.Application.Contracts/MyUser/OperatorTypeIuputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/MyUser/OperatorTypeIuputDto.cs
@@ -7,8 +7,8 @@ namespace Shentun.Peis.MyUser
public class OperatorTypeIuputDto
{
///
- /// 用户操作类别 0-操作员,1-医生,2-总检医生,3-医生和总检医生
+ /// 用户操作类别集合 0-操作员,1-医生,2-总检医生,3-医生和总检医生
///
- public char OperatorType { get; set; }
+ public List OperatorTypes { get; set; }
}
}
diff --git a/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs b/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs
index 6a865c8..d2dd25c 100644
--- a/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs
+++ b/src/Shentun.Peis.Application/MyUser/MyUserAppService.cs
@@ -313,7 +313,7 @@ namespace Shentun.Peis.MyUser
public async Task> GetListByOperatorTypeAsync(OperatorTypeIuputDto input)
{
var entlist = await _identityUserRepository.GetListAsync();
- var entlistDto = entlist.Select(s => new ListByOperatorTypeDto
+ var entlistDto = entlist.Where(m => input.OperatorTypes.Contains(m.GetProperty("operator_type"))).Select(s => new ListByOperatorTypeDto
{
Id = s.Id,
SimpleCode = LanguageConverter.GetPYSimpleCode(s.Surname),
@@ -473,7 +473,7 @@ namespace Shentun.Peis.MyUser
var ent = await UserManager.GetByIdAsync(id);
var userSign = ent.GetProperty("user_sign");
var userPhoto = ent.GetProperty("user_photo");
- var operatorType = ent.GetProperty("operator_type");
+ var operatorType = ent.GetProperty("operator_type");
var entDto = ObjectMapper.Map(ent);
entDto.UserPhoto = userPhoto;
entDto.UserSign = userSign;