XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-04-25 09:59:06 +08:00
parent da45898e02
commit e4590c3bdf
9 changed files with 88 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.API/Controllers/FinancialChangeController.cs
View File

@ -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)]
/// <summary> 添加实验项目-返回新增Id[AUTH]</summary>
/// <param name="param"></param>
/// <returns>新记录Id</returns>
[HttpPost, Route("Inspection/trial/addOrUpdateTrial")]
[UnitOfWork]
//[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]
public async Task<IResponseOutput> AddOrUpdateTrialInspection(DataInspectionDto<TrialCommand> opt)
{
var fun = AddOrUpdateTrial;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
}
/// <summary> 添加实验项目-返回新增Id[AUTH]</summary>
/// <param name="param"></param>
/// <returns>新记录Id</returns>
[HttpPost, Route("trial/addOrUpdateTrial")]
public async Task<IResponseOutput> AddOrUpdateTrial(TrialCommand param)

1
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -96,7 +96,6 @@ namespace IRaCIS.Core.API.Controllers
#endregion
#region 影像质疑
/// <summary>
/// 手动领取 或者取消 QC任务

5
IRaCIS.Core.API/Controllers/StudyController.cs
View File

@ -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);

5
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -4,6 +4,11 @@
<name>IRaCIS.Core.API</name>
</assembly>
<members>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrialInspection(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Application.Contracts.TrialCommand})">
<summary> 添加实验项目-返回新增Id[AUTH]</summary>
<param name="param"></param>
<returns>新记录Id</returns>
</member>
<member name="M:IRaCIS.Core.API.Controllers.Special.FinancialChangeController.AddOrUpdateTrial(IRaCIS.Application.Contracts.TrialCommand)">
<summary> 添加实验项目-返回新增Id[AUTH]</summary>
<param name="param"></param>

51
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -490,6 +490,16 @@
日期类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.DictionaryCode">
<summary>
字典Code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.DictionaryType">
<summary>
字典Type
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SystemAnonymizationView">
<summary> SystemAnonymizationView 列表视图模型 </summary>
</member>
@ -1747,6 +1757,22 @@
<param name="searchKey"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.DictionaryService.GetBoolValueState(System.Boolean)">
<summary>
获取是和否
</summary>
<param name="value"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.DictionaryService.GetAuditState``1(System.Guid,``0)">
<summary>
获取审核状态
</summary>
<typeparam name="T"></typeparam>
<param name="trial"></param>
<param name="childCode"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.DictionaryService.GetBasicDataAllSelect">
<summary>
获取所有下拉框 枚举 bool 数据
@ -2575,6 +2601,31 @@
后台查询模型
</summary>
</member>
<member name="M:IRaCIS.Application.Interfaces.IDictionaryService.GetBoolValueState(System.Boolean)">
<summary>
获取是和否
</summary>
<param name="value"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Interfaces.IDictionaryService.GetAuditState``1(System.Guid,``0)">
<summary>
获取审核状态
</summary>
<typeparam name="T"></typeparam>
<param name="trial"></param>
<param name="childCode"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Interfaces.IDictionaryService.GetBasicDataTranslateItem``1(System.String,``0)">
<summary>
获取枚举翻译
</summary>
<typeparam name="T"></typeparam>
<param name="parentCode"></param>
<param name="childCode"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Interfaces.IDoctorListQueryService.GetDoctorSearchList(IRaCIS.Application.Contracts.DoctorSearchDTO)">
<summary>
医生多条件查询

10
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -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);

11
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -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)
});
}

25
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -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)
});
}

14
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -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);