signalr

performance/Performance.Api/Startup.cs

@@ -233,7 +233,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             #endregion
 
             app.UseCors("SignalrCore");
-            //app.UseSignalR(routes => routes.MapHub<AllotLogHub>("/performance/allotLogHub"));
+            app.UseSignalR(routes => routes.MapHub<AllotLogHub>("/performance/allotLogHub"));
 
             loggerFactory.CreateLogger<Startup>().LogDebug(env.EnvironmentName);
             app.UseMvc();

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

@@ -123,6 +123,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.Success(Performance.DtoModels.AllotRequest)">
+            <summary>
+            生成成功或归档绩效记录
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Insert(Performance.DtoModels.AllotRequest)">
             <summary>
             新增绩效

performance/Performance.Services/SecondAllotService.cs

@@ -88,13 +88,7 @@ public List<SecondListResponse> GetSecondList(int userId)
                 throw new NotImplementedException("该医院未生成绩效");
 
             var allotListId = allotList.Select(t => t.ID).ToList();
-
-            Expression<Func<ag_secondallot, bool>> exp = t => allotListId.Contains(t.AllotId.Value) && t.Department == user.Department;
-            if (role.RoleID == application.NurseRole)
-                exp = exp.And(t => t.UnitType == "护理组");
-            else
-                exp = exp.And(t => t.UnitType != "护理组");
-            var secondList = perforAgsecondallotRepository.GetEntities(exp);
+            var secondList = perforAgsecondallotRepository.GetEntities(t => allotListId.Contains(t.AllotId.Value) && t.Department == user.Department);
             //各科室绩效分配结果
             var accountList = perforResaccountRepository.GetEntities(t => allotListId.Contains(t.AllotID.Value) && t.Department == user.Department);
             //取得未生成二次绩效的绩效id