shentun
/
peis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

lis申请

bjmzak
DESKTOP-G961P6V\Zhh 2 years ago
parent
ed0cd87bfb
commit
41083f7d9b
6 changed files with 47 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
  2. 34
      src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs
  3. 34
      src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs
  4. 2
      src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs
  5. 2
      test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs
  6. 20
      test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs

2
src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
View File

@ -164,7 +164,7 @@ namespace Shentun.Peis.PrintReports
//生成LIS条码 //生成LIS条码
var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId); var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId);
await _unitOfWorkManager.Current.SaveChangesAsync(); await _unitOfWorkManager.Current.SaveChangesAsync();
await _unitOfWorkManager.Current.CompleteAsync();
//await _unitOfWorkManager.Current.CompleteAsync();
//检索条码数据 //检索条码数据

34
src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs
View File

@ -66,25 +66,25 @@ namespace Shentun.Peis.ChargeRequests
public async Task SendThirChargeRequestAsync(Guid id,string funName) public async Task SendThirChargeRequestAsync(Guid id,string funName)
{ {
var patientRegisterEntity = await (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join registerCheck in await _registerCheckRepository.GetQueryableAsync()
on patientRegister.Id equals registerCheck.PatientRegisterId
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
join chargeRequest in await _repository.GetQueryableAsync()
on registerCheckAsbitem.LisRequestId equals chargeRequest.Id
where chargeRequest.Id == id
select new
{
patientRegister
}).FirstOrDefaultAsync();
if (patientRegisterEntity == null)
{
return;
}
//var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
// join registerCheck in await _registerCheckRepository.GetQueryableAsync()
// on patientRegister.Id equals registerCheck.PatientRegisterId
// join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
// on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
// join chargeRequest in await _repository.GetQueryableAsync()
// on registerCheckAsbitem.LisRequestId equals chargeRequest.Id
// where chargeRequest.Id == id
// select new
// {
// patientRegister
// }).ToList().FirstOrDefault();
//if (patientRegisterEntity == null)
//{
// return;
//}
var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.ChargeRequest
&& o.MedicalCenterId == patientRegisterEntity.patientRegister.MedicalCenterId))
))
.OrderBy(o => o.DisplayOrder).ToList(); .OrderBy(o => o.DisplayOrder).ToList();
foreach (var thirdInterface in thirdInterfaces) foreach (var thirdInterface in thirdInterfaces)
{ {

34
src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs
View File

@ -323,24 +323,24 @@ namespace Shentun.Peis.LisRequests
public async Task SendThirdLisRequestAsync(Guid id) public async Task SendThirdLisRequestAsync(Guid id)
{ {
var patientRegisterEntity = await (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
join registerCheck in await _registerCheckRepository.GetQueryableAsync()
on patientRegister.Id equals registerCheck.PatientRegisterId
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
join lisRequest in await _lisRequestRepository.GetQueryableAsync()
on registerCheckAsbitem.LisRequestId equals lisRequest.Id
where lisRequest.Id == id
select new
{
patientRegister
}).FirstOrDefaultAsync();
if(patientRegisterEntity == null)
{
return;
}
//var patientRegisterEntity = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync()
// join registerCheck in await _registerCheckRepository.GetQueryableAsync()
// on patientRegister.Id equals registerCheck.PatientRegisterId
// join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync()
// on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId
// join lisRequest in await _lisRequestRepository.GetQueryableAsync()
// on registerCheckAsbitem.LisRequestId equals lisRequest.Id
// where lisRequest.Id == id
// select new
// {
// patientRegister
// }).ToList().FirstOrDefault();
// if(patientRegisterEntity == null)
// {
// return;
// }
var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest var thirdInterfaces = (await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType == ThirdInterfaceTypeFlag.LisRequest
&& o.MedicalCenterId == patientRegisterEntity.patientRegister.MedicalCenterId))
))
.OrderBy(o => o.DisplayOrder).ToList(); .OrderBy(o => o.DisplayOrder).ToList();
foreach (var thirdInterface in thirdInterfaces) foreach (var thirdInterface in thirdInterfaces)
{ {

2
src/Shentun.Peis.Domain/RegisterCheckItems/RegisterCheckItemManager.cs
View File

@ -150,7 +150,7 @@ namespace Shentun.Peis.RegisterCheckItems
referenceRangeValue = referenceRangeValue.Replace("≧", ">=") referenceRangeValue = referenceRangeValue.Replace("≧", ">=")
.Replace("≥", ">=").Replace("≤", "<=").Replace("≦", "<="); .Replace("≥", ">=").Replace("≤", "<=").Replace("≦", "<=");
var pos = referenceRangeValue.IndexOf("--");//兼容老系统 var pos = referenceRangeValue.IndexOf("--");//兼容老系统
if (pos == 0)
if (pos <= 0)
{ {
pos = referenceRangeValue.IndexOf("-"); pos = referenceRangeValue.IndexOf("-");
} }

2
test/Shentun.Peis.Application.Tests/ChargeRequestAppServiceTest.cs
View File

@ -47,7 +47,7 @@ namespace Shentun.Peis
}; };
var newEntity = await _appService.CreateAsync(entity); var newEntity = await _appService.CreateAsync(entity);
await unitOfWork.CompleteAsync();
//await unitOfWork.CompleteAsync();
} }
} }
} }

20
test/Shentun.Peis.Application.Tests/DiagnosisFunctionAppServiceTest.cs
View File

@ -156,35 +156,35 @@ namespace Shentun.Peis
{ {
var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto() var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto()
{ {
RegisterCheckId = new Guid("3a11ee70-034c-1ce6-40f9-7eabb02830a9"),
RegisterCheckId = new Guid("3a123c55-07a8-b330-ac9c-52e2a05e1dba"),
Items = new List<GetDiagnosisResultRequest_Item> Items = new List<GetDiagnosisResultRequest_Item>
{ {
new GetDiagnosisResultRequest_Item() new GetDiagnosisResultRequest_Item()
{ {
ItemId = new Guid("3a0d2916-3706-a22a-69dd-bd80be509d07"),
ItemId = new Guid("3a1203c2-fde9-6f64-d268-54c7817fc9a4"),
Result = "30.5" Result = "30.5"
}, },
new GetDiagnosisResultRequest_Item() new GetDiagnosisResultRequest_Item()
{ {
ItemId = new Guid("3a0d2919-49d5-30d3-4373-b3dc1e806732"),
ItemId = new Guid("3a1203c2-fefd-b6cd-2933-84860f5af7b9"),
Result = "9" Result = "9"
}, },
new GetDiagnosisResultRequest_Item() new GetDiagnosisResultRequest_Item()
{ {
ItemId = new Guid("3a0d2917-40e2-2f81-ebfc-267a9a98b02e"),
ItemId = new Guid("3a1203c3-0017-e959-3735-5a3c71a9c70a"),
Result = "91.3" Result = "91.3"
}, },
new GetDiagnosisResultRequest_Item() new GetDiagnosisResultRequest_Item()
{ {
ItemId = new Guid("3a0d291a-6ab5-8642-9cd3-30353ecb5d15"),
ItemId = new Guid("3a1203c3-012e-1a2e-66a8-1829caf0cd64"),
Result = "90" Result = "90"
}, },
new GetDiagnosisResultRequest_Item()
{
ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"),
Result = "13"
},
//new GetDiagnosisResultRequest_Item()
//{
// ItemId = new Guid("3a0d2918-344b-0373-a53c-b4888bd6b9a6"),
// Result = "13"
//},
} }
}; };
var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto); var result = await _appService.GetDoctorCheckDiagnosisResultAsync(getDiagnosisResultRequestDto);

Write Preview
Loading…
Cancel
Save