IRaCIS.Core.API/appsettings.Test_Study.json

@@ -30,8 +30,8 @@
   },
 
   "ConnectionStrings": {
-    "RemoteNew": "Server=101.132.193.237,1435;Database=Test_Study;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=101.132.193.237,1435;Database=Test_Study_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true",
+    "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.Study.hangfire;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"
   },
   "BasicSystemConfig": {
 

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -16,7 +16,6 @@ using NPOI.HPSF;
 using NPOI.HSSF.UserModel;
 using NPOI.XSSF.UserModel;
 using SkiaSharp;
-using System.Collections;
 using System.IO;
 
 namespace IRaCIS.Core.Application.Service;
@@ -53,24 +52,21 @@ public static class ExcelExportHelper
             var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
 
-            var dic = data.ConvertToDictionary();
+            var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
 
 
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
+                if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
                 {
 
                     var newObjList = new List<object>();
                     var no = 1;
 
-                    foreach (var item in dic[key] as IList )
+                    foreach (var item in dic[key] as JArray)
                     {
-                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
-
-                        var itemDic = item.ConvertToDictionary();
-
+                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
 
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
@@ -78,7 +74,7 @@ public static class ExcelExportHelper
                             //翻译的属性依赖其他属性
                             if (needTranslateProperty.IsTranslateDenpendOtherProperty)
                             {
-                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                if (item[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 
@@ -236,30 +232,29 @@ public static class ExcelExportHelper
 
             var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
 
-            var dic = data.ConvertToDictionary();
-            //var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
+
+            var dic = (JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull())).IfNullThrowException();
 
             foreach (var key in dic.Keys)
             {
                 //是数组 那么找到对应的属性 进行翻译
-                if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>)))
-                //if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
                 {
 
                     var newObjList = new List<object>();
                     var no = 1;
-                    foreach (var item in dic[key] as IList)
-                    //foreach (var item in dic[key] as JArray)
+
+                    foreach (var item in dic[key] as JArray)
                     {
-                        //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
-                        var itemDic = item.ConvertToDictionary();
+                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+
 
                         foreach (var needTranslateProperty in needTranslatePropertyList)
                         {
                             //翻译的属性依赖其他属性
                             if (needTranslateProperty.IsTranslateDenpendOtherProperty)
                             {
-                                if (itemDic[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
+                                if (item[needTranslateProperty.DependPropertyName]?.ToString().ToLower() == needTranslateProperty.DependPropertyValueStr.ToLower())
                                 {
                                     var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
 

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -164,7 +164,7 @@ public static class FileStoreHelper
     {
         var rootPath = GetIRaCISRootPath(_hostEnvironment);
 
-        var physicalFilePath = Path.Combine(rootPath, relativePath.TrimStart('/'));
+        var physicalFilePath = Path.Combine(rootPath, relativePath.Trim('/'));
 
         return physicalFilePath;
     }

IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs

@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Mvc;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -100,36 +99,14 @@ namespace IRaCIS.Core.Application.Service
                         //---读取模板内容失败, 请将文件另存为docx格式尝试!
                         return ResponseOutput.NotOk(_localizer["Document_ TemplateRead"]);
                     }
+
+
                 }
             }
 
+            var entity = await _commonDocumentRepository.InsertOrUpdateAsync(addOrEditCommonDocument, true, verifyExp1, verifyExp2);
 
-            if (addOrEditCommonDocument.Id == null) //insert
-            {
-
-
-                var entity = await _commonDocumentRepository.InsertFromDTOAsync(addOrEditCommonDocument, true, verifyExp1, verifyExp2);
-
-                return ResponseOutput.Ok(entity.Id.ToString());
-            }
-            else //update
-            {
-
-                var dbbeforeEntity = await _commonDocumentRepository.UpdateFromDTOAsync(addOrEditCommonDocument, true, true, verifyExp1, verifyExp2);
-
-                var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, dbbeforeEntity.Path);
-
-                if (File.Exists(filePath))
-                {
-                    File.Delete(filePath);
-                }
-
-                return ResponseOutput.Ok();
-
-            }
-
-
-           
+            return ResponseOutput.Ok(entity.Id.ToString());
 
         }
 
@@ -137,20 +114,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpDelete("{commonDocumentId:guid}")]
         public async Task<IResponseOutput> DeleteCommonDocument(Guid commonDocumentId)
         {
-           var find= await _commonDocumentRepository.FirstOrDefaultNoTrackingAsync(t=>t.Id== commonDocumentId);
-      
             var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true,true);
-
-            if (find != null)
-            {
-                var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, find.Path);
-
-                if (File.Exists(filePath))
-                {
-                    File.Delete(filePath);
-                }
-            }
-
             return ResponseOutput.Ok();
         }
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -22,14 +22,14 @@ namespace IRaCIS.Application.Contracts
         [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
         public DateTime? DeletedTime { get; set; }
 
         public Guid? SiteId { get; set; }
         public string Phone { get; set; } = String.Empty;
         public DateTime UpdateTime { get; set; }
 
-        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -84,7 +84,7 @@ namespace IRaCIS.Application.Contracts
 
 
         [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")]
-        [ExcelFormat("yyyy-MM-dd HH:mm:ss")]
+        [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
         public DateTime CreateTime { get; set; }
 
 
@@ -118,8 +118,7 @@ namespace IRaCIS.Application.Contracts
 
     public class ExcelExportInfo : TrialSelectDTO
     {
-       
-        public string CurrentTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        public DateTime CurrentTime { get; set; } = DateTime.Now;
 
         public bool IsEn_US { get; set; }
 

IRaCIS.Core.Application/Triggers/VisitTaskIsFrontTaskNeedSignButNotSignTrigger.cs

@@ -22,14 +22,13 @@ namespace IRaCIS.Core.Application.Triggers
 
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
-        private readonly IRepository<SubjectAdditionalEvaluationResult> _subjectAdditionalEvaluationResultRepository;
-        private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
+
 
 
         public VisitTaskIsFrontTaskNeedSignButNotSignTrigger(
 
             IRepository<VisitTask> visitTaskRepository, IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository, IRepository<ReadingQuestionTrial> trialReadingQuestionRepository
-            , IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository, IRepository<SubjectAdditionalEvaluationResult> subjectAdditionalEvaluationResultRepository, IRepository<ReadingJudgeInfo> readingJudgeInfoRepository)
+            , IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository)
         {
             _trialReadingCriterionRepository = trialReadingCriterionRepository;
 
@@ -37,8 +36,6 @@ namespace IRaCIS.Core.Application.Triggers
             _trialReadingQuestionRepository = trialReadingQuestionRepository;
 
             _readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
-            _subjectAdditionalEvaluationResultRepository = subjectAdditionalEvaluationResultRepository;
-            _readingJudgeInfoRepository = readingJudgeInfoRepository;
         }
 
 
@@ -101,120 +98,7 @@ namespace IRaCIS.Core.Application.Triggers
                 }
 
             }
-            else if (context.ChangeType == ChangeType.Modified)
-            {
-                if (visitTask.ReadingCategory == ReadingCategory.Judge && (visitTask.TaskState == TaskState.Adbandon || visitTask.TaskState == TaskState.HaveReturned))
-                {
-                    var find = _readingJudgeInfoRepository.Where(t => t.JudgeTaskId == visitTask.Id).FirstOrDefault();
 
-                    if (find != null)
-                    {
-                        var ids = new Guid[] { find.TaskIdOne, find.TaskIdTwo };
-                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => ids.Contains(t.Id), u => new VisitTask() { JudgeResultTaskId = null });
-                    }
-                }
-            }
-            #region 附加评估 暂时废弃
-            //            //从未签名状态 改为签名状态时   判断是否进行了附加评估，将附加评估的结果冗余
-            //            if (context.ChangeType == ChangeType.Modified && visitTask.ReadingTaskState == ReadingTaskState.HaveSigned && context.UnmodifiedEntity.ReadingTaskState != ReadingTaskState.HaveSigned)
-            //            {
-
-            //                var criterion = _trialReadingCriterionRepository.Where(t => t.Id == visitTask.TrialReadingCriterionId).FirstOrDefault();
-
-            //                //如果是附加评估
-            //                if (criterion.IsAdditionalAssessment)
-            //                {
-
-
-            //                    if (visitTask.ReadingCategory == ReadingCategory.Visit)
-            //                    {
-
-
-            //                        switch (criterion.CriterionType)
-            //                        {
-            //                            case CriterionType.RECIST1Point1:
-            //                                var isbaseLine = _visitTaskRepository.Where(t => t.Id == visitTask.Id).Select(t => t.SourceSubjectVisit.IsBaseLine).FirstOrDefault();
-
-
-
-            //                                if (isbaseLine)
-            //                                {
-            //                                    var currentTaskAdditionarlAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == visitTask.Id &&
-            //                                    t.ReadingQuestionTrial.IsAdditional == true && t.ReadingQuestionTrial.Type != "group"
-            //                                    ).Include(t => t.ReadingQuestionTrial).FirstOrDefaultAsync();
-
-
-            //                                    //双重阅片完成了
-            //                                    if (criterion.ReadingType == ReadingMethod.Double &&
-            //(_visitTaskRepository.Where(t => t.SubjectId == visitTask.SubjectId && t.TaskName == visitTask.TaskName && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() == 2)
-            //                                       )
-            //                                    {
-
-            //                                        var otherTaskId = await _visitTaskRepository.Where(t => t.SubjectId == visitTask.SubjectId && t.TaskName == visitTask.TaskName && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.Id != visitTask.Id)
-            //                                            .Select(t => t.Id).FirstOrDefaultAsync();
-
-
-            //                                        var otherTaskAdditionarlAnswer = await _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == otherTaskId &&
-            //                                  t.ReadingQuestionTrial.IsAdditional == true && t.ReadingQuestionTrial.Type != "group"
-            //                                  ).Include(t => t.ReadingQuestionTrial).FirstOrDefaultAsync();
-
-
-
-            //                                        await _subjectAdditionalEvaluationResultRepository.AddAsync(new SubjectAdditionalEvaluationResult()
-            //                                        {
-            //                                            TrialReadingCriterionId = visitTask.TrialReadingCriterionId,
-            //                                            IsFinalResult = true,
-            //                                            SubjectId = visitTask.SubjectId,
-            //                                            TrialReadingQuestionId = currentTaskAdditionarlAnswer.ReadingQuestionTrialId,
-            //                                            FinalAnswer = currentTaskAdditionarlAnswer.Answer,
-            //                                            FinalTranslateDictionaryCode = currentTaskAdditionarlAnswer.ReadingQuestionTrial.DictionaryCode,
-
-            //                                        });
-
-            //                                    }
-            //                                    if (criterion.ReadingType == ReadingMethod.Single)
-            //                                    {
-
-            //                                        await _subjectAdditionalEvaluationResultRepository.AddAsync(new SubjectAdditionalEvaluationResult()
-            //                                        {
-            //                                            TrialReadingCriterionId = visitTask.TrialReadingCriterionId,
-            //                                            IsFinalResult = true,
-            //                                            SubjectId = visitTask.SubjectId,
-            //                                            TrialReadingQuestionId = currentTaskAdditionarlAnswer.ReadingQuestionTrialId,
-            //                                            FinalAnswer = currentTaskAdditionarlAnswer.Answer,
-            //                                            FinalTranslateDictionaryCode = currentTaskAdditionarlAnswer.ReadingQuestionTrial.DictionaryCode,
-
-            //                                        });
-
-            //                                    }
-
-
-
-            //                                }
-
-            //                                break;
-            //                            default:
-            //                                break;
-            //                        }
-
-
-
-
-
-            //                    }
-
-
-
-
-
-
-
-
-            //                }
-            //            }
-
-
-            #endregion
 
         }
 

IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs

@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Reflection;
 
 namespace IRaCIS.Core.Infrastructure.Extention
 {
@@ -40,30 +38,7 @@ namespace IRaCIS.Core.Infrastructure.Extention
 		public static string ToJsonNotIgnoreNull(this object obj)
 		{
 
-			return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", Formatting = Formatting.Indented, ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Include });
+			return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Include });
 		}
-
-		public static  Dictionary<string, object> ConvertToDictionary(this object obj)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
-
-            Type type = obj.GetType();
-            PropertyInfo[] properties = type.GetProperties();
-
-            Dictionary<string, object> dictionary = new Dictionary<string, object>();
-
-            foreach (PropertyInfo property in properties)
-            {
-                string propertyName = property.Name;
-                object propertyValue = property.GetValue(obj);
-
-                dictionary.Add(propertyName, propertyValue);
-            }
-
-            return dictionary;
-        }
-    }
+	}
 }