diff --git a/src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs b/src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs index 1a4e11c..dc67120 100644 --- a/src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs +++ b/src/Shentun.Peis.Domain/ReportTemplates/CustomerOrgReportManager.cs @@ -5,6 +5,7 @@ using Shentun.Peis.Models; using System; using System.Collections.Generic; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -1100,9 +1101,15 @@ namespace Shentun.Peis.ReportTemplates string documentName = $"{documentData.MedicalTitle}单位体检报告{DateTime.Now.ToString("yyyy_MM_dd_HH_mm")}.docx"; - template.SaveAs(DirectoryName + $@"\CustomerOrgTemplate\docs\{documentName}"); + string savaUrl = DirectoryName + $@"\CustomerOrgTemplate\docs\{DateTime.Now.Year}\{DateTime.Now.Month}\{DateTime.Now.Day}"; + if (!Directory.Exists(savaUrl)) + { + Directory.CreateDirectory(savaUrl); //创建新文件夹 + } + + template.SaveAs($@"{savaUrl}\{documentName}"); - return $"/ReportFile/CustomerOrgTemplate/docs/{documentName}"; + return $"/ReportFile/CustomerOrgTemplate/docs/{DateTime.Now.Year}/{DateTime.Now.Month}/{DateTime.Now.Day}/{documentName}"; } @@ -1926,11 +1933,11 @@ namespace Shentun.Peis.ReportTemplates #region 未检 - int UnChecked_MaleNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.CompleteFlag == PatientRegisterCompleteFlag.SumCheck) + int UnChecked_MaleNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.Registration || m.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration) && m.SexId == SexFlag.Male).Count(); - int UnChecked_FemaleNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.CompleteFlag == PatientRegisterCompleteFlag.SumCheck) + int UnChecked_FemaleNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.Registration || m.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration) && m.SexId == SexFlag.Female).Count(); - int UnChecked_OtherNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.PartCheck || m.CompleteFlag == PatientRegisterCompleteFlag.SumCheck) + int UnChecked_OtherNumber = queryList.Where(m => (m.CompleteFlag == PatientRegisterCompleteFlag.Registration || m.CompleteFlag == PatientRegisterCompleteFlag.PreRegistration) && m.SexId == SexFlag.UnKnown).Count(); int UnChecked_TotalNumber = UnChecked_MaleNumber + UnChecked_FemaleNumber + UnChecked_OtherNumber; string UnChecked_MaleRatio = UnChecked_TotalNumber != 0 ? Math.Round(UnChecked_MaleNumber * 100M / UnChecked_TotalNumber, 2).ToString() + "%" : "0%"; diff --git a/src/Shentun.Peis.HttpApi.Host/appsettings.json b/src/Shentun.Peis.HttpApi.Host/appsettings.json index d6cd186..1a8eab1 100644 --- a/src/Shentun.Peis.HttpApi.Host/appsettings.json +++ b/src/Shentun.Peis.HttpApi.Host/appsettings.json @@ -6,9 +6,9 @@ "RedirectAllowedUrls": "http://localhost:9530" }, "ConnectionStrings": { - //"Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;" + "Default": "Host=140.143.162.39;Port=5432;Database=ShentunPeis070703;User ID=postgres;Password=shentun123;" //"Default": "Host=localhost;Port=5432;Database=ShentunPeis1218;User ID=postgres;Password=wxd123;" - "Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;" + //"Default": "Host=10.1.12.140;Port=5432;Database=ShentunPeis;User ID=postgres;Password=st123;" }, "AuthServer": { "Authority": "http://localhost:9530",