From 2d41802340065ffead5056ddc919a53fa07461ba Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Mon, 1 Apr 2024 18:21:29 +0800 Subject: [PATCH] RegisterCheckAsbitem --- .../CreatePatientRegisterDto.cs | 4 +- .../CancelMergeRegisterCheckAsbitemDto.cs} | 2 +- .../CreateRegisterCheckAsbitemDto.cs} | 2 +- ...gisterCheckAsbitemInCustomerOrgManyDto.cs} | 4 +- .../CreateRegisterCheckAsbitemManyDto.cs} | 4 +- ...gisterCheckAsbitemInCustomerOrgManyDto.cs} | 2 +- .../DeleteRegisterCheckAsbitemManyDto.cs} | 2 +- .../GetMergeRegisterCheckAsbitemListDto.cs} | 2 +- ...isterCheckAsbitemCheckStatusRequestDto.cs} | 2 +- ...gisterCheckAsbitemCheckStatusResultDto.cs} | 2 +- .../MergeRegisterCheckAsbitemDto.cs} | 2 +- .../RegisterCheckAsbitemChargeBackDto.cs} | 2 +- .../RegisterCheckAsbitemChargeDto.cs} | 2 +- ...isterCheckAsbitemCheckChargeRequestDto.cs} | 2 +- .../RegisterCheckAsbitemDto.cs} | 2 +- .../RegisterCheckAsbitemOrAsbitemDto.cs} | 2 +- .../UpdateRegisterCheckAsbitemDto.cs} | 2 +- .../UpdateRegisterCheckAsbitemManyDto.cs} | 4 +- .../PatientRegisterAppService.cs | 2 +- .../PeisApplicationAutoMapperProfile.cs | 6 +- .../RegisterCheckAsbitemAppService.cs} | 86 +++++++++---------- .../RegisterCheckAsbitemDbMapping.cs} | 2 +- .../EntityFrameworkCore/PeisDbContext.cs | 2 +- ... => RegisterCheckAsbitemAppServiceTest.cs} | 8 +- 24 files changed, 75 insertions(+), 75 deletions(-) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/CancelMergeRegisterAsbitemDto.cs => RegisterCheckAsbitems/CancelMergeRegisterCheckAsbitemDto.cs} (88%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/CreateRegisterAsbitemDto.cs => RegisterCheckAsbitems/CreateRegisterCheckAsbitemDto.cs} (96%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/CreateRegisterAsbitemInCustomerOrgManyDto.cs => RegisterCheckAsbitems/CreateRegisterCheckAsbitemInCustomerOrgManyDto.cs} (68%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/CreateRegisterAsbitemManyDto.cs => RegisterCheckAsbitems/CreateRegisterCheckAsbitemManyDto.cs} (78%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/DeleteRegisterAsbitemInCustomerOrgManyDto.cs => RegisterCheckAsbitems/DeleteRegisterCheckAsbitemInCustomerOrgManyDto.cs} (89%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/DeleteRegisterAsbitemManyDto.cs => RegisterCheckAsbitems/DeleteRegisterCheckAsbitemManyDto.cs} (78%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/GetMergeRegisterAsbitemListDto.cs => RegisterCheckAsbitems/GetMergeRegisterCheckAsbitemListDto.cs} (95%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/GetRegisterAsbitemCheckStatusRequestDto.cs => RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusRequestDto.cs} (95%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/GetRegisterAsbitemCheckStatusResultDto.cs => RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusResultDto.cs} (97%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/MergeRegisterAsbitemDto.cs => RegisterCheckAsbitems/MergeRegisterCheckAsbitemDto.cs} (89%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/RegisterAsbitemChargeBackDto.cs => RegisterCheckAsbitems/RegisterCheckAsbitemChargeBackDto.cs} (94%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/RegisterAsbitemChargeDto.cs => RegisterCheckAsbitems/RegisterCheckAsbitemChargeDto.cs} (91%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/RegisterAsbitemChargeRequestDto.cs => RegisterCheckAsbitems/RegisterCheckAsbitemCheckChargeRequestDto.cs} (96%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/RegisterAsbitemDto.cs => RegisterCheckAsbitems/RegisterCheckAsbitemDto.cs} (95%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/RegisterAsbitemOrAsbitemDto.cs => RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs} (96%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/UpdateRegisterAsbitemDto.cs => RegisterCheckAsbitems/UpdateRegisterCheckAsbitemDto.cs} (94%) rename src/Shentun.Peis.Application.Contracts/{RegisterAsbitems/UpdateRegisterAsbitemManyDto.cs => RegisterCheckAsbitems/UpdateRegisterCheckAsbitemManyDto.cs} (76%) rename src/Shentun.Peis.Application/{RegisterAsbitems/RegisterAsbitemAppService.cs => RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs} (90%) rename src/Shentun.Peis.EntityFrameworkCore/DbMapping/{RegisterAsbitems/RegisterAsbitemDbMapping.cs => RegisterCheckAsbitems/RegisterCheckAsbitemDbMapping.cs} (96%) rename test/Shentun.Peis.Application.Tests/{RegisterAsbitemAppServiceTest.cs => RegisterCheckAsbitemAppServiceTest.cs} (80%) diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs index d21127e..09d8be2 100644 --- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterDto.cs @@ -245,10 +245,10 @@ namespace Shentun.Peis.PatientRegisters #endregion - public List RegisterAsbitems { get; set; } + public List RegisterAsbitems { get; set; } public CreatePatientRegisterDto() { - RegisterAsbitems = new List(); + RegisterAsbitems = new List(); } } } diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CancelMergeRegisterAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CancelMergeRegisterCheckAsbitemDto.cs similarity index 88% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CancelMergeRegisterAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CancelMergeRegisterCheckAsbitemDto.cs index a656677..1f921c7 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CancelMergeRegisterAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CancelMergeRegisterCheckAsbitemDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class CancelMergeRegisterAsbitemDto + public class CancelMergeRegisterCheckAsbitemDto { /// /// RegisterCheckIds 集合 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemDto.cs similarity index 96% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemDto.cs index 37aa1fb..0a8885c 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemDto.cs @@ -5,7 +5,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class CreateRegisterAsbitemDto + public class CreateRegisterCheckAsbitemDto { /// /// 组合项目 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemInCustomerOrgManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemInCustomerOrgManyDto.cs similarity index 68% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemInCustomerOrgManyDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemInCustomerOrgManyDto.cs index 135ab51..0cdd1d5 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemInCustomerOrgManyDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemInCustomerOrgManyDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class CreateRegisterAsbitemInCustomerOrgManyDto + public class CreateRegisterCheckAsbitemInCustomerOrgManyDto { /// /// 体检中心ID @@ -14,6 +14,6 @@ namespace Shentun.Peis.RegisterAsbitems /// /// RegisterAsbitem信息 /// - public List createRegisterAsbitemDtos { get; set;} + public List createRegisterAsbitemDtos { get; set;} } } diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemManyDto.cs similarity index 78% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemManyDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemManyDto.cs index 4697f71..f86b6cf 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/CreateRegisterAsbitemManyDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/CreateRegisterCheckAsbitemManyDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class CreateRegisterAsbitemManyDto + public class CreateRegisterCheckAsbitemManyDto { /// /// 体检中心ID @@ -14,7 +14,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// /// - public List RegisterAsbitems { get; set; } + public List RegisterAsbitems { get; set; } /// /// 是否需要启用自动合并项目逻辑(Y N) 默认合并Y diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemInCustomerOrgManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemInCustomerOrgManyDto.cs similarity index 89% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemInCustomerOrgManyDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemInCustomerOrgManyDto.cs index a765688..cae139e 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemInCustomerOrgManyDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemInCustomerOrgManyDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class DeleteRegisterAsbitemInCustomerOrgManyDto + public class DeleteRegisterCheckAsbitemInCustomerOrgManyDto { /// /// 是否删除登记的分组（Y/N） diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemManyDto.cs similarity index 78% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemManyDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemManyDto.cs index d9a0dbe..53d0f10 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/DeleteRegisterAsbitemManyDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/DeleteRegisterCheckAsbitemManyDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class DeleteRegisterAsbitemManyDto + public class DeleteRegisterCheckAsbitemManyDto { public List RegisterAsbitemIds { get; set; } } diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetMergeRegisterAsbitemListDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetMergeRegisterCheckAsbitemListDto.cs similarity index 95% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetMergeRegisterAsbitemListDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetMergeRegisterCheckAsbitemListDto.cs index cb6938c..8f95518 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetMergeRegisterAsbitemListDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetMergeRegisterCheckAsbitemListDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class GetMergeRegisterAsbitemListDto + public class GetMergeRegisterCheckAsbitemListDto { public Guid RegisterAsbitemId { get; set; } diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusRequestDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusRequestDto.cs similarity index 95% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusRequestDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusRequestDto.cs index 5cad4e4..c29170a 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusRequestDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusRequestDto.cs @@ -9,7 +9,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// 请求参数 /// - public class GetRegisterAsbitemCheckStatusRequestDto + public class GetRegisterCheckAsbitemCheckStatusRequestDto { /// /// 单位ID 需要遍历找下级的ID diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusResultDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusResultDto.cs similarity index 97% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusResultDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusResultDto.cs index 2e913da..ebbf896 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/GetRegisterAsbitemCheckStatusResultDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/GetRegisterCheckAsbitemCheckStatusResultDto.cs @@ -9,7 +9,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// 返回参数 /// - public class GetRegisterAsbitemCheckStatusResultDto + public class GetRegisterCheckAsbitemCheckStatusResultDto { /// /// 组合项目名称 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/MergeRegisterAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/MergeRegisterCheckAsbitemDto.cs similarity index 89% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/MergeRegisterAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/MergeRegisterCheckAsbitemDto.cs index 0ff73d1..7a99a9e 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/MergeRegisterAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/MergeRegisterCheckAsbitemDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class MergeRegisterAsbitemDto + public class MergeRegisterCheckAsbitemDto { /// /// 包含所有新旧一起 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeBackDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeBackDto.cs similarity index 94% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeBackDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeBackDto.cs index c6d99ce..7c6c9de 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeBackDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeBackDto.cs @@ -6,7 +6,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class RegisterAsbitemChargeBackDto + public class RegisterCheckAsbitemChargeBackDto { /// /// 收据号 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeDto.cs similarity index 91% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeDto.cs index 345700e..e3e06fa 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemChargeDto.cs @@ -4,7 +4,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class RegisterAsbitemChargeDto + public class RegisterCheckAsbitemChargeDto { /// /// 状态 1.成功 -1 失败 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeRequestDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemCheckChargeRequestDto.cs similarity index 96% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeRequestDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemCheckChargeRequestDto.cs index 9cf35e5..deac371 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemChargeRequestDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemCheckChargeRequestDto.cs @@ -5,7 +5,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class RegisterAsbitemChargeRequestDto + public class RegisterCheckAsbitemCheckChargeRequestDto { /// /// 登记主表ID diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemDto.cs similarity index 95% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemDto.cs index 6920a7b..6a1efe4 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemDto.cs @@ -6,7 +6,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class RegisterAsbitemDto:AuditedEntityDtoName + public class RegisterCheckAsbitemDto:AuditedEntityDtoName { /// /// 组合项目 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemOrAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs similarity index 96% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemOrAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs index 6188f32..6147dda 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/RegisterAsbitemOrAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/RegisterCheckAsbitemOrAsbitemDto.cs @@ -6,7 +6,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class RegisterAsbitemOrAsbitemDto : AuditedEntityDtoName + public class RegisterCheckAsbitemOrAsbitemDto : AuditedEntityDtoName { /// /// 组合项目 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemDto.cs similarity index 94% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemDto.cs index bba64d8..163ff45 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemDto.cs @@ -5,7 +5,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class UpdateRegisterAsbitemDto + public class UpdateRegisterCheckAsbitemDto { /// /// 实收价格 diff --git a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemManyDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemManyDto.cs similarity index 76% rename from src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemManyDto.cs rename to src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemManyDto.cs index c43eab1..972c8cd 100644 --- a/src/Shentun.Peis.Application.Contracts/RegisterAsbitems/UpdateRegisterAsbitemManyDto.cs +++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckAsbitems/UpdateRegisterCheckAsbitemManyDto.cs @@ -5,7 +5,7 @@ using System.Text; namespace Shentun.Peis.RegisterAsbitems { - public class UpdateRegisterAsbitemManyDto + public class UpdateRegisterCheckAsbitemManyDto { /// /// 检查组合项目记录ID @@ -15,6 +15,6 @@ namespace Shentun.Peis.RegisterAsbitems /// /// 更新内容 /// - public UpdateRegisterAsbitemDto input { get; set; } + public UpdateRegisterCheckAsbitemDto input { get; set; } } } diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index acbb54d..33cb064 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -575,7 +575,7 @@ namespace Shentun.Peis.PatientRegisters var createEntity = ObjectMapper.Map(input); var createPatientEntity = ObjectMapper.Map(input); - var registerAsbitems = ObjectMapper.Map, List>(input.RegisterAsbitems); + var registerAsbitems = ObjectMapper.Map, List>(input.RegisterAsbitems); //创建人员信息 Patient patient = null; if (createEntity.PatientId == Guid.Empty) diff --git a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs index 68bf6ab..379acf7 100644 --- a/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs +++ b/src/Shentun.Peis.Application/PeisApplicationAutoMapperProfile.cs @@ -362,9 +362,9 @@ public class PeisApplicationAutoMapperProfile : Profile - CreateMap(); - CreateMap(); - CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); CreateMap(); CreateMap(); diff --git a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs similarity index 90% rename from src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs rename to src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs index 5423d09..c899af3 100644 --- a/src/Shentun.Peis.Application/RegisterAsbitems/RegisterAsbitemAppService.cs +++ b/src/Shentun.Peis.Application/RegisterCheckAsbitems/RegisterCheckAsbitemAppService.cs @@ -32,10 +32,10 @@ namespace Shentun.Peis.RegisterAsbitems /// [ApiExplorerSettings(GroupName = "Work")] [Authorize] - public class RegisterAsbitemAppService : ApplicationService + public class RegisterCheckAsbitemAppService : ApplicationService { private readonly IRepository _userRepository; - private readonly IRepository _registerAsbitemRepository; + private readonly IRepository _registerCheckAsbitemRepository; private readonly IRepository _asbitemRepository; private readonly IRepository _itemTypeRepository; private readonly IRepository _registerCheckRepository; @@ -57,7 +57,7 @@ namespace Shentun.Peis.RegisterAsbitems private readonly RegisterCheckAsbitemManager _registerAsbitemManager; private readonly CardBillManager _cardBillManager; private readonly CacheService _cacheService; - public RegisterAsbitemAppService( + public RegisterCheckAsbitemAppService( IRepository userRepository, IRepository registerAsbitemRepository, IRepository asbitemRepository, @@ -83,7 +83,7 @@ namespace Shentun.Peis.RegisterAsbitems CacheService cacheService) { this._userRepository = userRepository; - this._registerAsbitemRepository = registerAsbitemRepository; + this._registerCheckAsbitemRepository = registerAsbitemRepository; this._asbitemRepository = asbitemRepository; this._itemTypeRepository = itemTypeRepository; this._registerCheckRepository = registerCheckRepository; @@ -143,9 +143,9 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/createregisterasbitemmany")] - public async Task> CreateRegisterAsbitemManyAsync(CreateRegisterAsbitemManyDto input) + public async Task> CreateRegisterAsbitemManyAsync(CreateRegisterCheckAsbitemManyDto input) { - var createList = ObjectMapper.Map, List>(input.RegisterAsbitems); + var createList = ObjectMapper.Map, List>(input.RegisterAsbitems); if (!createList.Any()) throw new UserFriendlyException($"请求参数为空"); @@ -157,7 +157,7 @@ namespace Shentun.Peis.RegisterAsbitems dtolist.Add(await _registerAsbitemManager.CreateAsync(input.OrganizationUnitId, entity, input.IsAutoMerger == 'Y' ? true : false)); } - return ObjectMapper.Map, List>(dtolist); + return ObjectMapper.Map, List>(dtolist); } @@ -182,7 +182,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/deletemany")] - public async Task DeleteManyAsync(DeleteRegisterAsbitemManyDto input) + public async Task DeleteManyAsync(DeleteRegisterCheckAsbitemManyDto input) { if (!input.RegisterAsbitemIds.Any()) throw new UserFriendlyException($"请求参数为空"); @@ -199,20 +199,20 @@ namespace Shentun.Peis.RegisterAsbitems /// [HttpPost("api/app/registerasbitem/update")] [RemoteService(false)] - public async Task UpdateAsync(Guid RegisterAsbitemId, UpdateRegisterAsbitemDto input) + public async Task UpdateAsync(Guid RegisterAsbitemId, UpdateRegisterCheckAsbitemDto input) { - var oldent = await _registerAsbitemRepository.GetAsync(RegisterAsbitemId); + var oldent = await _registerCheckAsbitemRepository.GetAsync(RegisterAsbitemId); if (oldent == null) { throw new UserFriendlyException($"请求参数有误"); } - var dtoent = ObjectMapper.Map(input); + var dtoent = ObjectMapper.Map(input); _registerAsbitemManager.UpdateAsync(dtoent, oldent); - var newent = await _registerAsbitemRepository.UpdateAsync(oldent); + var newent = await _registerCheckAsbitemRepository.UpdateAsync(oldent); - return ObjectMapper.Map(newent); + return ObjectMapper.Map(newent); } @@ -224,7 +224,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/updatemany")] - public async Task> UpdateManyAsync(List inputlist) + public async Task> UpdateManyAsync(List inputlist) { if (!inputlist.Any()) @@ -234,21 +234,21 @@ namespace Shentun.Peis.RegisterAsbitems foreach (var item in inputlist) { - var oldent = await _registerAsbitemRepository.GetAsync(item.RegisterAsbitemId); + var oldent = await _registerCheckAsbitemRepository.GetAsync(item.RegisterAsbitemId); if (oldent == null) { throw new UserFriendlyException($"请求参数有误"); } var dtoent = new RegisterCheckAsbitem(); - dtoent = ObjectMapper.Map(item.input); + dtoent = ObjectMapper.Map(item.input); _registerAsbitemManager.UpdateAsync(dtoent, oldent); updatemany.Add(oldent); } - await _registerAsbitemRepository.UpdateManyAsync(updatemany, true); + await _registerCheckAsbitemRepository.UpdateManyAsync(updatemany, true); - return ObjectMapper.Map, List>(updatemany); + return ObjectMapper.Map, List>(updatemany); } @@ -259,16 +259,16 @@ namespace Shentun.Peis.RegisterAsbitems /// 人员登记表ID /// [HttpGet("api/app/registerasbitem/getlistinpatientregisterid")] - public async Task> GetListInPatientRegisterIdAsync(Guid PatientRegisterId) + public async Task> GetListInPatientRegisterIdAsync(Guid PatientRegisterId) { - var entlist = (await _registerAsbitemRepository.GetQueryableAsync()) + var entlist = (await _registerCheckAsbitemRepository.GetQueryableAsync()) .Include(x => x.Asbitem) .Include(x => x.Asbitem.ItemType) .Include(x => x.RegisterCheck) .Where(m => m.PatientRegisterId == PatientRegisterId).ToList().OrderByDescending(o => o.GroupPackageId).ThenBy(o => o.Asbitem.DisplayOrder); - var entdto = entlist.Select(s => new RegisterAsbitemOrAsbitemDto + var entdto = entlist.Select(s => new RegisterCheckAsbitemOrAsbitemDto { Discount = s.StandardPrice == 0 ? 100 : Math.Round(Convert.ToDecimal(s.ChargePrice * 100 / s.StandardPrice), 2), IsLock = s.RegisterCheck.IsLock, @@ -308,7 +308,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/createregisterasbitemincustomerorgmany")] - public async Task CreateRegisterAsbitemInCustomerOrgManyAsync(CreateRegisterAsbitemInCustomerOrgManyDto input) + public async Task CreateRegisterAsbitemInCustomerOrgManyAsync(CreateRegisterCheckAsbitemInCustomerOrgManyDto input) { ResultDto msg; @@ -348,7 +348,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/deleteregisterasbitemincustomerorgmany")] - public async Task DeleteRegisterAsbitemInCustomerOrgManyAsync(DeleteRegisterAsbitemInCustomerOrgManyDto input) + public async Task DeleteRegisterAsbitemInCustomerOrgManyAsync(DeleteRegisterCheckAsbitemInCustomerOrgManyDto input) { if (input == null || input.PatientRegisterId == Guid.Empty || !input.AsbitemIds.Any()) { @@ -373,13 +373,13 @@ namespace Shentun.Peis.RegisterAsbitems } - var registerAsbitemList = await _registerAsbitemRepository.GetListAsync(m => m.PatientRegisterId == input.PatientRegisterId); + var registerAsbitemList = await _registerCheckAsbitemRepository.GetListAsync(m => m.PatientRegisterId == input.PatientRegisterId); #region 删除组合项目 foreach (var item in registerAsbitemList.Where(m => input.AsbitemIds.Contains(m.AsbitemId))) { await _registerAsbitemManager.CheckIsDelete(item.Id); - await _registerAsbitemRepository.DeleteAsync(item); + await _registerCheckAsbitemRepository.DeleteAsync(item); } #endregion @@ -394,7 +394,7 @@ namespace Shentun.Peis.RegisterAsbitems //清空剩余registerasbitem分组信息 var registerAsbitemList_update = registerAsbitemList.Where(m => !input.AsbitemIds.Contains(m.AsbitemId)).ToList(); registerAsbitemList_update.ForEach(f => f.GroupPackageId = null); - await _registerAsbitemRepository.UpdateManyAsync(registerAsbitemList_update); + await _registerCheckAsbitemRepository.UpdateManyAsync(registerAsbitemList_update); //清空PatientRegister分组信息 @@ -419,13 +419,13 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/registerasbitemcharge")] - public async Task RegisterAsbitemChargeAsync(RegisterAsbitemChargeRequestDto input) + public async Task RegisterAsbitemChargeAsync(RegisterCheckAsbitemCheckChargeRequestDto input) { if (input != null && input.Asbitems.Any() && input.ChargePays.Any()) { //更新收费状态 - List registerAsbitems = await _registerAsbitemRepository.GetListAsync(m => input.Asbitems.Select(s => s.RegisterAsbitemId).Contains(m.Id)); + List registerAsbitems = await _registerCheckAsbitemRepository.GetListAsync(m => input.Asbitems.Select(s => s.RegisterAsbitemId).Contains(m.Id)); registerAsbitems.ForEach(f => f.IsCharge = 'Y'); #region 插入主表Charge @@ -529,11 +529,11 @@ namespace Shentun.Peis.RegisterAsbitems #region 修改收费状态 - await _registerAsbitemRepository.UpdateManyAsync(registerAsbitems); + await _registerCheckAsbitemRepository.UpdateManyAsync(registerAsbitems); #endregion - return new RegisterAsbitemChargeDto { code = 1, msg = "收费成功", ChargeId = charge_new.Id }; + return new RegisterCheckAsbitemChargeDto { code = 1, msg = "收费成功", ChargeId = charge_new.Id }; } else { @@ -551,7 +551,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/registerasbitemchargeback")] - public async Task RegisterAsbitemChargeBackAsync(RegisterAsbitemChargeBackDto input) + public async Task RegisterAsbitemChargeBackAsync(RegisterCheckAsbitemChargeBackDto input) { if (input != null && input.ChargeBackPays.Any()) { @@ -570,7 +570,7 @@ namespace Shentun.Peis.RegisterAsbitems var chargeAsbitemList = await _chargeAsbitemRepository.GetListAsync(m => m.ChargeId == input.ChargeId); //更新退费状态 - List registerAsbitems = await _registerAsbitemRepository.GetListAsync(m => chargeAsbitemList.Select(s => s.RegisterAsbitemId).Contains(m.Id)); + List registerAsbitems = await _registerCheckAsbitemRepository.GetListAsync(m => chargeAsbitemList.Select(s => s.RegisterAsbitemId).Contains(m.Id)); registerAsbitems.ForEach(f => f.IsCharge = 'N'); #region 插入主表Charge @@ -640,7 +640,7 @@ namespace Shentun.Peis.RegisterAsbitems #region 修改为未收费状态 - await _registerAsbitemRepository.UpdateManyAsync(registerAsbitems); + await _registerCheckAsbitemRepository.UpdateManyAsync(registerAsbitems); #endregion @@ -675,11 +675,11 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/getregisterasbitemcheckstatus")] - public async Task> GetRegisterAsbitemCheckStatusAsync(GetRegisterAsbitemCheckStatusRequestDto input) + public async Task> GetRegisterAsbitemCheckStatusAsync(GetRegisterCheckAsbitemCheckStatusRequestDto input) { if (input != null) { - var registerQueryable = (await _registerAsbitemRepository.GetDbSetAsync()) + var registerQueryable = (await _registerCheckAsbitemRepository.GetDbSetAsync()) .Include(x => x.PatientRegister) .Include(x => x.PatientRegister.Patient) .Include(x => x.Asbitem) @@ -744,7 +744,7 @@ namespace Shentun.Peis.RegisterAsbitems from ac in cc.DefaultIfEmpty() join d in await _customerOrgGroupRepository.GetQueryableAsync() on a.PatientRegister.CustomerOrgGroupId equals d.Id into dd from ad in dd.DefaultIfEmpty() - select new GetRegisterAsbitemCheckStatusResultDto + select new GetRegisterCheckAsbitemCheckStatusResultDto { Age = a.PatientRegister.Age, AsbitemName = a.Asbitem.DisplayName, @@ -781,7 +781,7 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/mergeregisterasbitem")] - public async Task MergeRegisterAsbitemAsync(MergeRegisterAsbitemDto input) + public async Task MergeRegisterAsbitemAsync(MergeRegisterCheckAsbitemDto input) { if (input != null) { @@ -811,13 +811,13 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpPost("api/app/registerasbitem/cancelmergeregisterasbitem")] - public async Task CancelMergeRegisterAsbitemAsync(CancelMergeRegisterAsbitemDto input) + public async Task CancelMergeRegisterAsbitemAsync(CancelMergeRegisterCheckAsbitemDto input) { if (input != null) { foreach (var RegisterCheckId in input.RegisterCheckIds) { - var RegisterAsbitemIds = (await _registerAsbitemRepository.GetListAsync(m => m.RegisterCheckId == RegisterCheckId)).Select(s => s.Id).ToList(); + var RegisterAsbitemIds = (await _registerCheckAsbitemRepository.GetListAsync(m => m.RegisterCheckId == RegisterCheckId)).Select(s => s.Id).ToList(); //检查项目状态 是否能取消合并 foreach (var item in RegisterAsbitemIds) @@ -844,10 +844,10 @@ namespace Shentun.Peis.RegisterAsbitems /// /// [HttpGet("api/app/registerasbitem/getmergeregisterasbitemlist")] - public async Task> GetMergeRegisterAsbitemListAsync(Guid PatientRegisterId) + public async Task> GetMergeRegisterAsbitemListAsync(Guid PatientRegisterId) { - var ergerQuery = from h in await _registerAsbitemRepository.GetQueryableAsync() + var ergerQuery = from h in await _registerCheckAsbitemRepository.GetQueryableAsync() join i in await _asbitemRepository.GetQueryableAsync() on h.AsbitemId equals i.Id into ii from hi in ii.DefaultIfEmpty() where h.PatientRegisterId == PatientRegisterId @@ -860,7 +860,7 @@ namespace Shentun.Peis.RegisterAsbitems }; - var entlist = (from a in await _registerAsbitemRepository.GetQueryableAsync() + var entlist = (from a in await _registerCheckAsbitemRepository.GetQueryableAsync() join b in await _asbitemRepository.GetQueryableAsync() on a.AsbitemId equals b.Id join c in await _itemTypeRepository.GetQueryableAsync() on b.ItemTypeId equals c.Id join d in await _registerCheckRepository.GetQueryableAsync() on a.RegisterCheckId equals d.Id into dd @@ -869,7 +869,7 @@ namespace Shentun.Peis.RegisterAsbitems from ae in ee.DefaultIfEmpty() where a.PatientRegisterId == PatientRegisterId orderby c.DisplayOrder ascending, ad.CreationTime ascending, b.DisplayOrder ascending - select new GetMergeRegisterAsbitemListDto + select new GetMergeRegisterCheckAsbitemListDto { RegisterAsbitemId = a.Id, AsbitemName = b.DisplayName, diff --git a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterAsbitems/RegisterAsbitemDbMapping.cs b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterCheckAsbitems/RegisterCheckAsbitemDbMapping.cs similarity index 96% rename from src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterAsbitems/RegisterAsbitemDbMapping.cs rename to src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterCheckAsbitems/RegisterCheckAsbitemDbMapping.cs index 8b02b0d..bb06406 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterAsbitems/RegisterAsbitemDbMapping.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/DbMapping/RegisterCheckAsbitems/RegisterCheckAsbitemDbMapping.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace Shentun.Peis.DbMapping { - internal class RegisterAsbitemDbMapping : IEntityTypeConfiguration + internal class RegisterCheckAsbitemDbMapping : IEntityTypeConfiguration { public void Configure(EntityTypeBuilder entity) { diff --git a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs index 4b7e40e..7ad1b63 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/EntityFrameworkCore/PeisDbContext.cs @@ -450,7 +450,7 @@ public class PeisDbContext : .ApplyConfiguration(new ReportPrinterDbMapping()) .ApplyConfiguration(new QueueRegisterDbMapping()) .ApplyConfiguration(new ReferenceRangeDbMapping()) - .ApplyConfiguration(new RegisterAsbitemDbMapping()) + .ApplyConfiguration(new RegisterCheckAsbitemDbMapping()) .ApplyConfiguration(new RegisterCheckDbMapping()) .ApplyConfiguration(new RegisterCheckCriticalValueDbMapping()) .ApplyConfiguration(new RegisterCheckItemDbMapping()) diff --git a/test/Shentun.Peis.Application.Tests/RegisterAsbitemAppServiceTest.cs b/test/Shentun.Peis.Application.Tests/RegisterCheckAsbitemAppServiceTest.cs similarity index 80% rename from test/Shentun.Peis.Application.Tests/RegisterAsbitemAppServiceTest.cs rename to test/Shentun.Peis.Application.Tests/RegisterCheckAsbitemAppServiceTest.cs index 60121b4..77c137e 100644 --- a/test/Shentun.Peis.Application.Tests/RegisterAsbitemAppServiceTest.cs +++ b/test/Shentun.Peis.Application.Tests/RegisterCheckAsbitemAppServiceTest.cs @@ -13,18 +13,18 @@ using Xunit.Abstractions; namespace Shentun.Peis { - public class RegisterAsbitemAppServiceTest : PeisApplicationTestBase + public class RegisterCheckAsbitemAppServiceTest : PeisApplicationTestBase { private readonly IRepository _repository; - private readonly RegisterAsbitemAppService _appService; + private readonly RegisterCheckAsbitemAppService _appService; private readonly ITestOutputHelper _output; private readonly IUnitOfWorkManager _unitOfWorkManager; - public RegisterAsbitemAppServiceTest(ITestOutputHelper testOutputHelper) + public RegisterCheckAsbitemAppServiceTest(ITestOutputHelper testOutputHelper) { _output = testOutputHelper; _unitOfWorkManager = GetRequiredService(); _repository = GetRequiredService>(); - _appService = GetRequiredService(); + _appService = GetRequiredService(); } [Fact]