修改一版
parent
507e92d261
commit
ed1955ad02
|
@ -1512,6 +1512,71 @@
|
||||||
创建时间
|
创建时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.DoctorUserIdeaEnum">
|
||||||
|
<summary>
|
||||||
|
阅片人是否认同
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.IsHaveQuestion">
|
||||||
|
<summary>
|
||||||
|
是否有问题
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.Questioning">
|
||||||
|
<summary>
|
||||||
|
质询问题
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.AuditAdviceEnum">
|
||||||
|
<summary>
|
||||||
|
审核建议
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.DisagreeReason">
|
||||||
|
<summary>
|
||||||
|
不同意重阅原因
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.IsApplyHeavyReading">
|
||||||
|
<summary>
|
||||||
|
是否申请重阅
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.IsCurrentUser">
|
||||||
|
<summary>
|
||||||
|
是否是当前用户
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.DoctorUserIdeaEnum">
|
||||||
|
<summary>
|
||||||
|
阅片人是否认同
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.IsHaveQuestion">
|
||||||
|
<summary>
|
||||||
|
是否有问题
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.Questioning">
|
||||||
|
<summary>
|
||||||
|
质询问题
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.AuditAdviceEnum">
|
||||||
|
<summary>
|
||||||
|
审核建议
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.DisagreeReason">
|
||||||
|
<summary>
|
||||||
|
不同意重阅原因
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.IsApplyHeavyReading">
|
||||||
|
<summary>
|
||||||
|
是否申请重阅
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsClosedDialog">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsClosedDialog">
|
||||||
<summary>
|
<summary>
|
||||||
是否关闭
|
是否关闭
|
||||||
|
|
|
@ -217,9 +217,9 @@ namespace IRaCIS.Application.Services
|
||||||
foreach (var item in trialCriterionList)
|
foreach (var item in trialCriterionList)
|
||||||
{
|
{
|
||||||
|
|
||||||
var thistrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList();
|
var thisTrialQuestions = trialQuestions.Where(x => x.ReadingQuestionCriterionTrialId == item.Id).ToList();
|
||||||
|
|
||||||
var query = systemQuestionList.GroupJoin(thistrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new
|
var query = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (a, b) => new
|
||||||
{
|
{
|
||||||
a,
|
a,
|
||||||
trialQuestion = b
|
trialQuestion = b
|
||||||
|
@ -228,7 +228,7 @@ namespace IRaCIS.Application.Services
|
||||||
Id=n.Id,
|
Id=n.Id,
|
||||||
|
|
||||||
});
|
});
|
||||||
var needAddQuestionList = systemQuestionList.GroupJoin(thistrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y })
|
var needAddQuestionList = systemQuestionList.GroupJoin(thisTrialQuestions, a => a.Id, b => b.ReadingQuestionSystemId, (x, y) => new { system = x, trial = y })
|
||||||
.SelectMany(
|
.SelectMany(
|
||||||
a => a.trial.DefaultIfEmpty(),
|
a => a.trial.DefaultIfEmpty(),
|
||||||
(c,d) => new ReadingQuestionTrial
|
(c,d) => new ReadingQuestionTrial
|
||||||
|
|
|
@ -28,11 +28,11 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 对话内容
|
/// 对话内容
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Content { get; set; }
|
public string Content { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 用户角色
|
/// 用户角色
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string UserTypeShortName { get; set; }
|
public string UserTypeShortName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in New Issue