From 210323eb8af6f2baa7c5e4ec0632aec24dbd4b6c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 25 Apr 2022 17:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BF=E8=A7=86=E5=BA=9F?=
 =?UTF-8?q?=E9=99=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/SubjectVisitService.cs      | 70 +++++--------------
 IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs |  1 +
 2 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 6de03e7c..7fed6537 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -93,58 +93,38 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
-
             var subject = (await _subjectRepository.FirstOrDefaultAsync(t => t.Id == svCommand.SubjectId)).IfNullThrowException();
 
 
-
-          
-
             //更新受试者 首次给药日期 是否入组确认
-            if (svCommand.SubjectFirstGiveMedicineTime != null)
+            if (svCommand.SubjectFirstGiveMedicineTime != null && svCommand.IsBaseLine)
             {
+                //  更新受试者
+                subject.FirstGiveMedicineTime = svCommand.SubjectFirstGiveMedicineTime;
 
-                if (svCommand.IsBaseLine)
+
+                List<DataInspection> datas = new List<DataInspection>();
+
+                datas.Add(new DataInspection()
                 {
-                    List<DataInspection> datas = new List<DataInspection>();
-                    //  更新受试者
-                    subject.FirstGiveMedicineTime = svCommand.SubjectFirstGiveMedicineTime;
-                    datas.Add(new DataInspection()
-                    {
-                        SubjectId = subject.Id,
-                        SiteId = subject.SiteId,
-                        TrialId = subject.TrialId,
-                        IsSign = false,
-                        Identification = "Edit|Subject|Info|Subject",
-                        CreateTime = DateTime.Now.AddSeconds(1),
-                        JsonDetail = subject.ToJcJson(),
-                    });
-                    await _inspectionService.AddListInspectionRecordAsync(datas);
-                }
-                
-            }
+                    SubjectId = subject.Id,
+                    SiteId = subject.SiteId,
+                    TrialId = subject.TrialId,
+                    IsSign = false,
+                    Identification = "Edit|Subject|Info|Subject",
+                    CreateTime = DateTime.Now.AddSeconds(1),
+                    JsonDetail = subject.ToJcJson(),
+                });
+                await _inspectionService.AddListInspectionRecordAsync(datas);
 
-            if (svCommand.IsEnrollmentConfirm != null)
-            {
-
-               await _subjectVisitRepository.BatchUpdateAsync(t => t.SubjectId == svCommand.SubjectId && t.IsBaseLine , u => new SubjectVisit() { IsEnrollmentConfirm = svCommand.IsEnrollmentConfirm.Value });
-
-             
-                //needDealEntity.IsUrgent = true;
             }
 
             
             await _repository.SaveChangesAsync();
 
-            bool isadd = false;
+
 
             if (svCommand.Id == null)
-            {
-                isadd = true;
-            }
-
-
-            if (isadd)
             {
                 List<DataInspection> dataInspection=new List<DataInspection>();
 
@@ -164,22 +144,6 @@ namespace IRaCIS.Core.Application.Services
                 await _inspectionService.AddListInspectionRecordAsync(dataInspection);
             }
 
-            // 保存数据后，重新算下是否缺失影像  应对状态撤回
-            //if (svCommand.IsLostVisit == false)
-            //{
-
-            //    var currentSubmittedVisitNum = await _repository.Where<SubjectVisit>(t => t.SubmitState == SubmitStateEnum.Submitted).MaxAsync(t => t.VisitNum);
-
-            //    var isMissing = await _repository.AnyAsync<SubjectVisit>(t => (t.VisitNum < currentSubmittedVisitNum && t.SubmitState != SubmitStateEnum.Submitted) || t.IsLostVisit);
-
-            //    await _repository.UpdateFromQueryAsync<Subject>(t => t.Id == svCommand.SubjectId, u => new Subject()
-            //    {
-            //        IsMissingImages = isMissing
-            //    });
-            //}
-
-
-           
 
             return ResponseOutput.Ok(dbBeforeEntity.Id.ToString());
 
diff --git a/IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs b/IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs
index 06b6b66e..3e32a276 100644
--- a/IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs
+++ b/IRaCIS.Core.Domain.Share/QC/AuditStateEnum.cs
@@ -8,6 +8,7 @@ namespace IRaCIS.Core.Domain.Share
         //不可用
         None = 0,
 
+        //  待审核\ 待初审
         ToAudit = 3,
 
         //1st QC进行了操作