diff --git a/src/Shentun.Peis.Application/Paperlesss/PaperlessAppService.cs b/src/Shentun.Peis.Application/Paperlesss/PaperlessAppService.cs
index adaab9b1..21b024ed 100644
--- a/src/Shentun.Peis.Application/Paperlesss/PaperlessAppService.cs
+++ b/src/Shentun.Peis.Application/Paperlesss/PaperlessAppService.cs
@@ -428,7 +428,7 @@ namespace Shentun.Peis.Paperlesss
var entDto = new GetAsbitemListByPatientRegisterIdDto
{
CheckedAsbitem = listDto.Where(m => m.CompleteFlag == RegisterCheckCompleteFlag.Checked).ToList(),
- UnCheckAsbitem = listDto.Where(m => m.CompleteFlag == RegisterCheckCompleteFlag.UnChecked).ToList(),
+ UnCheckAsbitem = listDto.Where(m => m.CompleteFlag == RegisterCheckCompleteFlag.UnChecked || m.CompleteFlag == RegisterCheckCompleteFlag.GiveUpChecked).ToList(),
CountDownAsbitem = listDto.Where(m => m.IsCountDown == 'Y').ToList()
};
@@ -504,6 +504,18 @@ namespace Shentun.Peis.Paperlesss
throw new UserFriendlyException("检查id不正确");
}
+ if (registerCheck.CompleteFlag == RegisterCheckCompleteFlag.Checked)
+ {
+ throw new UserFriendlyException("项目已检查,不允许弃检操作");
+ }
+
+ var patientRegisterFirst = await _patientRegisterRepository.FirstOrDefaultAsync(f => f.Id == registerCheck.PatientRegisterId);
+ if (patientRegisterFirst.CompleteFlag == PatientRegisterCompleteFlag.SumCheck)
+ {
+ throw new UserFriendlyException("人员已总检,不允许弃检操作");
+ }
+
+
#region 检查图片生成
string imgurl = $"GiveUpSignFiles/{DateTime.Now.Year}/{DateTime.Now.Month}/{DateTime.Now.Day}/{registerCheck.PatientRegisterId}/give_up_sign";
@@ -518,6 +530,27 @@ namespace Shentun.Peis.Paperlesss
await _registerCheckRepository.UpdateAsync(registerCheck);
}
+ ///
+ /// 取消弃检
+ ///
+ ///
+ ///
+ [HttpPost("api/app/Paperless/CancelGiveCheckByRegisterCheckId")]
+ public async Task CancelGiveCheckByRegisterCheckIdAsync(RegisterCheckIdInputDto input)
+ {
+
+ var registerCheck = await _registerCheckRepository.FirstOrDefaultAsync(f => f.Id == input.RegisterCheckId);
+ if (registerCheck == null)
+ {
+ throw new UserFriendlyException("检查id不正确");
+ }
+
+ registerCheck.CompleteFlag = RegisterCheckCompleteFlag.UnChecked;
+ registerCheck.GiveUpCheckSignFile = "";
+
+ await _registerCheckRepository.UpdateAsync(registerCheck);
+ }
+
///
/// 签知情同意书
@@ -804,6 +837,12 @@ namespace Shentun.Peis.Paperlesss
[HttpPost("api/app/Paperless/CreateQueueRoomByRoomId")]
public async Task CreateQueueRoomByRoomIdAsync(CreateQueueRoomByRoomIdInputDto input)
{
+ var patientRegisterFirst = await _patientRegisterRepository.FirstOrDefaultAsync(f => f.Id == input.PatientRegisterId);
+ if (patientRegisterFirst.CompleteFlag == PatientRegisterCompleteFlag.SumCheck)
+ {
+ throw new UserFriendlyException("人员已总检,不允许排队");
+ }
+
await _queueRegisterAppService.ManualQueuingRoomAsync(new ManualQueuingRoomInputDto { PatientRegisterId = input.PatientRegisterId, RoomId = input.RoomId });
}
}