标本状态

src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs

@@ -80,5 +80,10 @@ namespace Shentun.Peis.ImportLisResults
         /// 送检时间  第三方
         /// </summary>
         public DateTime? SubmissionTime { get; set; }
+
+        /// <summary>
+        /// 标本状态
+        /// </summary>
+        public string SpecimenStatus { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs

@@ -76,5 +76,9 @@ namespace Shentun.Peis.ImportLisResults
         public DateTime? SubmissionTime { get; set; }
 
 
+        /// <summary>
+        /// 标本状态
+        /// </summary>
+        public string SpecimenStatus { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs

@@ -361,6 +361,14 @@ namespace Shentun.Peis.PrintReports
         /// </summary>
         public string SubmissionTime { get; set; }
 
+
+        /// <summary>
+        /// 标本状态
+        /// </summary>
+        public string SpecimenStatus { get; set; }
+
+          
+
         /// <summary>
         /// 项目类别下的组合项目列表
         /// </summary>

src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs

@@ -55,5 +55,10 @@ namespace Shentun.Peis.Reports
         /// 是否上传图片
         /// </summary>
         public bool isUploadPic { get; set; }
+
+        /// <summary>
+        /// 标本状态
+        /// </summary>
+        public string specimenStatus { get; set; }
     }
 }

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -253,6 +253,18 @@ namespace Shentun.Peis.ImportLisResults
                 }
 
             }
+
+
+            #region 更新lis申请表的标本状态
+            if (input.Any() && !string.IsNullOrWhiteSpace(input.FirstOrDefault().SpecimenStatus))
+            {
+                var lisRequestFirst = list.FirstOrDefault().lisRequest;
+                lisRequestFirst.SpecimenStatus = input.FirstOrDefault().SpecimenStatus;
+                await _lisRequestRepository.UpdateAsync(lisRequestFirst);
+            }
+            #endregion
+
+
             await CurrentUnitOfWork.SaveChangesAsync();
             //保存结果
 
@@ -559,7 +571,8 @@ namespace Shentun.Peis.ImportLisResults
                         AuditorName = item.AuditorName,
                         LisSampleNo = item.LisSampleNo,
                         AuditorTime = item.AuditorTime,
-                        SubmissionTime = item.SubmissionTime
+                        SubmissionTime = item.SubmissionTime,
+                        SpecimenStatus = item.SpecimenStatus
                     };
                     inputDtoList.Add(inputDto);
                 }
@@ -699,6 +712,16 @@ namespace Shentun.Peis.ImportLisResults
                 }
 
             }
+
+            #region 更新lis申请表的标本状态
+            if (input.Any() && !string.IsNullOrWhiteSpace(input.FirstOrDefault().SpecimenStatus))
+            {
+                var lisRequestFirst = list.FirstOrDefault().lisRequest;
+                lisRequestFirst.SpecimenStatus = input.FirstOrDefault().SpecimenStatus;
+                await _lisRequestRepository.UpdateAsync(lisRequestFirst);
+            }
+            #endregion
+
             await CurrentUnitOfWork.SaveChangesAsync();
             //保存结果
 
@@ -823,7 +846,7 @@ namespace Shentun.Peis.ImportLisResults
         }
 
 
-    
+
 
         #endregion
     }

src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs

@@ -1106,6 +1106,7 @@ namespace Shentun.Peis.Reports.ConvertRpt
                         auditDateTime = asbitem.AuditTime,
                         auditorDateTime = asbitem.AuditorTime,
                         submissionDateTime = asbitem.SubmissionTime,
+                        specimenStatus = asbitem.SpecimenStatus
                     };
 
 
@@ -1511,7 +1512,7 @@ namespace Shentun.Peis.Reports.ConvertRpt
                         checkDoctorSignUrl = asbitem.CheckDoctorSignUrl,
                         checkDate = asbitem.CheckDate.ToString("yyyy-MM-dd HH:mm:ss"),
                         auditorName = string.IsNullOrWhiteSpace(asbitem.AuditorName) ? asbitem.AuditorUserName : asbitem.AuditorName,
-                        auditorSignUrl = string.IsNullOrWhiteSpace(asbitem.AuditorNameSignUrl)? asbitem.AuditorUserSignUrl: asbitem.AuditorNameSignUrl,
+                        auditorSignUrl = string.IsNullOrWhiteSpace(asbitem.AuditorNameSignUrl) ? asbitem.AuditorUserSignUrl : asbitem.AuditorNameSignUrl,
                         samplerName = asbitem.SamplerName,
                         samplingDateTime = asbitem.SamplingTime,
                         lisSampleNo = asbitem.LisSampleNo,
@@ -1521,6 +1522,7 @@ namespace Shentun.Peis.Reports.ConvertRpt
                         auditDateTime = asbitem.AuditTime,
                         auditorDateTime = asbitem.AuditorTime,
                         submissionDateTime = asbitem.SubmissionTime,
+                        specimenStatus = asbitem.SpecimenStatus,
                         isUploadPic = asbitem.Pictures.Count > 0 ? true : false,
                     };
 

src/Shentun.Peis.Domain/LisRequests/LisRequest.cs

@@ -95,6 +95,13 @@ namespace Shentun.Peis.Models
         [Column("exec_flag")]
         public char ExecFlag { get; set; }
 
+        /// <summary>
+        /// 标本状态 蓝豚用
+        /// </summary>
+        [Column("specimen_status")]
+        [StringLength(50)]
+        public string SpecimenStatus { get; set; }
+
 
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }

src/Shentun.Peis.EntityFrameworkCore/DbMapping/LisRequests/LisRequestDbMapping.cs

@@ -28,9 +28,10 @@ namespace Shentun.Peis.DbMapping
             entity.Property(t => t.SignInTime).HasComment("签收时间");
             entity.Property(t => t.DeviceLisRequestPrintTimes).HasComment("设备检验条码打印次数").IsRequired().HasDefaultValue((short)0);
             entity.Property(t => t.ExecFlag).HasComment("执行标志 跟第三方对接标记状态").IsRequired().HasDefaultValueSql("'0'");
+            entity.Property(t => t.SpecimenStatus).HasComment("标本状态 蓝豚用");
             entity.Property(e => e.Id).ValueGeneratedNever();
 
-
+            
 
             //entity.HasOne(d => d.PatientRegister)
             //    .WithMany(p => p.LisRequests)