添加日志

performance/Performance.Api/Controllers/AllotController.cs

@@ -163,7 +163,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody]Al
             if (_evn.IsEnvironment("Localhost"))
                 _allotService.Generate(allot, email);
             else
-                BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));
+                BackgroundJob.Schedule(() => _allotService.Generate(allot, email), TimeSpan.FromSeconds(1));
 
             //_allotService.Generate(allot, email);
             ////BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));

performance/Performance.Api/Performance.Api.csproj

@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="MySql.Data" Version="8.0.15" />
     <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.15" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -515,6 +515,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.GuaranteeController.UnitType">
+            <summary>
+            医院核算单元
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.HospitalController.GetHospitalList">
             <summary>
             获取当前登录用户管辖医院列表

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -1133,6 +1133,11 @@
             费用名称
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.DrugpropRequest.ChargeType">
+            <summary>
+            费用类别
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.EmployeeRequest.ID">
             <summary>
             
@@ -1830,6 +1835,31 @@
             药占比对应系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.GuaranteeResponse.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.GuaranteeResponse.Priority">
+            <summary>
+            优先级
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.GuaranteeResponse.UnitType">
+            <summary>
+            核算单元类型 1 医生组 2 护理组 3 医技组
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.GuaranteeResponse.Target">
+            <summary>
+            保底科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.GuaranteeResponse.Source">
+            <summary>
+            保底来源科室
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.IncomeResponse.SheetNameKeyword">
             <summary>
             关键字匹配

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -725,6 +725,11 @@
             费用名称
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.cof_drugtype.ChargeType">
+            <summary>
+            费用类别
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.cof_guarantee">
             <summary>
             保底科室配置

performance/Performance.Services/GuaranteeService.cs

@@ -106,11 +106,7 @@ public List<cof_guarantee> GuarantUpdate(GuaranteeRequest request)
             if (guaranteeList == null)
                 throw new PerformanceException("提交数据无效");
             var filterList = perforCofguaranteeRepository.GetEntities(t => t.AllotId == guarantee.AllotId && t.UnitType == request.UnitType && t.Target == request.Target);
-<<<<<<< HEAD
-            if ((filterList != null && filterList.Count > 0) && (request.UnitType != guarantee.UnitType || request.Target != guarantee.Target))
-=======
             if (request.UnitType != guarantee.UnitType && filterList != null && filterList.Count > 0)
->>>>>>> 50ad63f... 保底配置修改-过滤重复数据
                 throw new PerformanceException($"[{((UnitType)request.UnitType).ToString()}]已存在\"{request.Target}\",请重新选择");
 
             #region 修改优先级

performance/Performance.Services/Hubs/AllotLogHub.cs

 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,13 +10,22 @@ namespace Performance.Services
 {
     public class AllotLogHub : Hub
     {
+        private readonly ILogger<AllotLogHub> logger;
+
+        public AllotLogHub(ILogger<AllotLogHub> logger)
+        {
+            this.logger = logger;
+        }
+
         public override Task OnConnectedAsync()
         {
+            logger.LogDebug($"日志推送 连接{Context.ConnectionId}");
             return base.OnConnectedAsync();
         }
         public override Task OnDisconnectedAsync(Exception exception)
         {
             var connectionId = Context.ConnectionId;
+            logger.LogDebug($"日志推送 断开连接{connectionId}");
             //1 查询用户分组信息
             var groupName = "";
 
@@ -26,6 +36,7 @@ public override Task OnDisconnectedAsync(Exception exception)
                 RedisHelper.HDel("AllotLogGroup", connectionId);
             }
 
+            logger.LogDebug($"日志推送 断开连接{connectionId}-{groupName}");
             //3 分组中删除用户
             Groups.RemoveFromGroupAsync(connectionId, groupName);
             return base.OnDisconnectedAsync(exception);
@@ -39,7 +50,7 @@ public override Task OnDisconnectedAsync(Exception exception)
                 //1 向数据库中插入用户及分组信息
                 RedisHelper.HSet("AllotLogGroup", connectionId, groupName);
 
-
+                logger.LogDebug($"日志推送 添加用户组{connectionId}-{groupName}");
                 //2 将用户插入分组
                 await Groups.AddToGroupAsync(connectionId, groupName);
             }