Merge branch 'Test.IRC' of http://192.168.3.69:3000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.API/wwwroot/swagger/ui/abp.swagger.js

@@ -276,8 +276,10 @@ var abp = abp || {};
         }
 
         var password = document.getElementById('password').value;
-        if (!password) {
+        var pwdMd5 = document.getElementById('pwdMd5').value;
-            alert('PassWord Can Not Be Null');
+        console.log(pwdMd5);
+        if (!password && !pwdMd5) {
+            alert('PassWord And Md5 Can Not Be Null');
             return false;
         }
 
@@ -321,6 +323,9 @@ var abp = abp || {};
             UserName: usernameOrEmailAddress,
             Password: hex_md5(password),
         }
+        if (pwdMd5 != '') {
+            parm.Password = pwdMd5;
+        }
         xhr.send(JSON.stringify(parm));
         //xhr.send("{" + "userName:'" + usernameOrEmailAddress + "'," + "passWord:'" + password + "'}");
 
@@ -415,7 +420,8 @@ var abp = abp || {};
         //Inputs
         createInput(modalUxContent, 'tenancyName', 'Tenancy Name (Leave empty for Host)');
         createInput(modalUxContent, 'userName', 'Username or email address','text','cyldev');
-        createInput(modalUxContent, 'password', 'Password','password','123456');
+        createInput(modalUxContent, 'password', 'Password', 'password', '123456');
+        createInput(modalUxContent, 'pwdMd5', 'PwdMd5', 'text', '');
 
         //Buttons
         var authBtnWrapper = document.createElement('div');

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -451,7 +451,7 @@ namespace IRaCIS.Core.Application.Image.QA
                         //.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
                         .ProjectTo<QCVisitViewModel>(_mapper.ConfigurationProvider);
 
-            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(SubjectVisit.SubjectId), nameof(SubjectVisit.VisitNum) };
+            var defalutSortArray = new string[] { nameof(SubjectVisit.IsUrgent) + " desc", nameof(QCVisitViewModel.AuditState) +" asc" };
             var pageList = await query.ToPagedListAsync(visitSearchDTO.PageIndex, visitSearchDTO.PageSize, visitSearchDTO.SortField, visitSearchDTO.Asc, string.IsNullOrWhiteSpace(visitSearchDTO.SortField), defalutSortArray);
 
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -514,11 +514,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string QuestionEnName { get; set; } = string.Empty;
 
-		
+
+        public List<string> ParentTriggerValueList { get; set; }
+        public List<string> RelevanceValueList { get; set; }
 
 
-
+    }
-	}
 
 	public class ReadingCriterionPageView
 	{
@@ -1038,10 +1039,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueOfType? ValueType { get; set; }
 
-		/// <summary>
+        public List<string> ParentTriggerValueList { get; set; }
-		/// 备注
+        public List<string> RelevanceValueList { get; set; }
-		/// </summary>
+
-		public string Remark { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
 
 		/// <summary>
 		/// 数据来源
@@ -1730,7 +1734,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 问题英文分组
 		/// </summary>
 		public string GroupEnName { get; set; } = string.Empty;
-	}
+
+        public List<string> ParentTriggerValueList { get; set; }
+        public List<string> RelevanceValueList { get; set; }
+    }
 
 
 

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -271,6 +271,8 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingQuestionSystem(AddOrUpdateReadingQuestionSystemInDto indto)
         {
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
             if (indto.Id != null)
             {
                 var trialIdList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionSystemId == indto.Id && x.IsJudgeQuestion && x.JudgeType != JudgeTypeEnum.None)
@@ -371,10 +373,11 @@ namespace IRaCIS.Application.Services
         /// <param name="addOrEditReadingTableQuestionSystem"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit addOrEditReadingTableQuestionSystem)
+        public async Task<IResponseOutput> AddOrUpdateReadingTableQuestionSystem(ReadingTableQuestionSystemAddOrEdit indto)
         {
-
+            indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
-            var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(addOrEditReadingTableQuestionSystem, true);
+            indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
+            var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(indto, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());
 

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -20,7 +20,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             {CriterionType.PCWG3,typeof(PCWG3CalculateService) },
             {CriterionType.SelfDefine,typeof(SelfDefineCalculateService) },
             {CriterionType.RECIST1Pointt1_MB,typeof(RECIST1Point1_BMCalculateService) },
-            {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) }
+            {CriterionType.IRECIST1Point1,typeof(IRECIST1Point1CalculateService) },
+            {CriterionType.Lugano2014,typeof(LuganoCalculateService) }
         };
 
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -5,6 +5,7 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -221,9 +222,44 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("RelevanceId")]
 		public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; }
 
+        [NotMapped]
+        public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
 
 
-	}
+        [NotMapped]
+        public List<string> RelevanceValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.RelevanceValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+    }
 
 
 	

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs

@@ -7,6 +7,9 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+using System.Linq;
+
 namespace IRaCIS.Core.Domain.Models
 {
 	 ///<summary>
@@ -176,7 +179,44 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("DependParentId")]
 		[JsonIgnore]
 		public ReadingTableQuestionSystem DependParentQuestion { get; set; }
-	}
+
+        [NotMapped]
+        public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+
+        [NotMapped]
+        public List<string> RelevanceValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.RelevanceValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+    }
 
 	 
 }