|
|
|
@ -679,6 +679,7 @@ namespace Shentun.Peis.PatientRegisters |
|
|
|
/// <param name="input"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpPost("api/patientregister/createreturninfo")] |
|
|
|
[RemoteService(false)] |
|
|
|
public async Task<PatientRegisterOrNoDto> CreateReturnInfoAsync(CreatePatientRegisterDto input) |
|
|
|
{ |
|
|
|
throw new UserFriendlyException("改接口已经禁止使用"); |
|
|
|
@ -1011,19 +1012,19 @@ namespace Shentun.Peis.PatientRegisters |
|
|
|
|
|
|
|
sumquery = sumquery.Where(m => m.a.CompleteFlag == input.CompleteFlag); |
|
|
|
|
|
|
|
if (input.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y') |
|
|
|
{ |
|
|
|
//直接过滤
|
|
|
|
sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); |
|
|
|
} |
|
|
|
//if (input.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration && input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
|
|
|
|
//{
|
|
|
|
// //直接过滤
|
|
|
|
// sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration);
|
|
|
|
//}
|
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
if (input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y') |
|
|
|
{ |
|
|
|
//if (input.IsFilterPreRegistration != null && input.IsFilterPreRegistration == 'Y')
|
|
|
|
//{
|
|
|
|
//直接过滤
|
|
|
|
sumquery = sumquery.Where(m => m.a.CompleteFlag != PatientRegisterCompleteFlag.PreRegistration); |
|
|
|
} |
|
|
|
//}
|
|
|
|
} |
|
|
|
|
|
|
|
if (input.IsAudit != null) |
|
|
|
@ -2499,7 +2500,7 @@ namespace Shentun.Peis.PatientRegisters |
|
|
|
patientRegisterList.ForEach(f => |
|
|
|
{ |
|
|
|
f.IsMedicalStart = 'Y'; |
|
|
|
f.MedicalStartDate =DateTime.Now; |
|
|
|
f.MedicalStartDate = DateTime.Now; |
|
|
|
} |
|
|
|
); |
|
|
|
|
|
|
|
|