From fabe70c057ae6cc36134cd637329f2d4085e260c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 13 Apr 2022 11:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InspectionController.cs       | 105 ++++++++++++++++--
 IRaCIS.Core.API/IRaCIS.Core.API.xml           |  42 +++++++
 2 files changed, 140 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 465e5a0d0..67d828d28 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -37,6 +37,7 @@ namespace IRaCIS.Core.API.Controllers
         private readonly ISubjectService _subjectService;
         private readonly ISubjectVisitService _subjectVisitService;
         private readonly IQCOperationService _qCOperationService;
+        private readonly IClinicalDataService _clinicalDataService;
         private readonly IVisitPlanService _visitPlanService;
         private readonly IInspectionService _inspectionService;
 
@@ -50,11 +51,12 @@ namespace IRaCIS.Core.API.Controllers
             IRepository<DataInspection> dataInspectionRepository,
             IQCListService _qCListService,
             IInspectionService sinspectionService,
-             ITrialConfigService _trialConfigService,
-             INoneDicomStudyService noneDicomStudyService,
+            ITrialConfigService _trialConfigService,
+            INoneDicomStudyService noneDicomStudyService,
             ISubjectService _subjectService,
             ISubjectVisitService subjectVisitService,
             IQCOperationService qCOperationService,
+            IClinicalDataService clinicalDataService,
             IVisitPlanService visitPlanService
             )
         {
@@ -69,6 +71,7 @@ namespace IRaCIS.Core.API.Controllers
             this._subjectService = _subjectService;
             this._subjectVisitService = subjectVisitService;
             this._qCOperationService = qCOperationService;
+            this._clinicalDataService = clinicalDataService;
             this._visitPlanService = visitPlanService;
             this._dataInspectionRepository = dataInspectionRepository;
         }
@@ -191,6 +194,99 @@ namespace IRaCIS.Core.API.Controllers
 
         #endregion
 
+        #region 临床数据采集 ClinicalDataService 
+        /// <summary>
+        /// 新增或修改既往放疗史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/AddOrUpdateVisitStage")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> AddOrUpdatePreviousHistory(DataInspectionDto<PreviousHistoryAddOrEdit> opt)
+        {
+
+            var fun = _clinicalDataService.AddOrUpdatePreviousHistory;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+        }
+
+
+        /// <summary>
+        /// 删除既往放疗史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/DeletePreviousHistory")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> DeletePreviousHistory(DataInspectionDto<IDDto> opt)
+        {
+
+            var fun = _clinicalDataService.DeletePreviousHistory;
+            return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
+        }
+
+
+
+
+        /// <summary>
+        /// 新增或修改既往手术史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/AddOrUpdatePreviousSurgery")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> AddOrUpdatePreviousSurgery(DataInspectionDto<PreviousSurgeryAddOrEdit> opt)
+        {
+
+            var fun = _clinicalDataService.AddOrUpdatePreviousSurgery;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+        }
+
+
+        /// <summary>
+        /// 删除既往手术史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/DeletePreviousSurgery")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> DeletePreviousSurgery(DataInspectionDto<IDDto> opt)
+        {
+
+            var fun = _clinicalDataService.DeletePreviousSurgery;
+            return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
+        }
+
+
+        /// <summary>
+        /// 新增或修改既往其他治疗史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/AddOrUpdatePreviousOther")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> AddOrUpdatePreviousOther(DataInspectionDto<PreviousOtherAddOrEdit> opt)
+        {
+
+            var fun = _clinicalDataService.AddOrUpdatePreviousOther;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+        }
+
+
+        /// <summary>
+        /// 删除既往其他治疗史
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/clinicalData/DeletePreviousOther")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> DeletePreviousOther(DataInspectionDto<IDDto> opt)
+        {
+
+            var fun = _clinicalDataService.DeletePreviousOther;
+            return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
+        }
+        #endregion
+
 
         #region 访视计划
         /// <summary>
@@ -256,7 +352,6 @@ namespace IRaCIS.Core.API.Controllers
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
         #endregion
-
         #region 访视
 
         [HttpPost, Route("Inspection/subjectVisit/addOrUpdateSV")]
@@ -315,7 +410,6 @@ namespace IRaCIS.Core.API.Controllers
         }
 
         #endregion
-
         #region 配置项目信息
         /// <summary>
         /// 配置 基础逻辑信息
@@ -369,9 +463,6 @@ namespace IRaCIS.Core.API.Controllers
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
         }
         #endregion
-
-
-
         #region 受试者
         /// <summary>
         /// 添加或更新受试者信息[New]
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index b4b73046b..7d572d56b 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -100,6 +100,48 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.AddOrUpdatePreviousHistory(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.PreviousHistoryAddOrEdit})">
+            <summary>
+            新增或修改既往放疗史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.DeletePreviousHistory(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.IDDto})">
+            <summary>
+            删除既往放疗史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.AddOrUpdatePreviousSurgery(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.PreviousSurgeryAddOrEdit})">
+            <summary>
+            新增或修改既往手术史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.DeletePreviousSurgery(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.IDDto})">
+            <summary>
+            删除既往手术史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.AddOrUpdatePreviousOther(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.PreviousOtherAddOrEdit})">
+            <summary>
+            新增或修改既往其他治疗史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.DeletePreviousOther(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.IDDto})">
+            <summary>
+            删除既往其他治疗史
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.AddOrUpdateVisitStage(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.VisitPlanCommand})">
             <summary>
             新增或添加访视计划