From 6cff56df9b6a22a57f1407760d4ee5b2393e1d2f Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Tue, 13 Jan 2026 15:28:10 +0800 Subject: [PATCH] 0113 --- ...omerOrgPhysicalExaminationStatisticsDto.cs | 7 ++ .../GetPatientRegisterReportDto.cs | 5 + .../CustomerReportAppService.cs | 12 +- .../MedicalPackageDetailAppService.cs | 6 +- .../PatientRegisterAppService.cs | 111 ++++++++++++------ .../PeisReports/PeisReportAppService.cs | 64 +++++++++- src/Shentun.Peis.DbMigrator/appsettings.json | 3 +- .../PatientRegisterManager.cs | 6 +- .../appsettings.json | 7 +- 9 files changed, 168 insertions(+), 53 deletions(-) diff --git a/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsDto.cs b/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsDto.cs index 26553cfd..ab1f720f 100644 --- a/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsDto.cs +++ b/src/Shentun.Peis.Application.Contracts/CustomerReports/GetCustomerOrgPhysicalExaminationStatisticsDto.cs @@ -68,6 +68,12 @@ namespace Shentun.Peis.CustomerReports /// public decimal SumReceivedPrice { get; set; } + /// + /// paixu + /// + [JsonIgnore] + public int DisplayOrder { get; set; } + } public class GetCustomerOrgPhysicalExaminationStatisticsPatientRegisterGroupDto @@ -105,5 +111,6 @@ namespace Shentun.Peis.CustomerReports /// public decimal ReceivedPrice { get; set; } + } } diff --git a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs index 59120d81..e7d98629 100644 --- a/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PeisReports/GetPatientRegisterReportDto.cs @@ -199,5 +199,10 @@ namespace Shentun.Peis.PeisReports /// public string Remark { get; set; } + /// + /// 报告模板id + /// + public string ReportFormatTemplateId { get; set; } + } } diff --git a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs index b812871a..0db2ebf1 100644 --- a/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs +++ b/src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs @@ -3413,7 +3413,7 @@ namespace Shentun.Peis.CustomerReports }).ToList(); - + if (input.IsChild == 'Y') @@ -3425,6 +3425,7 @@ namespace Shentun.Peis.CustomerReports { DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.First().DepartmentId).GetAwaiter().GetResult(), CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.First().CustomerOrgId).GetAwaiter().GetResult(), + DisplayOrder = _cacheService.GetTopCustomerOrgAsync(s.First().CustomerOrgId).GetAwaiter().GetResult().DisplayOrder, PartCheckCount = s.Where(m => m.CompleteFlag == PatientRegisterCompleteFlag.PartCheck).Count(), CheckCount = s.Where(m => m.CompleteFlag == PatientRegisterCompleteFlag.SumCheck).Count(), RegisterCount = s.Count(), @@ -3433,7 +3434,7 @@ namespace Shentun.Peis.CustomerReports SumChargePrice = Math.Round(s.Sum(v => v.ChargePrice), 2), SumReceivedPrice = Math.Round(s.Sum(v => v.ReceivedPrice), 2), SumStandardPrice = Math.Round(s.Sum(v => v.StandardPrice), 2) - }).OrderByDescending(o => o.RegisterCount).ToList(); + }).OrderByDescending(o => o.DisplayOrder).ThenByDescending(o => o.RegisterCount).ToList(); @@ -3445,9 +3446,10 @@ namespace Shentun.Peis.CustomerReports var customerOrgGroup = patientRegisterGroupList.GroupBy(g => g.CustomerOrgId); var customerOrgGrouplist = customerOrgGroup.Select(s => new GetCustomerOrgPhysicalExaminationStatisticsDto - { + { DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.First().DepartmentId).GetAwaiter().GetResult(), - CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.First().CustomerOrgId).GetAwaiter().GetResult(), + CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(s.First().CustomerOrgId).GetAwaiter().GetResult(), + DisplayOrder = _cacheService.GetTopCustomerOrgAsync(s.First().CustomerOrgId).GetAwaiter().GetResult().DisplayOrder, PartCheckCount = s.Where(m => m.CompleteFlag == PatientRegisterCompleteFlag.PartCheck).Count(), CheckCount = s.Where(m => m.CompleteFlag == PatientRegisterCompleteFlag.SumCheck).Count(), RegisterCount = s.Count(), @@ -3456,7 +3458,7 @@ namespace Shentun.Peis.CustomerReports SumChargePrice = Math.Round(s.Sum(v => v.ChargePrice), 2), SumReceivedPrice = Math.Round(s.Sum(v => v.ReceivedPrice), 2), SumStandardPrice = Math.Round(s.Sum(v => v.StandardPrice), 2) - }).OrderByDescending(o => o.RegisterCount).ToList(); + }).OrderByDescending(o => o.DisplayOrder).ToList(); return customerOrgGrouplist; } diff --git a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs index 5e5a2aed..c014632d 100644 --- a/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs +++ b/src/Shentun.Peis.Application/MedicalPackageDetails/MedicalPackageDetailAppService.cs @@ -142,8 +142,8 @@ namespace Shentun.Peis.MedicalPackageDetails DefaultResult = s.asbitem.DefaultResult, DeviceTypeId = s.asbitem.DeviceTypeId, DiagnosisFunction = s.asbitem.DiagnosisFunction, - DisplayName = (s.itemType.DisplayOrder * 3000) + s.asbitem.DisplayName, - DisplayOrder = s.asbitem.DisplayOrder, + DisplayName = s.asbitem.DisplayName, + DisplayOrder = (s.itemType.DisplayOrder * 3000) + s.asbitem.DisplayOrder, ForSexId = s.asbitem.ForSexId, Id = s.asbitem.Id, //InvoiceItemTypeId = s.asbitem.InvoiceItemTypeId, @@ -170,7 +170,7 @@ namespace Shentun.Peis.MedicalPackageDetails LastModifierName = _cacheService.GetSurnameAsync(s.asbitem.LastModifierId).GetAwaiter().GetResult(), MaritalStatusId = s.asbitem.MaritalStatusId, IsDiscount = s.asbitem.IsDiscount - }).ToList(); + }).OrderBy(o => o.DisplayOrder).ToList(); diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs index 27faa19c..8a371b5c 100644 --- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs +++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs @@ -23,6 +23,7 @@ using Shentun.Peis.PatientPoisons; using Shentun.Peis.PatientRegisterExters; using Shentun.Peis.Patients; using Shentun.Peis.PeisReports; +using Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian; using Shentun.Peis.RegisterAsbitems; using Shentun.Peis.RegisterCheckAsbitems; using Shentun.Peis.RegisterChecks; @@ -993,6 +994,7 @@ namespace Shentun.Peis.PatientRegisters patientRegisterExterHaveEmpty, registerCheckAsbitemHaveEmpty = registerCheckAsbitemHaveEmpty != null ? new { + registerCheckAsbitemHaveEmpty.Id, registerCheckAsbitemHaveEmpty.StandardPrice, registerCheckAsbitemHaveEmpty.Amount, registerCheckAsbitemHaveEmpty.ChargePrice, @@ -1061,17 +1063,17 @@ namespace Shentun.Peis.PatientRegisters SexHormoneTermId = group.Key.SexHormoneTermId, CreatorName = _cacheService.GetSurnameAsync(group.Key.CreatorId).GetAwaiter().GetResult(), LastModifierName = _cacheService.GetSurnameAsync(group.Key.LastModifierId).GetAwaiter().GetResult(), - Address = group.Key.Patient.Address, //档案表信息 - BirthPlaceId = group.Key.Patient.BirthPlaceId, - DisplayName = group.Key.Patient.DisplayName, - Email = group.Key.Patient.Email, - IdNo = group.Key.Patient.IdNo, - MobileTelephone = group.Key.Patient.MobileTelephone, - NationId = group.Key.Patient.NationId, - PatientNo = group.Key.Patient.PatientNo, - PatientPassword = group.Key.Patient.PatientPassword, - PostalCode = group.Key.Patient.PostalCode, - Telephone = group.Key.Patient.Telephone, + Address = group.First().patient.Address, //档案表信息 + BirthPlaceId = group.First().patient.BirthPlaceId, + DisplayName = group.First().patient.DisplayName, + Email = group.First().patient.Email, + IdNo = group.First().patient.IdNo, + MobileTelephone = group.First().patient.MobileTelephone, + NationId = group.First().patient.NationId, + PatientNo = group.First().patient.PatientNo, + PatientPassword = group.First().patient.PatientPassword, + PostalCode = group.First().patient.PostalCode, + Telephone = group.First().patient.Telephone, Planuserid = group.FirstOrDefault().patientRegisterExterHaveEmpty != null ? group.FirstOrDefault().patientRegisterExterHaveEmpty.Planuserid : "", QztlIsCw = group.FirstOrDefault().patientRegisterExterHaveEmpty != null ? group.FirstOrDefault().patientRegisterExterHaveEmpty.QztlIsCw : null, QztlIsCy = group.FirstOrDefault().patientRegisterExterHaveEmpty != null ? group.FirstOrDefault().patientRegisterExterHaveEmpty.QztlIsCy : null, @@ -1102,14 +1104,13 @@ namespace Shentun.Peis.PatientRegisters if (group.Count(m => m.registerCheckAsbitemHaveEmpty != null) > 0) { - entDto.StandardAmount = group.GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount); - entDto.ReceivableAmount = group.GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); - entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); + entDto.StandardAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount); + entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); + entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); } if (group.Count(m => m.payModePayHaveEmpty != null) > 0) { - entDto.ChargePayMode = string.Join(",", group.Where(m => m.payModePayHaveEmpty != null).GroupBy(g => g.payModePayHaveEmpty).Select(s => s.Key.DisplayName)); } @@ -1395,11 +1396,11 @@ namespace Shentun.Peis.PatientRegisters [HttpPost("api/PatientRegister/CreatePatientRegister")] public async Task CreatePatientRegisterAsync(CreatePatientRegisterDto input) { - ////总检时特殊处理 - //if (input.CompleteFlag == PatientRegisterCompleteFlag.SumCheck) - //{ - // return await SumCheckUpdatePatientRegister(input); - //} + //总检时特殊处理 + if (input.CompleteFlag == PatientRegisterCompleteFlag.SumCheck) + { + return await SumCheckUpdatePatientRegister(input); + } PatientRegisterOrNoDto msg = new PatientRegisterOrNoDto(); input.RegisterCheckAsbitems.ForEach(o => { @@ -1455,6 +1456,8 @@ namespace Shentun.Peis.PatientRegisters { entity = await Repository.GetAsync((Guid)input.PatientRegisterId); char oldCompleteFlag = entity.CompleteFlag; //更新前状态 + //更新patientId + updatePatientRegisterArg.PatientId = patient.Id; await _manager.UpdateAsync(updatePatientRegisterArg, entity); createRegisterCheckAsbitemEntity = await _registerAsbitemManager.UpdateManyAsync(entity, registerAsbitems); @@ -1513,20 +1516,59 @@ namespace Shentun.Peis.PatientRegisters return msg; } - ///// - ///// 总检时修改人员信息 - ///// - ///// - //private async Task SumCheckUpdatePatientRegister(CreatePatientRegisterDto input) - //{ - // var patientRegister = await _repository.FirstOrDefaultAsync(f => f.Id == input.PatientRegisterId); - // if (patientRegister != null) - // { + /// + /// 总检时修改人员信息 + /// + /// + private async Task SumCheckUpdatePatientRegister(CreatePatientRegisterDto input) + { + var patientRegister = await _repository.FirstOrDefaultAsync(f => f.Id == input.PatientRegisterId); + if (patientRegister != null) + { + var updatePatientEntity = ObjectMapper.Map(input); + var updatePatientRegisterArg = ObjectMapper.Map(input); - // } - // return new PatientRegisterOrNoDto(); - //} + //档案 + updatePatientEntity.DisplayName = input.PatientName; + + + //创建人员信息 + Patient patient = null; + _patientManager.IsAllowIdNoSexError = input.IsAllowIdNoSexError; + if (updatePatientRegisterArg.PatientId == Guid.Empty) + { + patient = await _patientManager.CreateAsync(updatePatientEntity); + await _patientRepository.InsertAsync(patient, true); + + updatePatientRegisterArg.PatientId = patient.Id; + } + else + { + patient = await _patientRepository.GetAsync(updatePatientRegisterArg.PatientId); + await _patientManager.UpdateAsync(updatePatientEntity, patient); + + await _patientRepository.UpdateAsync(patient, true); + } + + + //人员 + var patientRegisterEntity = await _repository.GetAsync((Guid)input.PatientRegisterId); + + await _manager.UpdateAsync(updatePatientRegisterArg, patientRegisterEntity, false); + + await _repository.UpdateAsync(patientRegisterEntity, true); + + return await GetPatientRegisterOrNo((Guid)input.PatientRegisterId); + } + else + { + throw new UserFriendlyException("人员不存在"); + + } + + } + /// /// 批量增加组合项目 @@ -3098,6 +3140,7 @@ namespace Shentun.Peis.PatientRegisters /// /// [HttpPost("api/app/patientregister/CreatePatientRegisterFromExcel")] + [AllowAnonymous] public async Task CreatePatientRegisterFromExcelAsync(CreatePatientRegisterExcelRequestDto input) { if (input == null) @@ -3109,8 +3152,8 @@ namespace Shentun.Peis.PatientRegisters throw new UserFriendlyException("姓名不能为空"); } - - input.IdNo = input.IdNo.Trim(); + if (!string.IsNullOrWhiteSpace(input.IdNo)) + input.IdNo = input.IdNo.Trim(); #region 转换职业病信息 diff --git a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs index 0acaa6ee..c4617ac9 100644 --- a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs +++ b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Internal; +using NUglify.Helpers; using Shentun.Peis.CustomerOrgGroups; using Shentun.Peis.CustomerOrgs; using Shentun.Peis.Enums; @@ -371,6 +372,16 @@ namespace Shentun.Peis.PeisReports if (IsDisplay) { + + //string reportFormatTemplateId = (await _cacheService.GetCustomerOrgAsync(s.a.CustomerOrgId)).ReportFormatTemplateId; + //if (string.IsNullOrWhiteSpace(reportFormatTemplateId)) + //{ + // reportFormatTemplateId = (await _cacheService.GetTopCustomerOrgAsync(s.a.CustomerOrgId)).ReportFormatTemplateId; + //} + + string reportFormatTemplateId = await GetReportFormatTemplateId(s.a.CustomerOrgId); + + entlist.Add(new GetPatientRegisterReportDto { Address = s.ab.Address, @@ -409,7 +420,8 @@ namespace Shentun.Peis.PeisReports IsReceiveReport = s.a.IsReceiveReport, ReportReceiveDate = DataHelper.ConversionDateShortToString(s.a.ReportReceiveDate), ReportReceiveName = s.a.ReportReceiveName, - Remark = s.a.Remark + Remark = s.a.Remark, + ReportFormatTemplateId = reportFormatTemplateId }); } @@ -708,6 +720,7 @@ namespace Shentun.Peis.PeisReports patient = new { patient.IdNo, patient.Address, patient.PatientNo, patient.MobileTelephone, patient.Telephone, patient.Email, patient.DisplayName }, registerCheckAsbitemHaveEmpty = registerCheckAsbitemHaveEmpty != null ? new { + registerCheckAsbitemHaveEmpty.Id, registerCheckAsbitemHaveEmpty.StandardPrice, registerCheckAsbitemHaveEmpty.Amount, registerCheckAsbitemHaveEmpty.ChargePrice, @@ -729,6 +742,15 @@ namespace Shentun.Peis.PeisReports foreach (var group in queryGroup) { var groupFirst = group.FirstOrDefault(); + + //string reportFormatTemplateId = (await _cacheService.GetCustomerOrgAsync(group.Key.CustomerOrgId)).ReportFormatTemplateId; + //if (string.IsNullOrWhiteSpace(reportFormatTemplateId)) + //{ + // reportFormatTemplateId = (await _cacheService.GetTopCustomerOrgAsync(group.Key.CustomerOrgId)).ReportFormatTemplateId; + //} + + string reportFormatTemplateId = await GetReportFormatTemplateId(group.Key.CustomerOrgId); + var entDto = new GetPatientRegisterReportWithChargeDto { Address = groupFirst.patient.Address, @@ -777,9 +799,9 @@ namespace Shentun.Peis.PeisReports if (group.Count(m => m.registerCheckAsbitemHaveEmpty != null) > 0) { - entDto.StandardAmount = group.GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount); - entDto.ReceivableAmount = group.GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); - entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); + entDto.StandardAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount); + entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); + entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount); } if (group.Count(m => m.payModePayHaveEmpty != null) > 0) @@ -923,7 +945,7 @@ namespace Shentun.Peis.PeisReports { sumquery = sumquery.Where(m => m.registerCheck.CompleteFlag == input.CompleteFlag); } - + var entlist = sumquery.ToList().Select(s => new GetRegisterAsbitemRegisterCheckStatusDto { @@ -1647,5 +1669,37 @@ namespace Shentun.Peis.PeisReports } + + /// + /// 获取报告模板id 一直往上找 + /// + /// + /// + private async Task GetReportFormatTemplateId(Guid customerOrgId) + { + string reportFormatTemplateId = ""; + var customerOrgEntity = await _cacheService.GetCustomerOrgAsync(customerOrgId); + if (customerOrgEntity != null) + { + if (string.IsNullOrWhiteSpace(customerOrgEntity.ReportFormatTemplateId)) + { + if (customerOrgEntity.ParentId != null) + { + //await GetReportFormatTemplateId(customerOrgEntity.ParentId.Value); + reportFormatTemplateId = await GetReportFormatTemplateId(customerOrgEntity.ParentId.Value); + if (string.IsNullOrWhiteSpace(reportFormatTemplateId)) + { + reportFormatTemplateId = await GetReportFormatTemplateId(customerOrgEntity.ParentId.Value); + } + } + } + else + { + reportFormatTemplateId = customerOrgEntity.ReportFormatTemplateId; + } + } + return reportFormatTemplateId; + } + } } diff --git a/src/Shentun.Peis.DbMigrator/appsettings.json b/src/Shentun.Peis.DbMigrator/appsettings.json index fac530c1..f9524519 100644 --- a/src/Shentun.Peis.DbMigrator/appsettings.json +++ b/src/Shentun.Peis.DbMigrator/appsettings.json @@ -1,6 +1,7 @@ { "ConnectionStrings": { - "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;" + //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;", + "Default": "Host=192.168.1.138;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;" //"Default": "Host=192.168.2.67;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;" //"Default": "Host=localhost;Port=5432;Database=ShentunPeis1218;User ID=postgres;Password=wxd123;" //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;User ID=postgres;Password=st123;" diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs index 5da522d5..e0b16efa 100644 --- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs +++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs @@ -502,7 +502,8 @@ namespace Shentun.Peis.PatientRegisters /// public async Task UpdateAsync( UpdatePatientRegisterArg sourceEntity, - PatientRegister targetEntity + PatientRegister targetEntity, + bool isFilterSumCompleteFlag = true ) { @@ -519,7 +520,8 @@ namespace Shentun.Peis.PatientRegisters if (sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.Registration && - sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PartCheck + sourceEntity.CompleteFlag != PatientRegisterCompleteFlag.PartCheck && + isFilterSumCompleteFlag ) { throw new ArgumentException("完成标志错误"); diff --git a/src/Shentun.Peis.HttpApi.Host/appsettings.json b/src/Shentun.Peis.HttpApi.Host/appsettings.json index e7d94dcc..2a0a8c9d 100644 --- a/src/Shentun.Peis.HttpApi.Host/appsettings.json +++ b/src/Shentun.Peis.HttpApi.Host/appsettings.json @@ -5,15 +5,16 @@ "CorsOrigins": "https://*.Peis.com,http://localhost:4200,http://localhost:9530,http://192.168.1.108:9530,http://localhost:8080,http://localhost:8081,http://192.168.0.3:9531", "RedirectAllowedUrls": "http://localhost:9530", "SelfUser": "admin", - "SelfPassword": "St123", + "SelfPassword": "654321", //"SelfPassword": "654321", "LisUser": "admin", - "LisPassword": "St123" + "LisPassword": "654321" //"LisPassword": "654321" }, "ConnectionStrings": { + "Default": "Host=192.168.1.138;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;" //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis0508;User ID=postgres;Password=st123;" - "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;" + //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis240701;User ID=postgres;Password=shentun123;" //"Default": "Host=192.168.2.67;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;", //"Default": "Host=192.168.0.188;Port=5432;Database=ShentunPeis;User ID=postgres;Password=St123456;" },