diff --git a/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/BatchUpdateRegisterCheckIdByRegisterCheckPictureIdInputDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/BatchUpdateRegisterCheckIdByRegisterCheckPictureIdInputDto.cs
new file mode 100644
index 00000000..d4fbd3fb
--- /dev/null
+++ b/src/Shentun.Peis.Application.Contracts/RegisterCheckPictures/BatchUpdateRegisterCheckIdByRegisterCheckPictureIdInputDto.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shentun.Peis.RegisterCheckPictures
+{
+ public class BatchUpdateRegisterCheckIdByRegisterCheckPictureIdInputDto
+ {
+ ///
+ /// 图片Id集合
+ ///
+ public List RegisterCheckPictureIds { get; set; } = new List();
+
+ ///
+ /// 需要修改的RegisterCheckId
+ ///
+ public Guid RegisterCheckId { get; set; }
+ }
+}
diff --git a/src/Shentun.Peis.Application.Contracts/SumSummaryReports/SumSummaryReportDetailResultDto.cs b/src/Shentun.Peis.Application.Contracts/SumSummaryReports/SumSummaryReportDetailResultDto.cs
index be5df87c..e5186794 100644
--- a/src/Shentun.Peis.Application.Contracts/SumSummaryReports/SumSummaryReportDetailResultDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/SumSummaryReports/SumSummaryReportDetailResultDto.cs
@@ -45,7 +45,7 @@ namespace Shentun.Peis.SumSummaryReports
///
/// 检查日期
///
- public DateTime CheckDate { get; set; }
+ public string CheckDate { get; set; }
///
/// 检查项目列表
diff --git a/src/Shentun.Peis.Application/CCTJExportDatas/CCTJExportDataAppService.cs b/src/Shentun.Peis.Application/CCTJExportDatas/CCTJExportDataAppService.cs
index ca4bc4f0..ebc4d65e 100644
--- a/src/Shentun.Peis.Application/CCTJExportDatas/CCTJExportDataAppService.cs
+++ b/src/Shentun.Peis.Application/CCTJExportDatas/CCTJExportDataAppService.cs
@@ -29,6 +29,7 @@ using System.Diagnostics;
using System.Formats.Asn1;
using System.Linq;
using System.Text;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
@@ -3802,6 +3803,44 @@ namespace Shentun.Peis.CCTJExportDatas
await _sumDiagnosisRepository.InsertManyAsync(sumDiagnosisInsert);
}
+ else
+ {
+ //处理诊断
+ #region 提取* ：之前的诊断
+ MatchCollection matches = Regex.Matches(oldSuggestion, @"\*\s*([^：:\n\r]+)[：:]");
+ List oldDiagnosisList = new List();
+ foreach (System.Text.RegularExpressions.Match match in matches)
+ {
+ if (match.Groups.Count > 1)
+ {
+ string title = match.Groups[1].Value.Trim();
+ oldDiagnosisList.Add(title);
+ }
+ }
+ #endregion
+
+ var diagnosisList = await _diagnosisRepository.GetListAsync(m => oldDiagnosisList.Contains(m.DisplayName));
+ if (diagnosisList.Any())
+ {
+ List sumDiagnosisInsert = new List();
+
+ foreach (var diagnosisTemp in diagnosisList)
+ {
+ var dataSumDiagnosis = new SumDiagnosis
+ {
+ DisplayOrder = 999,
+ PatientRegisterId = patientRegisterId,
+ DiagnosisId = diagnosisTemp.Id,
+ SumSuggestionHeaderId = sumSuggestionHeaderId
+ };
+
+ sumDiagnosisInsert.Add(dataSumDiagnosis);
+ }
+
+ if (sumDiagnosisInsert.Any())
+ await _sumDiagnosisRepository.InsertManyAsync(sumDiagnosisInsert);
+ }
+ }
#endregion
diff --git a/src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs b/src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs
index bcbb4032..52ef308e 100644
--- a/src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs
+++ b/src/Shentun.Peis.Application/DiagnosisFunctions/DiagnosisFunctionAppService.cs
@@ -117,6 +117,7 @@ namespace Shentun.Peis.DiagnosisFunctions
///
///
[HttpPost("api/app/DiagnosisFunction/GetDoctorCheckDiagnosisResultAsync")]
+ [AllowAnonymous]
public async Task GetDoctorCheckDiagnosisResultAsync(GetDiagnosisResultRequestDto input)
{
#region 小结
@@ -538,14 +539,14 @@ namespace Shentun.Peis.DiagnosisFunctions
//老系统 拆分结果后，每个结果如果匹配到了结果模板，就不继续诊断匹配
//新系统 匹配到底
- var resultAry = GetResultArry(item.Result);
- List templateResultList = new List();
- for (int i = 0; i < resultAry.Length; i++)
- {
- templateResultList.Add(Regex.Replace(resultAry[0], @"\d+(\.\d+)?", "$"));
- }
+ //var resultAry = GetResultArry(item.Result);
+ //List templateResultList = new List();
+ //for (int i = 0; i < resultAry.Length; i++)
+ //{
+ // templateResultList.Add(Regex.Replace(resultAry[0], @"\d+(\.\d+)?", "$"));
+ //}
- // List templateResultList = new List(GetResultArry(item.Result));
+ List templateResultList = new List(GetResultArry(item.Result));
var summaryResultMatchIsOld = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "summary_result_match_isold");
@@ -561,13 +562,16 @@ namespace Shentun.Peis.DiagnosisFunctions
foreach (var itemResult in templateResultList)
{
+ string itemResultConvert = Regex.Replace(itemResult, @"(\d+)\s*\*\s*(\d+)", "*");
+ itemResultConvert = Regex.Replace(itemResultConvert, @"\d+(\.\d+)?", "$");
+
List tempDiagnosisList = new List();
if (string.IsNullOrWhiteSpace(itemResult) || itemResult.StartsWith("余未见异常"))
{
continue;
}
- var templatesList = item.ItemResultTemplates.Where(o => o.Result == itemResult && o.IsResultIntoSummary == 'Y').ToList();
+ var templatesList = item.ItemResultTemplates.Where(o => (o.Result == itemResultConvert || o.Result == itemResult) && o.IsResultIntoSummary == 'Y').ToList();
foreach (var template in templatesList)
{
if (template != null && template.DiagnosisId != null && template.DiagnosisId != Guid.Empty)
@@ -685,11 +689,11 @@ namespace Shentun.Peis.DiagnosisFunctions
{
return null;
}
- decimal resultDecimal;
- if (!decimal.TryParse(itemInput.Result, out resultDecimal))
- {
- return null;
- }
+ //decimal resultDecimal;
+ //if (!decimal.TryParse(itemInput.Result, out resultDecimal))
+ //{
+ // return null;
+ //}
var referenceRangeList = itemInput.ReferenceRanges.Where(o => o.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Number).ToList();
if (!referenceRangeList.Any())
{
@@ -827,11 +831,14 @@ namespace Shentun.Peis.DiagnosisFunctions
//}
foreach (var resultSplit in resultArry)
{
+ string resultSplitConvert = Regex.Replace(resultSplit, @"(\d+)\s*\*\s*(\d+)", "*");
+ resultSplitConvert = Regex.Replace(resultSplitConvert, @"\d+(\.\d+)?", "$");
+
if (string.IsNullOrWhiteSpace(resultSplit) || resultSplit.StartsWith("余未见异常"))
{
continue;
}
- var templatesList = itemInput.ItemResultTemplates.Where(o => o.Result == resultSplit && o.IsResultIntoSummary == 'Y').ToList();
+ var templatesList = itemInput.ItemResultTemplates.Where(o => (o.Result == resultSplit || o.Result == resultSplitConvert) && o.IsResultIntoSummary == 'Y').ToList();
foreach (var template in templatesList)
{
@@ -987,169 +994,169 @@ namespace Shentun.Peis.DiagnosisFunctions
- ///
- /// 执行项目 诊断函数
- ///
- ///
- ///
- ///
- ///
- ///
- private async Task> GetDiagnosisResultInItemAsync(GetDiagnosisResultRequestDto input, List- item_datas, PatientRegister patientRegister_data, List diagnosisTrips)
- {
- var reslist = new List();
-
- if (input.Items.Count > 0)
- {
- foreach (var item_data in item_datas)
- {
- if (item_data.IsDiagnosisFunction == 'Y' && !string.IsNullOrEmpty(item_data.DiagnosisFunction))
- {
- var DiagnosisFunctionResult_Item = GetCodeResult(input, item_data.DiagnosisFunction, item_datas);
-
- if (!string.IsNullOrEmpty(DiagnosisFunctionResult_Item))
- {
- reslist.Add(new GetDiagnosisResult_Detail
- {
- DiagnosisResult = DiagnosisFunctionResult_Item
- });
- }
+ /////
+ ///// 执行项目 诊断函数
+ /////
+ /////
+ /////
+ /////
+ /////
+ /////
+ //private async Task> GetDiagnosisResultInItemAsync(GetDiagnosisResultRequestDto input, List
- item_datas, PatientRegister patientRegister_data, List diagnosisTrips)
+ //{
+ // var reslist = new List();
- //是否继续执行参考范围规则
- if (item_data.IsContinueProcess == 'Y' && item_data.IsProduceSummary == 'Y')
- {
- string itemResult_Request = input.Items.Where(m => m.ItemId == item_data.Id).FirstOrDefault().Result; //项目结果
+ // if (input.Items.Count > 0)
+ // {
+ // foreach (var item_data in item_datas)
+ // {
+ // if (item_data.IsDiagnosisFunction == 'Y' && !string.IsNullOrEmpty(item_data.DiagnosisFunction))
+ // {
+ // var DiagnosisFunctionResult_Item = GetCodeResult(input, item_data.DiagnosisFunction, item_datas);
- //执行参考范围
- string referenceRangesResult = await GetDiagnosisResultInReferenceRangesAsync(item_data, itemResult_Request, patientRegister_data, diagnosisTrips);
- if (!string.IsNullOrEmpty(referenceRangesResult))
- {
- if (item_data.IsNameIntoSummary == 'Y')
- DiagnosisFunctionResult_Item = item_data.DisplayName + DiagnosisFunctionResult_Item;
- reslist.Add(new GetDiagnosisResult_Detail { DiagnosisResult = referenceRangesResult });
+ // if (!string.IsNullOrEmpty(DiagnosisFunctionResult_Item))
+ // {
+ // reslist.Add(new GetDiagnosisResult_Detail
+ // {
+ // DiagnosisResult = DiagnosisFunctionResult_Item
+ // });
+ // }
- }
+ // //是否继续执行参考范围规则
+ // if (item_data.IsContinueProcess == 'Y' && item_data.IsProduceSummary == 'Y')
+ // {
+ // string itemResult_Request = input.Items.Where(m => m.ItemId == item_data.Id).FirstOrDefault().Result; //项目结果
+ // //执行参考范围
+ // string referenceRangesResult = await GetDiagnosisResultInReferenceRangesAsync(item_data, itemResult_Request, patientRegister_data, diagnosisTrips);
+ // if (!string.IsNullOrEmpty(referenceRangesResult))
+ // {
+ // if (item_data.IsNameIntoSummary == 'Y')
+ // DiagnosisFunctionResult_Item = item_data.DisplayName + DiagnosisFunctionResult_Item;
+ // reslist.Add(new GetDiagnosisResult_Detail { DiagnosisResult = referenceRangesResult });
+ // }
- }
- }
- }
- }
- return reslist;
- }
- ///
- /// 执行项目 参考范围获取结果
- ///
- ///
- ///
- ///
- ///
- ///
- private async Task GetDiagnosisResultInReferenceRangesAsync(Item item, string itemResult, PatientRegister patientRegister_data, List diagnosisTrips)
- {
+ // }
+ // }
+ // }
+ // }
- string referenceRangesResult = "";
- string diagnosisTrip = ""; //诊断提示，参考范围性别、年龄 异常时出现
+ // return reslist;
+ //}
- var item_ReferenceRangeList = item.ReferenceRanges.Where(m => m.ReferenceRangeTypeFlag == item.ReferenceRangeTypeFlag).ToList();
- if (item_ReferenceRangeList.Any() && item.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Number)
- {
- //数字参考范围
+ /////
+ ///// 执行项目 参考范围获取结果
+ /////
+ /////
+ /////
+ /////
+ /////
+ /////
+ //private async Task GetDiagnosisResultInReferenceRangesAsync(Item item, string itemResult, PatientRegister patientRegister_data, List diagnosisTrips)
+ //{
+ // string referenceRangesResult = "";
+ // string diagnosisTrip = ""; //诊断提示，参考范围性别、年龄 异常时出现
- List referenceRanges = new List();
+ // var item_ReferenceRangeList = item.ReferenceRanges.Where(m => m.ReferenceRangeTypeFlag == item.ReferenceRangeTypeFlag).ToList();
+ // if (item_ReferenceRangeList.Any() && item.ReferenceRangeTypeFlag == ItemReferenceRangeTypeFlag.Number)
+ // {
+ // //数字参考范围
- if (patientRegister_data.Age != null)
- {
- referenceRanges = item_ReferenceRangeList.Where(m => m.AgeLowerLimit <= patientRegister_data.Age
- && m.AgeUpperLimit >= patientRegister_data.Age).ToList();
- }
- else
- {
- //if (string.IsNullOrEmpty(DiagnosisTrip))
- //{
- // DiagnosisTrip += "未登记年龄";
- //}
- //else
- //{
- // DiagnosisTrip += ",未登记年龄";
- //}
+ // List referenceRanges = new List();
- diagnosisTrip = "未登记年龄";
+ // if (patientRegister_data.Age != null)
+ // {
+ // referenceRanges = item_ReferenceRangeList.Where(m => m.AgeLowerLimit <= patientRegister_data.Age
+ // && m.AgeUpperLimit >= patientRegister_data.Age).ToList();
- //找出默认的0-200
- referenceRanges = item_ReferenceRangeList.Where(m => m.AgeLowerLimit == 0
- && m.AgeUpperLimit == 200).ToList();
- }
+ // }
+ // else
+ // {
+ // //if (string.IsNullOrEmpty(DiagnosisTrip))
+ // //{
+ // // DiagnosisTrip += "未登记年龄";
+ // //}
+ // //else
+ // //{
+ // // DiagnosisTrip += ",未登记年龄";
+ // //}
+
+ // diagnosisTrip = "未登记年龄";
+
+ // //找出默认的0-200
+ // referenceRanges = item_ReferenceRangeList.Where(m => m.AgeLowerLimit == 0
+ // && m.AgeUpperLimit == 200).ToList();
+ // }
- if (referenceRanges.Any())
- {
- //比对性别
- var referenceRanges2 = referenceRanges.Where(m => patientRegister_data.SexId != null && m.ForSexId == patientRegister_data.SexId).ToList();
+ // if (referenceRanges.Any())
+ // {
+ // //比对性别
+ // var referenceRanges2 = referenceRanges.Where(m => patientRegister_data.SexId != null && m.ForSexId == patientRegister_data.SexId).ToList();
- if (!referenceRanges2.Any())
- {
- //未找到，去匹配适用性别为A的
- referenceRanges2 = referenceRanges.Where(m => m.ForSexId == ForSexFlag.All).ToList();
+ // if (!referenceRanges2.Any())
+ // {
+ // //未找到，去匹配适用性别为A的
+ // referenceRanges2 = referenceRanges.Where(m => m.ForSexId == ForSexFlag.All).ToList();
- if (referenceRanges2.Any())
- {
- //数字参考范围类型
- referenceRangesResult = await GetDiagnosisResultInNumRangeAsync(item, itemResult, referenceRanges2[0]);
- }
- }
- }
+ // if (referenceRanges2.Any())
+ // {
+ // //数字参考范围类型
+ // referenceRangesResult = await GetDiagnosisResultInNumRangeAsync(item, itemResult, referenceRanges2[0]);
+ // }
+ // }
+ // }
- //////符合条件的参考范围
- //var item_ReferenceRange = item_ReferenceRangeList.Where(m =>
- //(m.ForSexId.ToString() == ForSexFlag.All || (patientRegister_data.SexId != null && m.ForSexId == patientRegister_data.SexId))
- // && patientRegister_data.Age != null
- // && m.AgeLowerLimit <= patientRegister_data.Age
- // && m.AgeUpperLimit >= patientRegister_data.Age).ToList();
-
- //if (item_ReferenceRange.Count > 0)
- //{
- // if (item_ReferenceRange.Count == 1)
- // {
- // //数字参考范围类型
- // result = await GetDiagnosisResultInNumRangeAsync(item, itemResult, item_ReferenceRange[0]);
- // }
-
- //}
- }
- else
- {
- //无参考范围或者字符参考范围
- referenceRangesResult = await GetDiagnosisResultInItemResultTemplateAsync(item, itemResult);
- if (string.IsNullOrEmpty(referenceRangesResult))
- {
- //未匹配上，继续
- referenceRangesResult = await GetDiagnosisResultInItemResultMatchAsync(item, itemResult);
+ // //////符合条件的参考范围
+ // //var item_ReferenceRange = item_ReferenceRangeList.Where(m =>
+ // //(m.ForSexId.ToString() == ForSexFlag.All || (patientRegister_data.SexId != null && m.ForSexId == patientRegister_data.SexId))
+ // // && patientRegister_data.Age != null
+ // // && m.AgeLowerLimit <= patientRegister_data.Age
+ // // && m.AgeUpperLimit >= patientRegister_data.Age).ToList();
+
+ // //if (item_ReferenceRange.Count > 0)
+ // //{
+ // // if (item_ReferenceRange.Count == 1)
+ // // {
+ // // //数字参考范围类型
+ // // result = await GetDiagnosisResultInNumRangeAsync(item, itemResult, item_ReferenceRange[0]);
+ // // }
+
+ // //}
+ // }
+ // else
+ // {
+ // //无参考范围或者字符参考范围
+ // referenceRangesResult = await GetDiagnosisResultInItemResultTemplateAsync(item, itemResult);
+ // if (string.IsNullOrEmpty(referenceRangesResult))
+ // {
+ // //未匹配上，继续
+ // referenceRangesResult = await GetDiagnosisResultInItemResultMatchAsync(item, itemResult);
- if (string.IsNullOrEmpty(referenceRangesResult))
- {
- //未匹配上，继续
- //对比项目默认结果，如果不是默认结果则直接用结果做为小结。
- if (item.DefaultResult != itemResult)
- {
- referenceRangesResult = itemResult;
- }
- }
- }
+ // if (string.IsNullOrEmpty(referenceRangesResult))
+ // {
+ // //未匹配上，继续
+ // //对比项目默认结果，如果不是默认结果则直接用结果做为小结。
+ // if (item.DefaultResult != itemResult)
+ // {
+ // referenceRangesResult = itemResult;
+ // }
+ // }
+ // }
- }
+ // }
- if (!string.IsNullOrEmpty(diagnosisTrip))
- diagnosisTrips.Add(diagnosisTrip);
+ // if (!string.IsNullOrEmpty(diagnosisTrip))
+ // diagnosisTrips.Add(diagnosisTrip);
- return referenceRangesResult;
- }
+ // return referenceRangesResult;
+ //}
///
/// 根据项目结果模板生成
diff --git a/src/Shentun.Peis.Application/OccupationalDiseases/OccupationalDiseaseAppService.cs b/src/Shentun.Peis.Application/OccupationalDiseases/OccupationalDiseaseAppService.cs
index e4c5af3a..c29a9672 100644
--- a/src/Shentun.Peis.Application/OccupationalDiseases/OccupationalDiseaseAppService.cs
+++ b/src/Shentun.Peis.Application/OccupationalDiseases/OccupationalDiseaseAppService.cs
@@ -875,7 +875,7 @@ namespace Shentun.Peis.OccupationalDiseases
.Select(o => o.asbitem.DisplayName).Distinct().ToList()),
ItemTypeDisplayOrder = listItem.itemType.DisplayOrder,
AsbitemDisplayOrder = listItem.asbitem.DisplayOrder,
- CheckDate = ((DateTime)listItem.registerCheck.CheckDate).Date,
+ CheckDate = DataHelper.ConversionDateToString(listItem.registerCheck.CheckDate),
CheckDoctorName = EntityHelper.GetCheckDoctorName(listItem.registerCheck.CheckDoctorId, userlist),
Items = list.Where(o => o.registerCheck.Id == registerCheckId)
.OrderBy(o => o.itemType.DisplayOrder)
diff --git a/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs b/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
index e0b69814..573d3306 100644
--- a/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
+++ b/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
@@ -381,12 +381,15 @@ namespace Shentun.Peis.PacsBusiness
}
StringBuilder itemResult = new StringBuilder();
var resultList = input.ItemResult.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).ToList();
- foreach (var itemRes in resultList)
+ if (resultList.Count > 1)
{
- itemResult.Append($"{resultList.IndexOf(itemRes) + 1}.{itemRes} ");
- }
+ foreach (var itemRes in resultList)
+ {
+ itemResult.Append($"{resultList.IndexOf(itemRes) + 1}.{itemRes} ");
+ }
- input.ItemResult = itemResult.ToString();
+ input.ItemResult = itemResult.ToString();
+ }
#endregion
Random rd = new Random();
@@ -534,7 +537,7 @@ namespace Shentun.Peis.PacsBusiness
List asbitemIds = asbitemIdString.Split(",", StringSplitOptions.RemoveEmptyEntries).ToList();
-
+
if (string.IsNullOrWhiteSpace(input.PictureBaseStr))
{
throw new UserFriendlyException("图片数据不存在");
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index 331a39db..16aff248 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -1891,7 +1891,9 @@ namespace Shentun.Peis.PatientRegisters
CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(s.FirstOrDefault().a.CustomerOrgId).Result.Id,
CustomerOrgParentName = _cacheService.GetTopCustomerOrgNameAsync(s.FirstOrDefault().a.CustomerOrgId).Result,
MedicalPackageName = s.FirstOrDefault().a.MedicalPackageId == null ? "" : _cacheService.GetMedicalPackageAsync(s.FirstOrDefault().a.MedicalPackageId.Value).GetAwaiter().GetResult().DisplayName,
- CustomerOrgGroupName = s.FirstOrDefault().a.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.FirstOrDefault().a.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName
+ CustomerOrgGroupName = s.FirstOrDefault().a.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.FirstOrDefault().a.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName,
+ PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(s.FirstOrDefault().a.PersonnelTypeId).GetAwaiter().GetResult(),
+ MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.FirstOrDefault().a.MaritalStatusId).GetAwaiter().GetResult()
});
}
@@ -2181,7 +2183,9 @@ namespace Shentun.Peis.PatientRegisters
MedicalPackageName = s.FirstOrDefault().a.MedicalPackageId == null ? "" : _cacheService.GetMedicalPackageAsync(s.FirstOrDefault().a.MedicalPackageId.Value).GetAwaiter().GetResult().DisplayName,
CustomerOrgGroupName = s.FirstOrDefault().a.CustomerOrgGroupId == null ? "" : _cacheService.GetCustomerOrgGroupAsync(s.FirstOrDefault().a.CustomerOrgGroupId.Value).GetAwaiter().GetResult().DisplayName,
AuditDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().a.AuditDoctorId).GetAwaiter().GetResult(),
- SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().a.SummaryDoctorId).GetAwaiter().GetResult()
+ SummaryDoctorName = _cacheService.GetSurnameAsync(s.FirstOrDefault().a.SummaryDoctorId).GetAwaiter().GetResult(),
+ PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(s.FirstOrDefault().a.PersonnelTypeId).GetAwaiter().GetResult(),
+ MaritalStatusName = _cacheService.GetMaritalStatusNameAsync(s.FirstOrDefault().a.MaritalStatusId).GetAwaiter().GetResult()
});
}
diff --git a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
index a99b4049..d06325f1 100644
--- a/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
+++ b/src/Shentun.Peis.Application/RegisterCheckPictures/RegisterCheckPictureAppService.cs
@@ -639,5 +639,38 @@ namespace Shentun.Peis.RegisterCheckPictures
await _registerCheckPictureRepository.UpdateAsync(registerCheckPictureEnt);
}
+
+
+
+ ///
+ /// 修改图片归属项目
+ ///
+ ///
+ ///
+ [HttpPost("api/app/RegisterCheckPicture/BatchUpdateRegisterCheckIdByRegisterCheckPictureId")]
+ public async Task BatchUpdateRegisterCheckIdByRegisterCheckPictureIdAsync(BatchUpdateRegisterCheckIdByRegisterCheckPictureIdInputDto input)
+ {
+ if (!input.RegisterCheckPictureIds.Any())
+ {
+ throw new UserFriendlyException("图片不能为空");
+ }
+
+ var registerCheckPictureList = await _registerCheckPictureRepository.GetListAsync(m => input.RegisterCheckPictureIds.Contains(m.Id));
+
+ if (registerCheckPictureList.Any())
+ {
+ var registerCheckEntity = _registerCheckRepository.FirstOrDefaultAsync(f => f.Id == input.RegisterCheckId);
+ if (registerCheckEntity == null)
+ {
+ throw new UserFriendlyException("RegisterCheckId不正确");
+ }
+ foreach (var item in registerCheckPictureList)
+ {
+ item.RegisterCheckId = input.RegisterCheckId;
+ }
+ await _registerCheckPictureRepository.UpdateManyAsync(registerCheckPictureList);
+
+ }
+ }
}
}
diff --git a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
index a91f2026..38d9300b 100644
--- a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
+++ b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
@@ -194,7 +194,7 @@ namespace Shentun.Peis.SumSummaryReports
.Select(o => o.asbitem.DisplayName).Distinct().ToList()),
ItemTypeDisplayOrder = listItem.itemType.DisplayOrder,
AsbitemDisplayOrder = listItem.asbitem.DisplayOrder,
- CheckDate = ((DateTime)listItem.registerCheck.CheckDate).Date,
+ CheckDate = DataHelper.ConversionDateToString(listItem.registerCheck.CheckDate),
CheckDoctorName = EntityHelper.GetCheckDoctorName(listItem.registerCheck.CheckDoctorId, userlist),
Items = list.Where(o => o.registerCheck.Id == registerCheckId)
.OrderBy(o => o.itemType.DisplayOrder)
diff --git a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs
index c4b7fbd8..b19080c7 100644
--- a/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs
+++ b/src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs
@@ -154,6 +154,7 @@ namespace Shentun.Peis.RegisterCheckItems
if (!string.IsNullOrEmpty(result))
{
result = result.Trim();
+ result = result.Replace("＞", "").Replace("≧", "").Replace("≥", "").Replace("≤", "").Replace("≦", "").Replace(">", "").Replace(">=", "").Replace("<=", "");
}
string resultStatusId = ResultStatusFlag.Normal;
decimal resultDecimal;