阅片期查询bug

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -7,10 +7,10 @@
     }
   },
   "ConnectionStrings": {
-    "RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    "Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-    //"RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
-    //"Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    //"RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    //"Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
+    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
+    "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "WeComNoticeConfig": {
     "IsOpenWeComNotice": true,

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

@@ -12381,6 +12381,11 @@
             影像工具
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.AddDeleteTypeEnum">
+            <summary>
+            新增修改类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ImageToolAttribute">
             <summary>
             影像工具属性
@@ -13326,6 +13331,11 @@
             影像工具
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.AddDeleteTypeEnum">
+            <summary>
+            新增修改类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ImageToolAttribute">
             <summary>
             影像工具属性
@@ -17496,17 +17506,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

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

@@ -1002,6 +1002,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ImageTool { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 新增修改类型
+        /// </summary>
+        public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
+
         /// <summary>
         /// 影像工具属性
         /// </summary>
@@ -2483,6 +2488,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ImageTool { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 新增修改类型
+        /// </summary>
+        public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
+
         /// <summary>
         /// 影像工具属性
         /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -527,7 +527,7 @@ namespace IRaCIS.Core.Application.Service
 
             var subjectVisitQuery = _subjectVisitRepository.Where(t => t.TrialId == inQuery.TrialId)/*.Where(t => t.IsLostVisit == false)*/
             .Where(t => t.Subject.IsSubjectQuit == false || (t.Subject.IsSubjectQuit == true && t.SubmitState == SubmitStateEnum.Submitted))
-            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum <= sv.Subject.LatestSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
+            .Where(sv => sv.Subject.FinalSubjectVisitId == null ? true : sv.VisitNum <= sv.Subject.FinalSubjectVisit.VisitNum).Select(sv => new ReadModuleView()
             {
                 Id = sv.Id,
                 CreateTime = sv.CreateTime,

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -504,6 +504,28 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    /// <summary>
+    /// 问题增删类型
+    /// </summary>
+    public enum AddDeleteType
+    {
+        /// <summary>
+        /// 任意
+        /// </summary>
+        Arbitrium = 0,
+
+        /// <summary>
+        /// 仅基线
+        /// </summary>
+        OnlyBaseLine = 1,
+
+        /// <summary>
+        /// 仅随访
+        /// </summary>
+        OnlyVisit = 2,
+
+    }
+
     /// <summary>
     /// 影像标记类型
     /// </summary>

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

@@ -311,7 +311,12 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public string ImageToolAttribute { get; set; } = string.Empty;
 
-   
+    /// <summary>
+    /// 新增修改类型
+    /// </summary>
+    public AddDeleteType AddDeleteTypeEnum { get; set; } = AddDeleteType.Arbitrium;
+
+
 
     [NotMapped]
     public List<ExportResult> ExportResult

irc_api.drone.yml

@@ -1,4 +1,37 @@
+kind: pipeline
+type: ssh
+name: ssh-linux-uat-irc-build-image
 
+platform:
+  os: Linux
+  arch: 386
+  
+clone:
+  disable: true
+
+server:
+  host: 101.132.253.119
+  user: root
+  password:
+    from_secret: test_ssh_pwd
+
+steps:
+  - name: publish-test-irc
+    commands:
+      - bash /opt/1panel/xc-deploy-new/Uat_IRC/devops-publish/uat-branch-publish.sh
+  - name: notify-wecom
+    commands:
+      - bash /opt/1panel/xc-deploy-new/devops-center/drone-notify-wecom.sh "$DRONE_BUILD_STATUS" "$DRONE_REPO_NAME" "$DRONE_BRANCH" "$DRONE_BUILD_NUMBER" "4355b98e-1e72-4678-8dfb-2fc6ad0bf449" "$DRONE_COMMIT_MESSAGE" "$DRONE_COMMIT_AUTHOR" "Uat_IRC_API   Uat_IRC_SCP_API" "irc.uat.extimaging.com"
+    when:
+      status:
+        - success
+        - failure
+  
+trigger:
+  branch:
+    - Uat_IRC_Net8    
+       
+---
 kind: pipeline
 type: ssh
 name: ssh-linux-test-irc-publish