From e4590c3bdff2611b36295850c283a260dc1d7ed0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 25 Apr 2022 09:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/FinancialChangeController.cs | 26 ++++++++--
.../Controllers/InspectionController.cs | 1 -
.../Controllers/StudyController.cs | 5 +-
IRaCIS.Core.API/IRaCIS.Core.API.xml | 5 ++
.../IRaCIS.Core.Application.xml | 51 +++++++++++++++++++
.../Service/QC/NoneDicomStudyService.cs | 10 +---
.../Service/QC/QCOperationService.cs | 11 +---
.../Service/Visit/SubjectService.cs | 25 +--------
.../Service/Visit/SubjectVisitService.cs | 14 +----
9 files changed, 88 insertions(+), 60 deletions(-)
diff --git a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
index 4ad7234bb..1d57b2e30 100644
--- a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
+++ b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs
@@ -8,6 +8,9 @@ using IRaCIS.Core.Infrastructure.Extention;
using Microsoft.AspNetCore.Authorization;
using System.Threading.Tasks;
using IRaCIS.Application.Services;
+using IRaCIS.Core.Application.Service.Inspection.DTO;
+using IRaCIS.Core.Infra.EFCore;
+using IRaCIS.Core.Application.Service.Inspection.Interface;
namespace IRaCIS.Core.API.Controllers.Special
{
@@ -18,19 +21,36 @@ namespace IRaCIS.Core.API.Controllers.Special
{
private readonly ITrialService _trialService;
private readonly ICalculateService _calculateService;
+ private readonly IInspectionService _inspectionService;
- public FinancialChangeController(ITrialService trialService, ICalculateService calculateService)
+ public FinancialChangeController(ITrialService trialService, ICalculateService calculateService,
+ IInspectionService inspectionService
+ )
{
_trialService = trialService;
_calculateService = calculateService;
+ this._inspectionService = inspectionService;
}
+
+ //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
+
/// 添加实验项目-返回新增Id[AUTH]
///
/// 新记录Id
-
- //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
+ [HttpPost, Route("Inspection/trial/addOrUpdateTrial")]
+ [UnitOfWork]
+ public async Task AddOrUpdateTrialInspection(DataInspectionDto opt)
+ {
+ var fun = AddOrUpdateTrial;
+ return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+ }
+
+
+ /// 添加实验项目-返回新增Id[AUTH]
+ ///
+ /// 新记录Id
[HttpPost, Route("trial/addOrUpdateTrial")]
public async Task AddOrUpdateTrial(TrialCommand param)
diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index 631746d42..f1e0ae540 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -95,7 +95,6 @@ namespace IRaCIS.Core.API.Controllers
}
#endregion
-
#region 影像质疑
///
diff --git a/IRaCIS.Core.API/Controllers/StudyController.cs b/IRaCIS.Core.API/Controllers/StudyController.cs
index 27ddf487d..490eae2f2 100644
--- a/IRaCIS.Core.API/Controllers/StudyController.cs
+++ b/IRaCIS.Core.API/Controllers/StudyController.cs
@@ -238,10 +238,7 @@ namespace IRaCIS.Api.Controllers
TrialId = savedInfo.TrialId,
SubjectVisitId = savedInfo.SubjectVisitId,
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", savedInfo.SubmitState),
- })
+ JsonDetail = JsonConvert.SerializeObject(savedInfo)
});
await _inspectionService.AddListInspectionRecordAsync(datas);
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 2e0673c7a..606a4d13c 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -4,6 +4,11 @@
IRaCIS.Core.API
+
+ 添加实验项目-返回新增Id[AUTH]
+
+ 新记录Id
+
添加实验项目-返回新增Id[AUTH]
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index acb34b6fe..7469c70c1 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -490,6 +490,16 @@
日期类型
+
+
+ 字典Code
+
+
+
+
+ 字典Type
+
+
SystemAnonymizationView 列表视图模型
@@ -1747,6 +1757,22 @@
+
+
+ 获取是和否
+
+
+
+
+
+
+ 获取审核状态
+
+
+
+
+
+
获取所有下拉框 枚举 bool 数据
@@ -2575,6 +2601,31 @@
后台查询模型
+
+
+ 获取是和否
+
+
+
+
+
+
+ 获取审核状态
+
+
+
+
+
+
+
+
+ 获取枚举翻译
+
+
+
+
+
+
医生多条件查询
diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
index f7263e055..98a2d5e6f 100644
--- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
+++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
@@ -141,10 +141,7 @@ namespace IRaCIS.Core.Application.Contracts
TrialId = subvisit.TrialId,
SubjectVisitId = subvisit.Id,
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
- })
+ JsonDetail = JsonConvert.SerializeObject(subvisit)
});
await _inspectionService.AddListInspectionRecordAsync(datas);
@@ -195,10 +192,7 @@ namespace IRaCIS.Core.Application.Contracts
TrialId = subvisit.TrialId,
SubjectVisitId = subvisit.Id,
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
- })
+ JsonDetail = JsonConvert.SerializeObject(subvisit)
});
await _inspectionService.AddListInspectionRecordAsync(datas);
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 038b02c99..39d964d8f 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1051,10 +1051,7 @@ namespace IRaCIS.Core.Application.Image.QA
TrialId = subvisit.TrialId,
SubjectVisitId = subvisit.Id,
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
- })
+ JsonDetail = JsonConvert.SerializeObject(subvisit)
});
await _inspectionService.AddListInspectionRecordAsync(datas);
return ResponseOutput.Ok();
@@ -1886,11 +1883,7 @@ namespace IRaCIS.Core.Application.Image.QA
IsSign = false,
Identification = "Edit|Subject|Info|Subject",
CreateTime = DateTime.Now.AddSeconds(1),
- JsonDetail = JsonConvert.SerializeObject(new
- {
- FirstGiveMedicineTime = command.SubjectFirstGiveMedicineTime.Value.ToString("yyyy-MM-dd")
-
- })
+ JsonDetail = JsonConvert.SerializeObject(command)
});
}
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
index 2d74372c8..b659cd347 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
@@ -125,20 +125,7 @@ namespace IRaCIS.Application.Services
IsSign = false,
CreateTime = visittime,
Identification = "Add|Visit|Info|Visit-Image Upload",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- BlindName = item.BlindName,
- VisitName = item.VisitName,
- VisitNum = item.VisitNum,
- IsBaseLine = item.IsBaseLine ? "是" : "否",
- VisitExecuted = "否",
- IsFinalVisit = item.IsFinalVisit ? "是" : "否",
- PDState = item.PDState == PDStateEnum.PDProgress ? "是" : "否",
- InPlan = item.InPlan,
- IsUrgent = item.IsUrgent,
- IsLostVisit = item.IsLostVisit ? "是" : "否",
-
- })
+ JsonDetail = JsonConvert.SerializeObject(item)
});
// 初始化访视
@@ -155,15 +142,7 @@ namespace IRaCIS.Application.Services
IsSign = false,
CreateTime = visittime.AddSeconds(1),
Identification = "Init|Visit|Status|Visit-Image Upload",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- VisitName = item.VisitName,
- SubmitState = "未提交",
- AuditState = "未审核",
- CheckState = "未核查",
- ForwardState = "未转发",
-
- })
+ JsonDetail = JsonConvert.SerializeObject(item)
});
}
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index aa3e7ee55..5152aa440 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -138,10 +138,7 @@ namespace IRaCIS.Core.Application.Services
IsSign = false,
Identification = "Edit|Subject|Info|Subject",
CreateTime = DateTime.Now.AddSeconds(1),
- JsonDetail = JsonConvert.SerializeObject(new
- {
- FirstGiveMedicineTime = subject.FirstGiveMedicineTime.Value.ToString("yyyy-MM-dd")
- })
+ JsonDetail = JsonConvert.SerializeObject(subject)
});
await _inspectionService.AddListInspectionRecordAsync(datas);
}
@@ -182,14 +179,7 @@ namespace IRaCIS.Core.Application.Services
IsSign = false,
CreateTime = DateTime.Now.AddSeconds(1),
Identification = "Init|Visit|Status|Visit-Image Upload",
- JsonDetail = JsonConvert.SerializeObject(new
- {
- VisitName = svCommand.VisitName,
- SubmitState = "",
- AuditState = "",
-
-
- })
+ JsonDetail = JsonConvert.SerializeObject(svCommand)
});
await _inspectionService.AddListInspectionRecordAsync(dataInspection);