田爽 před 1 rokem
rodič
revize
596ee96710

+ 25 - 30
src/Hotline.Application/Handlers/FlowEngine/EndWorkflowHandler.cs

@@ -127,36 +127,31 @@ public class EndWorkflowHandler : INotificationHandler<EndWorkflowNotify>
                             visitDetail.OrgProcessingResults = screenSatisfy;
                             visitDetail.OrgHandledAttitude = screenSatisfy;
                             await _orderVisitedDetailRepository.UpdateAsync(visitDetail, cancellationToken);
-                            //推省上数据
-                            if (screen.Publish != null && screen.Publish.Value)
-                            {
-                                //获取回访信息
-                                var visit = await _orderVisitRepository.Queryable().Includes(x => x.Order)
-                                    .Includes(x => x.OrderVisitDetails)
-                                    .Where(x => x.Id == screen.VisitId).FirstAsync(cancellationToken);
-                                if (visit != null)
-                                {
-                                    //获取回访明细
-                                    var visitDe = visit.OrderVisitDetails.First(x => x.Id == screen.VisitDetailId);
-                                    //推省上
-                                    _capPublisher.Publish(EventNames.HotlineOrderVisited,
-                                        new PublishVisitDto()
-                                        {
-                                            Order = _mapper.Map<OrderDto>(visit.Order),
-                                            No = visit.No,
-                                            VisitType = visit.VisitType,
-                                            VisitName = visit.CreatorName,
-                                            VisitTime = visit.VisitTime,
-                                            VisitRemark = visitDe.VisitContent,
-                                            AreaCode = visit.Order.AreaCode!,
-                                            SubjectResultSatifyCode = visitDe.OrgProcessingResults?.Key,
-                                            FirstSatisfactionCode = visit.Order.FirstVisitResultCode!,
-                                            ClientGuid = ""
-                                        });
-                                }
-
-                            }
-                        }
+							//获取回访信息
+							var visit = await _orderVisitRepository.Queryable().Includes(x => x.Order)
+								.Includes(x => x.OrderVisitDetails)
+								.Where(x => x.Id == screen.VisitId).FirstAsync(cancellationToken);
+							if (visit != null)
+							{
+								//获取回访明细
+								var visitDe = visit.OrderVisitDetails.First(x => x.Id == screen.VisitDetailId);
+								//推省上
+								_capPublisher.Publish(EventNames.HotlineOrderVisited,
+									new PublishVisitDto()
+									{
+										Order = _mapper.Map<OrderDto>(visit.Order),
+										No = visit.No,
+										VisitType = visit.VisitType,
+										VisitName = visit.CreatorName,
+										VisitTime = visit.VisitTime,
+										VisitRemark = visitDe.VisitContent,
+										AreaCode = visit.Order.AreaCode!,
+										SubjectResultSatifyCode = visitDe.OrgProcessingResults?.Key,
+										FirstSatisfactionCode = visit.Order.FirstVisitResultCode!,
+										ClientGuid = ""
+									});
+							}
+						}
                     }
                     else
                     {