S-84

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -530,6 +530,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                  
                     SubjectId = x.SubjectId,
+                    IsNotNeedPMConfirm=x.IsNotNeedPMConfirm,
                     IsCRCConfirm = x.IsCRCConfirm,
                     IsCRCApplicationRevoke=x.IsCRCApplicationRevoke,
                     VisitBlindName=x.SubjectVisit.BlindName,
@@ -792,11 +793,16 @@ namespace IRaCIS.Core.Application.Service
 				});
             });
 
-            var readModuleIds = confirmlist.Select(x => x.ReadModuleId).ToList();
+            foreach (var item in confirmlist)
+            {
+                await _readModuleRepository.UpdatePartialFromQueryAsync(x =>x.Id==item.ReadModuleId , x => new ReadModule()
+                {
+                    IsCRCConfirm = true,
+                    IsPMConfirm=item.ClinicalFormList.Count()==0?true:false,
+                    IsNotNeedPMConfirm= item.ClinicalFormList.Count() == 0 ? true : false,
+                });
+            }
 
-            await _readModuleRepository.UpdatePartialFromQueryAsync(x => readModuleIds.Contains(x.Id),x=>new ReadModule() { 
-            IsCRCConfirm=true
-            });
             await _readModuleCriterionFromRepository.AddRangeAsync(needAddList);
 
             await _readModuleCriterionFromRepository.SaveChangesAsync();
@@ -835,11 +841,23 @@ namespace IRaCIS.Core.Application.Service
 				throw new BusinessValidationFailedException("PM已确认,无法取消！");
 			}
 
-
-			await _readModuleRepository.UpdatePartialFromQueryAsync(x => presentData.ReadModuleId==x.Id, x => new ReadModule()
-			{
-				IsCRCApplicationRevoke = true
-			});
+            if (presentData.IsNotNeedPMConfirm)
+            {
+                await _readModuleRepository.UpdatePartialFromQueryAsync(x => presentData.ReadModuleId == x.Id, x => new ReadModule()
+                {
+                    IsPMConfirm = false,
+                    IsCRCConfirm = false,
+                    IsNotNeedPMConfirm = false,
+                });
+            }
+            else
+            {
+                await _readModuleRepository.UpdatePartialFromQueryAsync(x => presentData.ReadModuleId == x.Id, x => new ReadModule()
+                {
+                    IsCRCApplicationRevoke = true,
+                });
+            }
+			
 
 			//await _readModuleCriterionFromRepository.BatchDeleteNoTrackingAsync(x=>x.ReadModuleId== presentData.ReadModuleId);