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

修改导表和时间处理
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-12-11 10:27:24 +08:00
parent 8ff23af18c
commit f8e498b2e1
4 changed files with 82 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
View File

@ -74,15 +74,15 @@ public static class ExcelExportHelper
{ {
var itemDic = item.ConvertToDictionary(); var itemDic = item.ConvertToDictionary();
//处理集合里面时间类型，根据当前语言将时间转变为字符串 ////处理集合里面时间类型，根据当前语言将时间转变为字符串
foreach (var itemValuePair in itemDic) //foreach (var itemValuePair in itemDic)
{ //{
// 临床数据 1，1 会变成2024-01-01 // // 临床数据 1，1 会变成2024-01-01
if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result)) // if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
{ // {
itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result); // itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
} // }
} //}
foreach (var needTranslateProperty in needTranslatePropertyList) foreach (var needTranslateProperty in needTranslatePropertyList)
@ -335,14 +335,14 @@ public static class ExcelExportHelper
//var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull()); //var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
var itemDic = item.ConvertToDictionary(); var itemDic = item.ConvertToDictionary();
//处理集合里面时间类型，根据当前语言将时间转变为字符串 ////处理集合里面时间类型，根据当前语言将时间转变为字符串
foreach (var itemValuePair in itemDic) //foreach (var itemValuePair in itemDic)
{ //{
if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result)) // if (itemValuePair.Value?.ToString().Length > 8 && DateTime.TryParse(itemValuePair.Value?.ToString(), out DateTime result))
{ // {
itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result); // itemDic[itemValuePair.Key] = ExportExcelConverterDate.DateTimeInternationalToString(result);
} // }
} //}
foreach (var needTranslateProperty in needTranslatePropertyList) foreach (var needTranslateProperty in needTranslatePropertyList)
{ {

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

@ -933,7 +933,7 @@
<param name="_trialRepository"></param> <param name="_trialRepository"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetCommonJudgeRatioList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})"> <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.GetCommonJudgeRatioList_Export(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial})">
<summary> <summary>
裁判一致率导出 裁判一致率导出
</summary> </summary>

36
IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
View File

@ -8,6 +8,7 @@ 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;
using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Infra.EFCore.Migrations;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@ -2347,6 +2348,7 @@ namespace IRaCIS.Core.Application.Service.Common
public async Task<IActionResult> GetCommonJudgeRatioList_Export(VisitTaskQuery inQuery, public async Task<IActionResult> GetCommonJudgeRatioList_Export(VisitTaskQuery inQuery,
[FromServices] IRepository<CommonDocument> _commonDocumentRepository, [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
[FromServices] IDictionaryService _dictionaryService, [FromServices] IDictionaryService _dictionaryService,
[FromServices] IRepository<SubjectUser> _subjectUserRepository,
[FromServices] IRepository<Trial> _trialRepository) [FromServices] IRepository<Trial> _trialRepository)
{ {
//每次查询必须是单标准的 //每次查询必须是单标准的
@ -2555,17 +2557,33 @@ namespace IRaCIS.Core.Application.Service.Common
})) }))
.ToList(); .ToList();
exportInfo.DoctorSubjectStatList = filteredList.GroupBy(t => new { t.DoctorUserId, t.UserName, t.FullName }).Select(g => new DoctorJudgeRatio()
//找到该标准的阅片人
var armList = new List<Arm>() { Arm.SingleReadingArm, Arm.DoubleReadingArm1, Arm.DoubleReadingArm2 };
exportInfo.DoctorSubjectStatList = _subjectUserRepository.Where(t => t.TrialId == inQuery.TrialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && armList.Contains(t.ArmEnum))
.Select(t => new DoctorJudgeRatio()
{
DoctorUserId = t.DoctorUserId,
UserName = t.DoctorUser.UserName,
FullName = t.DoctorUser.FullName,
TotalJudgeCount = 0,
JudgeAgreeCount = 0
}).Distinct().ToList();
foreach (var doctor in exportInfo.DoctorSubjectStatList)
{ {
DoctorUserId = g.Key.DoctorUserId, if (filteredList.Any(t => t.DoctorUserId == doctor.DoctorUserId))
UserName = g.Key.UserName, {
FullName = g.Key.FullName, doctor.TotalJudgeCount= filteredList.Where(t=>t.DoctorUserId==doctor.DoctorUserId).Count();
TotalJudgeCount = g.Count(), doctor.JudgeAgreeCount= filteredList.Where(t => t.DoctorUserId == doctor.DoctorUserId).Count(t => t.JudgeResultTaskId == t.VisitTaskId);
}
JudgeAgreeCount = g.Count(t => t.JudgeResultTaskId == t.VisitTaskId) }
}).ToList();
#endregion #endregion

64
IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs
View File

@ -1,4 +1,5 @@
using Newtonsoft.Json; using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
@ -8,29 +9,29 @@ namespace IRaCIS.Core.Infrastructure.Extention
public static class ObjectExtension public static class ObjectExtension
{ {
public static T Clone<T>(this T source) public static T Clone<T>(this T source)
{ {
// Don't serialize a null object, simply return the default for that object // Don't serialize a null object, simply return the default for that object
if (Object.ReferenceEquals(source, null)) if (Object.ReferenceEquals(source, null))
{ {
return default(T); return default(T);
} }
var deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace }; var deserializeSettings = new JsonSerializerSettings { ObjectCreationHandling = ObjectCreationHandling.Replace };
var serializeSettings = new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }; var serializeSettings = new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore };
return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(source, serializeSettings), deserializeSettings); return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(source, serializeSettings), deserializeSettings);
} }
/// <summary> /// <summary>
/// 将对象序列化成稽查需要的Json字符串 /// 将对象序列化成稽查需要的Json字符串
/// </summary> /// </summary>
/// <param name="obj"></param> /// <param name="obj"></param>
/// <returns></returns> /// <returns></returns>
public static string ToJsonStr(this object obj) public static string ToJsonStr(this object obj)
{ {
return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Ignore }); return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Ignore });
} }
/// <summary> /// <summary>
/// 通过类型参数反序列化 JSON 字符串为指定类型的对象 /// 通过类型参数反序列化 JSON 字符串为指定类型的对象
@ -55,12 +56,12 @@ namespace IRaCIS.Core.Infrastructure.Extention
/// <param name="obj"></param> /// <param name="obj"></param>
/// <returns></returns> /// <returns></returns>
public static string ToJsonNotIgnoreNull(this object obj) public static string ToJsonNotIgnoreNull(this object obj)
{ {
return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", Formatting = Formatting.Indented, ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Include }); return JsonConvert.SerializeObject(obj, new JsonSerializerSettings { DateFormatString = "yyyy-MM-dd HH:mm:ss", Formatting = Formatting.Indented, ReferenceLoopHandling = ReferenceLoopHandling.Ignore, NullValueHandling = NullValueHandling.Include });
} }
public static Dictionary<string, object> ConvertToDictionary(this object obj) public static Dictionary<string, object> ConvertToDictionary(this object obj)
{ {
if (obj == null) if (obj == null)
{ {
@ -77,10 +78,19 @@ namespace IRaCIS.Core.Infrastructure.Extention
string propertyName = property.Name; string propertyName = property.Name;
object propertyValue = property.GetValue(obj); object propertyValue = property.GetValue(obj);
// 如果属性的类型是枚举，将其值保留为整数 // 如果属性的类型是枚举，将其值保留为整数
if (property.PropertyType.IsEnum || (Nullable.GetUnderlyingType(property.PropertyType)?.IsEnum == true && propertyValue!=null) ) if (property.PropertyType.IsEnum || (Nullable.GetUnderlyingType(property.PropertyType)?.IsEnum == true && propertyValue != null))
{ {
dictionary.Add(propertyName, (int)propertyValue); dictionary.Add(propertyName, (int)propertyValue);
} }
// 检查属性是否是时间类型
else if (property.PropertyType == typeof(DateTime) ||
property.PropertyType == typeof(DateTime?) && propertyValue != null)
{
DateTime.TryParse(propertyValue.ToString(), out DateTime result);
var dt = ExportExcelConverterDate.DateTimeInternationalToString(result);
// 如果需要，可以对时间值进行特定的处理
dictionary.Add(propertyName, dt);
}
else else
{ {
dictionary.Add(propertyName, propertyValue); dictionary.Add(propertyName, propertyValue);