diff --git a/src/Shentun.Peis.Application.Contracts/LisRequests/LisPatientRegisterDto.cs b/src/Shentun.Peis.Application.Contracts/LisRequests/LisPatientRegisterDto.cs index a1a478b..4bf4b1b 100644 --- a/src/Shentun.Peis.Application.Contracts/LisRequests/LisPatientRegisterDto.cs +++ b/src/Shentun.Peis.Application.Contracts/LisRequests/LisPatientRegisterDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using System.Text; namespace Shentun.Peis.LisRequests @@ -53,5 +54,10 @@ namespace Shentun.Peis.LisRequests /// 项目价格 /// public decimal AsbitemPrice { get; set; } + + /// + /// 采样时间 + /// + public string SamplingTime { get; set; } } } diff --git a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs index 060e20c..d9df35b 100644 --- a/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs +++ b/src/Shentun.Peis.Application/LisRequests/LisRequestAppService.cs @@ -662,7 +662,6 @@ namespace Shentun.Peis.LisRequests { if (lisRequestNoPrintMode == "0") { - var query = (from lisRequest in await _lisRequestRepository.GetQueryableAsync() join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on lisRequest.Id equals registerCheckAsbitem.LisRequestId join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id @@ -744,7 +743,8 @@ namespace Shentun.Peis.LisRequests { AsbitemId = ss.registerCheckAsbitem.AsbitemId, AsbitemName = ss.asbitem.DisplayName, - AsbitemPrice = ss.registerCheckAsbitem.ChargePrice * ss.registerCheckAsbitem.Amount + AsbitemPrice = ss.registerCheckAsbitem.ChargePrice * ss.registerCheckAsbitem.Amount, + SamplingTime = DataHelper.ConversionDateToString(ss.lisRequest.SamplingTime) }).ToList() }; diff --git a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs index c5f8963..10c95ca 100644 --- a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs +++ b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs @@ -372,7 +372,7 @@ namespace Shentun.Peis.RegisterChecks registerCheck.AuditorName = input.AuditorName; if (!string.IsNullOrWhiteSpace(input.LisSampleNo)) registerCheck.LisSampleNo = input.LisSampleNo; - if (input.SubmissionTime!=null) + if (input.SubmissionTime != null) registerCheck.SubmissionTime = input.SubmissionTime; if (input.AuditorTime != null) registerCheck.AuditorTime = input.AuditorTime; @@ -711,12 +711,12 @@ namespace Shentun.Peis.RegisterChecks } if (!string.IsNullOrWhiteSpace(checkDoctorEnt.AuditorUserId)) { - if (registerCheckEnt.AuditTime == null) + + if (registerCheckEnt.AuditorTime == null) { - registerCheckEnt.AuditTime = DateTime.Now; + registerCheckEnt.AuditorTime = DateTime.Now; } - registerCheckEnt.IsAudit = 'Y'; - registerCheckEnt.AuditorUserId = Guid.Parse(checkDoctorEnt.AuditorUserId); + registerCheckEnt.AuditorName = checkDoctorEnt.AuditorUserId; isUpdate = true; }