采样

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
         /// 项目价格
         /// </summary>
         public decimal AsbitemPrice { get; set; }
+
+        /// <summary>
+        /// 采样时间
+        /// </summary>
+        public string SamplingTime { get; set; }
     }
 }

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()
                     };
 

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;
                                     }