二次办理

src/Hotline.Application/Orders/OrderSecondaryHandlingApplication.cs

@@ -114,7 +114,7 @@ namespace Hotline.Application.Orders
 			model.SendBackContent = dto.SendBackContent;
 			model.AuditUser = _sessionContext.UserName;
 			model.AuditTime = DateTime.Now;
-			model.SendBackNum++;
+			model.SendBackNum = model.SendBackNum is null ? 1 : model.SendBackNum + 1;
 			await _orderSecondaryHandlingRepository.UpdateAsync(model, cancellationToken);
 			var visit = await _orderVisitRepository.GetAsync(x => x.Id == model.VisitId , cancellationToken);
 			if (visit != null)
@@ -224,7 +224,8 @@ namespace Hotline.Application.Orders
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgHandledAttitude), x => SqlFunc.JsonListObjectAny(x.OrgHandledAttitude, "Key", dto.OrgHandledAttitude))
 				.WhereIF(!string.IsNullOrEmpty(dto.OrgNoSatisfiedReason), x => SqlFunc.JsonField(x.OrgNoSatisfiedReason, "Key") == dto.OrgNoSatisfiedReason)
 				.Where((x, s) => x.OrderVisit.VisitState != EVisitState.None && x.OrderVisit.IsCanHandle)
-				.Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode  == _sessionContext.OrgId) ;
+				//.Where((x, s) => x.OrderVisit.Order.CounterSignType == null && x.OrderVisit.Order.ActualHandleOrgCode  == _sessionContext.OrgId) 
+				;
 			if (_sessionContext.OrgId != null && !_sessionContext.OrgIsCenter)
 			{
 				query.WhereIF(!string.IsNullOrEmpty(dto.Keyword),

src/Hotline.Share/Dtos/Order/OrderSecondaryHandlingDto.cs

@@ -36,6 +36,12 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public string? Content { get; set; }
 
+		/// <summary>
+		/// 退回意见
+		/// </summary>
+		public string? SendBackContent { get; set; }
+
+
 		/// <summary>
 		/// 审批意见
 		/// </summary>