shentun
/
peis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

临时保存

bjmzak
wxd 2 years ago
parent
81df41c369
commit
1072998796
7 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterExcelRequestDto.cs
  2. 2
      src/Shentun.Peis.Application.Contracts/PatientRegisters/UpdatePatientRegisterCompleteFlagOrMedicalStartDateDto.cs
  3. 39
      src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
  4. 8
      src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
  5. 2
      src/Shentun.Peis.Domain/DataHelper.cs
  6. 4
      src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs
  7. 12
      src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs

7
src/Shentun.Peis.Application.Contracts/PatientRegisters/CreatePatientRegisterExcelRequestDto.cs
View File

@ -43,13 +43,14 @@ namespace Shentun.Peis.PatientRegisters
/// 单位ID
/// </summary>
[Required(ErrorMessage = "单位ID不能为空")]
public Guid? CustomerOrgId { get; set; }
public Guid CustomerOrgId { get; set; }
/// <summary>
/// 体检中心ID
/// </summary>
public Guid? OrganizationUnitId { get; set; } = Guid.Empty;
[Required(ErrorMessage = "体检中心ID不能为空")]
public Guid OrganizationUnitId { get; set; }
/// <summary>
/// 体检次数ID
@ -163,7 +164,7 @@ namespace Shentun.Peis.PatientRegisters
/// <summary>
/// 指引单打印次数
/// </summary>
public short? GuidePrintTimes { get; set; }
public short? GuidePrintTimes { get; set; } = 0;
/// <summary>
/// 备注
/// </summary>

2
src/Shentun.Peis.Application.Contracts/PatientRegisters/UpdatePatientRegisterCompleteFlagOrMedicalStartDateDto.cs
View File

@ -10,7 +10,7 @@ namespace Shentun.Peis.PatientRegisters
/// <summary>
/// 完成标志(0 预登记 1正式登记 2部分已检 3已总检)
/// </summary>
public char? CompleteFlag { get; set; } = null;
public char? CompleteFlag { get; set; }
/// <summary>
/// 体检开始日期
/// </summary>

39
src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
View File

@ -1102,7 +1102,7 @@ namespace Shentun.Peis.PatientRegisters
public async Task UpdatePatientRegisterGuidePrintTimesManyAsync(List<Guid> Ids)
{
var entlist = await _repository.GetListAsync(m => Ids.Contains(m.Id));
entlist.ForEach(f => f.GuidePrintTimes = (f.GuidePrintTimes == null ? (short?)1 : (short?)(f.GuidePrintTimes + 1)));
entlist.ForEach(f => f.GuidePrintTimes = (short)(f.GuidePrintTimes + 1));
}
/// <summary>
@ -1114,7 +1114,7 @@ namespace Shentun.Peis.PatientRegisters
public async Task UpdatePatientRegisterReportPrintTimesManyAsync(List<Guid> Ids)
{
var entlist = await _repository.GetListAsync(m => Ids.Contains(m.Id));
entlist.ForEach(f => f.ReportPrintTimes = (f.ReportPrintTimes == null ? (short?)1 : (short?)(f.ReportPrintTimes + 1)));
entlist.ForEach(f => f.ReportPrintTimes = (short)(f.ReportPrintTimes + 1));
}
@ -1254,7 +1254,7 @@ namespace Shentun.Peis.PatientRegisters
#region 转换性别、出生地、婚姻状况、民族数据、单位分组、人员类别、体检类别、性激素期限
//转换性别ID
char? SexId = null;
char SexId = 'U';
if (!DataHelper.IsNullOrEmpty(input.SexName))
{
var SexEnt = await _sexRepository.FirstOrDefaultAsync(m => m.DisplayName == input.SexName);
@ -1285,7 +1285,7 @@ namespace Shentun.Peis.PatientRegisters
//婚姻状况
char? MaritalStatusId = null;
char MaritalStatusId = '9';
if (!DataHelper.IsNullOrEmpty(input.MaritalStatusName))
{
var MaritalStatusEnt = await _maritalStatusRepository.FirstOrDefaultAsync(m => m.DisplayName == input.MaritalStatusName);
@ -1327,7 +1327,6 @@ namespace Shentun.Peis.PatientRegisters
//单位分组信息
if (CustomerOrgGroupEnt.ForSexId != ForSexFlag.All
&& SexId != null
&& CustomerOrgGroupEnt.ForSexId != SexId)
{
msg = new CreatePatientRegisterExcelDto { code = -1, msg = "[数据：" + input.PatientName + "的性别不符合所选的单位分组]=>" + "导入失败" };
@ -1523,7 +1522,7 @@ namespace Shentun.Peis.PatientRegisters
}
else
{
var PatientEnt_New = await _patientManager.CreateAsync(input.OrganizationUnitId.Value, createPatientEntity);
var PatientEnt_New = await _patientManager.CreateAsync(input.OrganizationUnitId, createPatientEntity);
if (PatientEnt_New != null)
PatientId = PatientEnt_New.Id;
}
@ -1608,20 +1607,20 @@ namespace Shentun.Peis.PatientRegisters
AuditDate = PageHelper.ConvertDate(input.AuditDate),
AuditDoctor = input.AuditDoctor,
BirthDate = PageHelper.ConvertDate(input.BirthDate),
CompleteFlag = input.CompleteFlag,
CompleteFlag = input.CompleteFlag.Value,
CustomerOrgGroupId = CustomerOrgGroupId,
CustomerOrgId = input.CustomerOrgId,
CustomerOrgRegisterId = input.CustomerOrgRegisterId,
GuidePrintTimes = input.GuidePrintTimes,
GuidePrintTimes = input.GuidePrintTimes.Value,
InterposeMeasure = input.InterposeMeasure,
IsAudit = input.IsAudit,
IsAudit = input.IsAudit.Value,
IsLock = input.IsLock,
IsMedicalStart = input.IsMedicalStart,
IsNameHide = input.IsNameHide,
IsPhoneFollow = input.IsPhoneFollow,
IsRecoverGuide = input.IsRecoverGuide,
IsUpload = input.IsUpload,
IsVip = input.IsVip,
IsMedicalStart = input.IsMedicalStart.Value,
IsNameHide = input.IsNameHide.Value,
IsPhoneFollow = input.IsPhoneFollow.Value,
IsRecoverGuide = input.IsRecoverGuide.Value,
IsUpload = input.IsUpload.Value,
IsVip = input.IsVip.Value,
JobCardNo = input.JobCardNo,
JobPost = input.JobPost,
JobTitle = input.JobTitle,
@ -1635,11 +1634,11 @@ namespace Shentun.Peis.PatientRegisters
OrganizationUnitId = input.OrganizationUnitId,
PatientId = PatientId,
PatientName = input.PatientName,
PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(input.OrganizationUnitId.Value),
PatientRegisterNo = await _patientRegisterManager.CreatePatientRegisterNo(input.OrganizationUnitId),
PersonnelTypeId = PersonnelTypeId,
Photo = input.Photo,
Remark = input.Remark,
ReportPrintTimes = input.ReportPrintTimes,
ReportPrintTimes = input.ReportPrintTimes.Value,
Salesman = input.Salesman,
SexHormoneTermId = SexHormoneTermId,
SexId = SexId,
@ -1672,7 +1671,7 @@ namespace Shentun.Peis.PatientRegisters
foreach (var item in customerOrgGroupDetailList)
{
await _registerAsbitemManager.CreateAsync(input.OrganizationUnitId.Value, item, true);
await _registerAsbitemManager.CreateAsync(input.OrganizationUnitId, item, true);
}
#endregion
@ -2137,7 +2136,7 @@ namespace Shentun.Peis.PatientRegisters
foreach (var item in newRegisterAsbitemList)
{
await _registerAsbitemManager.CreateAsync(patientRegisterEnt.OrganizationUnitId.Value, item, true);
await _registerAsbitemManager.CreateAsync(patientRegisterEnt.OrganizationUnitId, item, true);
}
}
@ -2412,7 +2411,7 @@ namespace Shentun.Peis.PatientRegisters
if (input.CompleteFlag != null)
{
patientRegisterList.ForEach(f => f.CompleteFlag = input.CompleteFlag);
patientRegisterList.ForEach(f => f.CompleteFlag = input.CompleteFlag.Value);
IsUpdate = true;
}

8
src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
View File

@ -140,9 +140,9 @@ namespace Shentun.Peis.PrintReports
{
#region 系统参数配置
var MedicalCenterAddress = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId.Value, "medical_center_address");
var MedicalCenterFax = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId.Value, "medical_center_fax");
var MedicalCenterTelphone = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId.Value, "medical_center_telphone");
var MedicalCenterAddress = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId, "medical_center_address");
var MedicalCenterFax = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId, "medical_center_fax");
var MedicalCenterTelphone = await _sysParmValueManager.GetSysParmValueInOrganizationUnitId(patientRegisterEnt.OrganizationUnitId, "medical_center_telphone");
#endregion
msg = new PeisReportDto
@ -154,7 +154,7 @@ namespace Shentun.Peis.PrintReports
detailedResultsListDtos = new List<DetailedResultsListDto>(),
MedicalCenterAddress = MedicalCenterAddress,
MedicalStartDate = patientRegisterEnt.MedicalStartDate.ToString(),
OrganizationUnitId = patientRegisterEnt.OrganizationUnitId.Value,
OrganizationUnitId = patientRegisterEnt.OrganizationUnitId,
OrganizationUnitName = organizationUnitList.Where(m => m.Id == patientRegisterEnt.OrganizationUnitId).Select(s => s.DisplayName).FirstOrDefault(),
PatientName = patientRegisterEnt.PatientName,
PatientNo = patientRegisterEnt.Patient.PatientNo,

2
src/Shentun.Peis.Domain/DataHelper.cs
View File

@ -520,7 +520,7 @@ namespace Shentun.Peis
public static void CheckSex(char value)
{
if (value.ToString() != SexFlag.Male && value.ToString() != SexFlag.Female && value.ToString() != SexFlag.UnKnown)
if (value != SexFlag.Male && value != SexFlag.Female && value != SexFlag.UnKnown)
{
throw new ArgumentException($"性别参数不正确");
}

4
src/Shentun.Peis.EntityFrameworkCore/DbMapping/PatientRegisters/PatientRegisterDbMapping.cs
View File

@ -81,7 +81,7 @@ namespace Shentun.Peis.DbMapping
entity.Property(t => t.ReportPrintTimes).HasComment("体检报告打印次数").IsRequired().HasDefaultValue((short)0);
entity.Property(t => t.IsUpload).HasComment("是否上传到WEB").IsRequired().HasDefaultValueSql("'N'");
entity.Property(t => t.IsMedicalStart).HasComment("体检开始标志").IsRequired().HasDefaultValueSql("'N'");
entity.Property(t => t.IsRecoverGuide).HasComment("指引单收回").IsRequired().HasDefaultValueSql("'N'");
entity.Property(t => t.SummaryDate).HasComment("总检日期");
entity.Property(t => t.SummaryDoctor).HasComment("总检医生");
@ -96,7 +96,7 @@ namespace Shentun.Peis.DbMapping
entity.Property(t => t.GuidePrintTimes).HasComment("指引单打印次数").IsRequired().HasDefaultValue((short)0);
entity.Property(t => t.Remark).HasComment("备注");
entity.Property(t => t.OrganizationUnitId).HasComment("体检中心ID").IsRequired();
entity.Property(t => t.CustomerOrgRegisterId).HasComment("客户单位登记ID");
entity.Property(t => t.CustomerOrgRegisterId).HasComment("客户单位登记ID").HasDefaultValue(Guid.Empty);
//entity.HasOne(d => d.CustomerOrgRegister)

12
src/Shentun.Peis.EntityFrameworkCore/PrintReports/PatientRegisterGuideReportRepository.cs
View File

@ -57,7 +57,7 @@ namespace Shentun.Peis.PrintReports
var ApiUrl = _configuration.GetValue<string>("HostUrl:ApiUrl") + "/";
Guid OrOrganizationUnitId = (await GetAsync(f => f.Id == PatientRegisterIds.First())).OrganizationUnitId.Value;
Guid OrOrganizationUnitId = (await GetAsync(f => f.Id == PatientRegisterIds.First())).OrganizationUnitId;
#region 系统参数配置
@ -109,9 +109,9 @@ namespace Shentun.Peis.PrintReports
// Photo = string.IsNullOrEmpty(a.Photo) ? "" : ImageHelper.GetImageBase64StringAsync(a.Photo),
Photo = string.IsNullOrEmpty(a.Photo) ? "" : ApiUrl + a.Photo,
MedicalStartDate = Convert.ToDateTime(a.MedicalStartDate.ToString()).ToString("yyyy-MM-dd"),
OrganizationUnitId = a.OrganizationUnitId.Value,
OrganizationUnitId = a.OrganizationUnitId,
OrganizationUnitName = ag.DisplayName,
Detail = PatientRegisterGuideAsbitem(a.Id, OrOrganizationUnitId, a.SexId.Value)
Detail = PatientRegisterGuideAsbitem(a.Id, OrOrganizationUnitId, a.SexId)
};
return query.ToList();
@ -122,7 +122,7 @@ namespace Shentun.Peis.PrintReports
{
var ApiUrl = _configuration.GetValue<string>("HostUrl:ApiUrl") + "/";
Guid OrOrganizationUnitId = (await GetAsync(f => f.Id == PatientRegisterId)).OrganizationUnitId.Value;
Guid OrOrganizationUnitId = (await GetAsync(f => f.Id == PatientRegisterId)).OrganizationUnitId;
#region 系统参数配置
@ -172,9 +172,9 @@ namespace Shentun.Peis.PrintReports
// Photo = string.IsNullOrEmpty(a.Photo) ? "" : ImageHelper.GetImageBase64StringAsync( a.Photo),
Photo = string.IsNullOrEmpty(a.Photo) ? "" : ApiUrl + a.Photo,
MedicalStartDate = Convert.ToDateTime(a.MedicalStartDate.ToString()).ToString("yyyy-MM-dd"),
OrganizationUnitId = a.OrganizationUnitId.Value,
OrganizationUnitId = a.OrganizationUnitId,
OrganizationUnitName = ag.DisplayName,
Detail = PatientRegisterGuideAsbitem(a.Id, OrOrganizationUnitId, a.SexId.Value)
Detail = PatientRegisterGuideAsbitem(a.Id, OrOrganizationUnitId, a.SexId)
};

Write Preview
Loading…
Cancel
Save