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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1077,7 +1077,8 @@
             <summary>
             翻译稽查数据
             </summary>
-            <param name="dto">传入Dto</param>
+            <param name="dto"></param>
+            <param name="currentInspectionId"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetDataInspectionDateType(System.Collections.Generic.List{System.String},System.String)">
@@ -3090,6 +3091,8 @@
             <param name="item"></param>
             <param name="questions"></param>
             <param name="tableQuestions"></param>
+            <param name="answers"></param>
+            <param name="tableAnswers"></param>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ClinicalQuestionService.GetTrialClinicalQuestionList(IRaCIS.Core.Application.Service.Reading.Dto.TrialClinicalQuestionQuery)">
             <summary>
@@ -12951,11 +12954,12 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.VerifyCalculateRelation(System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.CalculateRelationDto},System.Guid,System.Guid,System.Int32)">
             <summary>
-            验证计算关系
+             验证计算关系
             </summary>
             <param name="relationList"></param>
             <param name="QuestionId"></param>
             <param name="originalId"></param>
+            <param name="count"></param>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetQuestionCalculateRelation(IRaCIS.Core.Application.Service.Reading.Dto.GetQuestionCalculateRelationInDto)">
@@ -13221,6 +13225,8 @@
             </summary>
             <param name="trialReadingCriterionId"></param>
             <param name="visitTaskId"></param>
+            <param name="questionClassify"></param>
+            <param name="groupClassifyList"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
@@ -13263,11 +13269,18 @@
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Boolean,System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Nullable{System.Guid})">
             <summary>
-            获取子元素
+             获取子元素
             </summary>
             <param name="item"></param>
             <param name="questionlists"></param>
             <param name="tableQuestionLists"></param>
+            <param name="tableAnswers"></param>
+            <param name="tableAnsweRowInfos"></param>
+            <param name="organInfos"></param>
+            <param name="baseLineTableAnswer"></param>
+            <param name="isFirstChangeTask"></param>
+            <param name="lastTaskTableAnswer"></param>
+            <param name="TaskId"></param>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SplitLesion(IRaCIS.Core.Application.Service.Reading.Dto.SplitLesionInDto)">
             <summary>

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

@@ -27,7 +27,6 @@ namespace IRaCIS.Application.Services
 		private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystem;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
-        private readonly IReadingQuestionService _readingQuestionService;
 
         public DictionaryService(IRepository<Dictionary> sysDicRepository, IRepository<DoctorDictionary> doctorDictionaryRepository, IRepository<TrialDictionary> trialDictionaryRepository,
             IRepository<Doctor> doctorRepository, IRepository<Trial> trialRepository,
@@ -37,8 +36,7 @@ namespace IRaCIS.Application.Services
 						 IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
 			 IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
                  IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystem,
-                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
+                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial
-            IReadingQuestionService readingQuestionService
 
 
             )
@@ -54,7 +52,6 @@ namespace IRaCIS.Application.Services
 			this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._readingQuestionCriterionSystem = readingQuestionCriterionSystem;
             this._readingQuestionCriterionTrial = readingQuestionCriterionTrial;
-            this._readingQuestionService = readingQuestionService;
         }
 
         /// <summary>

irc_api.drone.yml

@@ -73,10 +73,39 @@ volumes:
     host:
       path: /var/run/docker.sock
       
+trigger:
+  branch:
+    - master   
+    
+---
+kind: pipeline
+type: ssh
+name: default
+
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true  #禁用默认克隆
+  
+server:
+  host: 47.117.164.182
+  user: root
+  password:
+    from_secret: uat_ssh_pwd
+
+steps:
+- name: greeting
+  commands:
+  - echo start publish test-irc-api
+  - cd /opt/cicd/irc-test
+  - sh test-irc.sh
+  
 trigger:
   branch:
     - Test.IRC    
-      
+       
 ---