IRC_NewDev
			
			
		
		
							parent
							
								
									13abd86be0
								
							
						
					
					
						commit
						e2cdbb7580
					
				| 
						 | 
					@ -11,6 +11,7 @@ using IRaCIS.Core.Application.Service;
 | 
				
			||||||
using IRaCIS.Core.Application.Service.Inspection.DTO;
 | 
					using IRaCIS.Core.Application.Service.Inspection.DTO;
 | 
				
			||||||
using IRaCIS.Core.Application.Service.Inspection.Interface;
 | 
					using IRaCIS.Core.Application.Service.Inspection.Interface;
 | 
				
			||||||
using IRaCIS.Core.Application.Service.Reading.Dto;
 | 
					using IRaCIS.Core.Application.Service.Reading.Dto;
 | 
				
			||||||
 | 
					using IRaCIS.Core.Application.Service.Reading.Interface;
 | 
				
			||||||
using IRaCIS.Core.Application.ViewModel;
 | 
					using IRaCIS.Core.Application.ViewModel;
 | 
				
			||||||
using IRaCIS.Core.Domain.Models;
 | 
					using IRaCIS.Core.Domain.Models;
 | 
				
			||||||
using IRaCIS.Core.Domain.Share;
 | 
					using IRaCIS.Core.Domain.Share;
 | 
				
			||||||
| 
						 | 
					@ -36,6 +37,7 @@ namespace IRaCIS.Core.API.Controllers
 | 
				
			||||||
        private readonly IHttpContextAccessor _httpContext;
 | 
					        private readonly IHttpContextAccessor _httpContext;
 | 
				
			||||||
        private readonly ITrialConfigService _trialConfigService;
 | 
					        private readonly ITrialConfigService _trialConfigService;
 | 
				
			||||||
        private readonly INoneDicomStudyService _noneDicomStudyService;
 | 
					        private readonly INoneDicomStudyService _noneDicomStudyService;
 | 
				
			||||||
 | 
					        private readonly IClinicalAnswerService _clinicalAnswerService;
 | 
				
			||||||
        private readonly ISubjectService _subjectService;
 | 
					        private readonly ISubjectService _subjectService;
 | 
				
			||||||
        private readonly IReadingClinicalDataService _readingClinicalDataService;
 | 
					        private readonly IReadingClinicalDataService _readingClinicalDataService;
 | 
				
			||||||
        private readonly ISubjectVisitService _subjectVisitService;
 | 
					        private readonly ISubjectVisitService _subjectVisitService;
 | 
				
			||||||
| 
						 | 
					@ -62,6 +64,7 @@ namespace IRaCIS.Core.API.Controllers
 | 
				
			||||||
             IReadingMedicineQuestionService readingMedicineQuestionService,
 | 
					             IReadingMedicineQuestionService readingMedicineQuestionService,
 | 
				
			||||||
            ITrialConfigService _trialConfigService,
 | 
					            ITrialConfigService _trialConfigService,
 | 
				
			||||||
            INoneDicomStudyService noneDicomStudyService,
 | 
					            INoneDicomStudyService noneDicomStudyService,
 | 
				
			||||||
 | 
					            IClinicalAnswerService clinicalAnswerService,
 | 
				
			||||||
            ISubjectService _subjectService,
 | 
					            ISubjectService _subjectService,
 | 
				
			||||||
            IReadingClinicalDataService _readingClinicalDataService,
 | 
					            IReadingClinicalDataService _readingClinicalDataService,
 | 
				
			||||||
            ISubjectVisitService subjectVisitService,
 | 
					            ISubjectVisitService subjectVisitService,
 | 
				
			||||||
| 
						 | 
					@ -82,6 +85,7 @@ namespace IRaCIS.Core.API.Controllers
 | 
				
			||||||
            this._httpContext = httpContext;
 | 
					            this._httpContext = httpContext;
 | 
				
			||||||
            this._trialConfigService = _trialConfigService;
 | 
					            this._trialConfigService = _trialConfigService;
 | 
				
			||||||
            this._noneDicomStudyService = noneDicomStudyService;
 | 
					            this._noneDicomStudyService = noneDicomStudyService;
 | 
				
			||||||
 | 
					            this._clinicalAnswerService = clinicalAnswerService;
 | 
				
			||||||
            this._subjectService = _subjectService;
 | 
					            this._subjectService = _subjectService;
 | 
				
			||||||
            this._readingClinicalDataService = _readingClinicalDataService;
 | 
					            this._readingClinicalDataService = _readingClinicalDataService;
 | 
				
			||||||
            this._subjectVisitService = subjectVisitService;
 | 
					            this._subjectVisitService = subjectVisitService;
 | 
				
			||||||
| 
						 | 
					@ -233,6 +237,24 @@ namespace IRaCIS.Core.API.Controllers
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// CRC签名临床数据
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <param name="opt"></param>
 | 
				
			||||||
 | 
					        /// <returns></returns>
 | 
				
			||||||
 | 
					        [HttpPost, Route("Inspection/ClinicalAnswer/CRCSignClinicalData")]
 | 
				
			||||||
 | 
					        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        [UnitOfWork]
 | 
				
			||||||
 | 
					        public async Task<IResponseOutput> CRCSignClinicalData(DataInspectionDto<CRCSignClinicalDataInDto> opt)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            var singid = await _inspectionService.RecordSing(opt.SignInfo);
 | 
				
			||||||
 | 
					            var result = await _clinicalAnswerService.CRCSignClinicalData(opt.Data);
 | 
				
			||||||
 | 
					            await _inspectionService.CompletedSign(singid, result);
 | 
				
			||||||
 | 
					            return result;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 提交阅片裁判问题
 | 
					        /// 提交阅片裁判问题
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -87,6 +87,25 @@ namespace IRaCIS.Core.Application.Service
 | 
				
			||||||
            _iClinicalQuestionService = iClinicalQuestionService;
 | 
					            _iClinicalQuestionService = iClinicalQuestionService;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// CRC签名临床数据
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <param name="inDto"></param>
 | 
				
			||||||
 | 
					        /// <returns></returns>
 | 
				
			||||||
 | 
					        [HttpPost]
 | 
				
			||||||
 | 
					        public async Task<IResponseOutput> CRCSignClinicalData(CRCSignClinicalDataInDto inDto)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            await _readingClinicalDataRepository.UpdatePartialFromQueryAsync(x =>x.Id==inDto.ReadingClinicalDataId, x => new ReadingClinicalData()
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    IsSign = true,
 | 
				
			||||||
 | 
					                    ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned
 | 
				
			||||||
 | 
					                });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            await _readingClinicalDataRepository.SaveChangesAsync();
 | 
				
			||||||
 | 
					            return ResponseOutput.Ok(true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 自动添加CRC临床数据
 | 
					        /// 自动添加CRC临床数据
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,10 @@ using System.Threading.Tasks;
 | 
				
			||||||
namespace IRaCIS.Core.Application.Service.Reading.Dto
 | 
					namespace IRaCIS.Core.Application.Service.Reading.Dto
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public class CRCSignClinicalDataInDto
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        public Guid ReadingClinicalDataId { get; set; }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    public class AutoAddClinicalInDto
 | 
					    public class AutoAddClinicalInDto
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
		public Guid? SubjectId { get; set; }
 | 
							public Guid? SubjectId { get; set; }
 | 
				
			||||||
| 
						 | 
					@ -28,7 +32,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
		public Guid SubjectId { get; set; }
 | 
							public Guid SubjectId { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		public Guid TrialId { get; set; }
 | 
					        public Guid ReadingClinicalDataId { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public Guid TrialId { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// 临床级别
 | 
					        /// 临床级别
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,6 +9,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Interface
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	public interface IClinicalAnswerService
 | 
						public interface IClinicalAnswerService
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		 Task AutoAddCRCClinical(AutoAddClinicalInDto inDto);
 | 
							Task<IResponseOutput> CRCSignClinicalData(CRCSignClinicalDataInDto inDto);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         Task AutoAddCRCClinical(AutoAddClinicalInDto inDto);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue