From 4fee73a692d5e972650a24ebc1cd39c1bc49df2a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 15 Apr 2022 15:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/StudyService.cs       |  6 +++---
 .../Service/Inspection/InspectionService.cs   | 19 ++++++++++++++-----
 .../Service/Visit/SubjectService.cs           |  6 +++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index f2a50de8f..0301c7931 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -161,10 +161,10 @@ namespace IRaCIS.Application.Services
                 SubjectVisitName = subjectVisit.VisitName,
                 BlindName = subjectVisit.BlindName,
                 SubjectVisitId = subjectVisit.Id,
-                Identification = "Edit|Visit|Status|Visit-Image Uplo",
+                Identification = "Edit|Visit|Status|Visit-Image Upload",
                 JsonDetail= JsonConvert.SerializeObject(new {
-                    SubmitState= subjectVisit.SubmitState,
-                    VisitExecuted= subjectVisit.VisitExecuted,
+                    SubmitState= "已提交",
+                   
                 })
 
             }).Wait();
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 99ff2727b..9f751a267 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -543,11 +543,20 @@ namespace IRaCIS.Core.Application.Service.Inspection
             #endregion
 
             #region 取操作类型
-            var from =await _frontAuditConfigRepository.FirstOrDefaultAsync(x => x.Identification == Data.Identification);
-            Data.ObjectType = from.ObjectTypeId;
-            Data.OptType = from.OptTypeId;
-            Data.ChildrenType = from.ChildrenTypeId;
-            Data.ModuleType = from.ModuleTypeId;
+            try
+            {
+                var from = await _frontAuditConfigRepository.FirstOrDefaultAsync(x => x.Identification == Data.Identification);
+                Data.ObjectType = from.ObjectTypeId;
+                Data.OptType = from.OptTypeId;
+                Data.ChildrenType = from.ChildrenTypeId;
+                Data.ModuleType = from.ModuleTypeId;
+            }
+            catch (Exception)
+            {
+
+                throw new BusinessValidationFailedException("操作标识异常");
+            }
+        
 
             #endregion
 
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
index 4c09c50a8..224663e8d 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
@@ -133,11 +133,11 @@ namespace IRaCIS.Application.Services
                         {
                             VisitName = item.VisitName,
                             VisitNum = item.VisitNum,
-                            IsBaseLine=item.IsBaseLine,
+                            IsBaseLine=item.IsBaseLine ? "是" : "否",
                             VisitExecuted= "否",
-                            IsFinalVisit=item.IsFinalVisit,
+                            IsFinalVisit=item.IsFinalVisit ? "是" : "否",
                             PDState="",
-                            IsLostVisit=item.IsLostVisit,
+                            IsLostVisit=item.IsLostVisit?"是":"否",
 
                         })
                     });