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

修改一版

Browse Source
This commit is contained in:
he
2022-07-04 16:04:31 +08:00
parent 47d63c39da
commit b27549c216
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+11 -2
View File
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class MedicineQuestionAnswer
{
public Guid MedicineQuestionId { get; set; }
public Guid Id { get; set; }
public string Answer { get; set; }
@@ -54,6 +54,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid VisitTaskId { get; set; }
public Arm ArmEnum { get; set; }
public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
@@ -145,7 +147,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string Answer { get; set; }
public Guid MedicineQuestionId { get; set; }
public Guid Id { get; set; }
/// <summary>
/// 类型
@@ -231,6 +233,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? OtherTaskId { get; set; }
public Guid? JudgeVisitTaskId { get; set; }
public Guid? JudgeResultTaskId { get; set; }
public Arm? JudgeResultArm { get; set; }
}
}
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+13 -3
View File
@@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.Service
var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReviewInfo.MedicalReviewInfo.VisitTaskId).FirstNotNullAsync();
medicalReviewInfo.VisitTaskId = taskInfo.Id;
medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
#region 取任务
if (medicalReviewInfo.IsReadingTaskViewInOrder)
{
@@ -83,6 +85,8 @@ namespace IRaCIS.Core.Application.Service
TaskName = x.TaskName,
SouceReadModuleId=x.SouceReadModuleId,
SourceSubjectVisitId=x.SourceSubjectVisitId,
JudgeVisitTaskId=x.JudgeVisitTaskId,
JudgeResultArm=x.JudgeResultTask.ArmEnum,
}).ToListAsync();
@@ -158,7 +162,7 @@ namespace IRaCIS.Core.Application.Service
from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
select new ReadingMedicineQuestion()
{
MedicineQuestionId = data.Id,
Id = data.Id,
Type = data.Type,
ParentTriggerValue = data.ParentTriggerValue,
IsEnable = data.IsEnable,
@@ -185,7 +189,7 @@ namespace IRaCIS.Core.Application.Service
private void FindChildQuestion(ReadingMedicineQuestion medicineQuestionList, List<ReadingMedicineQuestion> questionlists)
{
medicineQuestionList.Childrens = questionlists.Where(x => x.ParentId == medicineQuestionList.MedicineQuestionId).ToList();
medicineQuestionList.Childrens = questionlists.Where(x => x.ParentId == medicineQuestionList.Id).ToList();
if (medicineQuestionList.Childrens != null && medicineQuestionList.Childrens.Count != 0)
{
medicineQuestionList.Childrens.ForEach(x =>
@@ -210,7 +214,7 @@ namespace IRaCIS.Core.Application.Service
List<ReadingMedicineQuestionAnswer> questionAnswerList = inDto.QuestionAnswerList.Select(x => new ReadingMedicineQuestionAnswer()
{
Answer = x.Answer,
ReadingMedicineQuestionId = x.MedicineQuestionId,
ReadingMedicineQuestionId = x.Id,
TaskMedicalReviewId = inDto.TaskMedicalReviewId,
VisitTaskId = inDto.VisitTaskId,
@@ -218,6 +222,12 @@ namespace IRaCIS.Core.Application.Service
await _readingMedicineQuestionAnswerRepository.AddRangeAsync(questionAnswerList);
await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
{
SaveQuestionTime = DateTime.Now
});
var result = await _readingMedicineQuestionAnswerRepository.SaveChangesAsync();
return ResponseOutput.Result(result);