v22.4.18

performance/Performance.Api/Properties/PublishProfiles/SingleFile.pubxml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    <DebugType>embedded</DebugType>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <PublishSingleFile>True</PublishSingleFile>
+    <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <SiteUrlToLaunchAfterPublish />
+    <PublishTrimmed>True</PublishTrimmed>
+    <ProjectGuid>3ae00ff5-f0ba-4d72-a23b-770186309327</ProjectGuid>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

performance/Performance.Api/Startup.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.Extensions.Configuration;
@@ -15,6 +16,7 @@
 using Performance.DtoModels;
 using Performance.Infrastructure;
 using Performance.Services;
+using System;
 using System.Globalization;
 using System.Reflection;
 using System.Text;
@@ -87,7 +89,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddDependencyInjectionConfiguration();
 
             // signalr
-            services.AddSignalR();
+            services.AddSignalR(hubOptions =>
+            {
+                hubOptions.EnableDetailedErrors = true;
+                hubOptions.KeepAliveInterval = TimeSpan.FromMinutes(1);
+            });
 
             // cors
             services.AddCors(options =>
@@ -132,7 +138,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapHub<AllotLogHub>("/performance/allotLogHub");
+                endpoints.MapHub<AllotLogHub>("/performance/allotLogHub", options =>
+                {
+                    options.Transports = HttpTransportType.WebSockets | HttpTransportType.LongPolling;
+                    options.WebSockets.CloseTimeout = TimeSpan.FromMinutes(1);
+                });
                 endpoints.MapControllers();
             });
 

performance/Performance.DtoModels/Request/SecondAuditRequest.cs

@@ -22,7 +22,6 @@ public SecondAuditRequestValidator()
         {
             RuleFor(x => x.SecondId).NotNull().NotEmpty().GreaterThan(0);
             RuleFor(x => x.IsPass).NotNull().NotEmpty().InclusiveBetween(1, 2);
-            RuleFor(x => x.Remark).NotNull().NotEmpty();
         }
     }
 }

performance/Performance.DtoModels/Response/DeptdicResponse.cs

@@ -10,14 +10,14 @@ public class DeptdicResponse
         public int HospitalId { get; set; }
         public string HISDeptName { get; set; }
         public string Department { get; set; }
-        public Deptdic OutDoctorAccounting { get; set; }
-        public Deptdic OutNurseAccounting { get; set; }
-        public Deptdic OutTechnicAccounting { get; set; }
-        public Deptdic InpatDoctorAccounting { get; set; }
-        public Deptdic InpatNurseAccounting { get; set; }
-        public Deptdic InpatTechnicAccounting { get; set; }
-        public Deptdic LogisticsAccounting { get; set; }
-        public Deptdic SpecialAccounting { get; set; }
+        public string OutDoctorAccounting { get; set; }
+        public string OutNurseAccounting { get; set; }
+        public string OutTechnicAccounting { get; set; }
+        public string InpatDoctorAccounting { get; set; }
+        public string InpatNurseAccounting { get; set; }
+        public string InpatTechnicAccounting { get; set; }
+        public string LogisticsAccounting { get; set; }
+        public string SpecialAccounting { get; set; }
         public DateTime? CreateTime { get; set; }
         public int IsVerify { get; set; }
     }

performance/Performance.Services/ComputeConfig.cs

@@ -174,6 +174,7 @@ public static List<cof_alias> GetAllPersonnelTags(bool ownerQuery)
                 new cof_alias{ Alias = "备用09", Name = nameof(per_employee.Reserve09), States = 0, SumStatus = 0, Sort = 20 },
                 new cof_alias{ Alias = "备用10", Name = nameof(per_employee.Reserve10), States = 0, SumStatus = 0, Sort = 20 },
 
+                new cof_alias{ Alias = "核算组别", Name = nameof(report_performance_person_tags.UnitType), States = 1, SumStatus = 0, Sort = 99 },
                 new cof_alias{ Alias = "绩效发放情况", Name = nameof(report_performance_person_tags.Tag1), States = 1, SumStatus = 0, Sort = 100 },
                 new cof_alias{ Alias = "当月绩效权重", Name = nameof(report_performance_person_tags.Tag2), States = 1, SumStatus = 0, Sort = 101 },
                 new cof_alias{ Alias = "重点群体对比1", Name = nameof(report_performance_person_tags.Tag3), States = 1, SumStatus = 0, Sort = 102 },

performance/Performance.Services/PersonService.cs

@@ -442,6 +442,34 @@ public IEnumerable<DeptdicResponse> GetDepartments(int allotId)
                 IsVerify = t.Min(w => w.IsVerify) ?? 1,
             });
 
+                }
+                var dic = dics.FirstOrDefault(group => group.Department == department && group.HISDeptName == hISDeptName && group.UnitType == unitType.ToString() && group.Source == source);
+
+                if (dic == null)
+                    dic = dics.FirstOrDefault(group => group.Department == department && group.HISDeptName == hISDeptName && group.UnitType == unitType.ToString());
+
+                return dic?.AccountingUnit;
+            }
+
+            var result = depts
+                .GroupBy(t => new { t.HISDeptName, t.Department })
+                .Select(t => new DeptdicResponse
+                {
+                    HospitalId = hospitalId,
+                    HISDeptName = t.Key.HISDeptName,
+                    Department = t.Key.Department,
+                    OutDoctorAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.医生组, "门诊"),
+                    OutNurseAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.护理组, "门诊"),
+                    OutTechnicAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.医技组, "门诊"),
+                    InpatDoctorAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.医生组, "住院"),
+                    InpatNurseAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.护理组, "住院"),
+                    InpatTechnicAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.医技组, "住院"),
+                    LogisticsAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.行政后勤),
+                    SpecialAccounting = GetDeptdic(t.ToList(), t.Key.Department, t.Key.HISDeptName, UnitType.特殊核算组),
+                    CreateTime = t.Max(group => group.CreateTime),
+                    IsVerify = t.Min(w => w.IsVerify) ?? 1,
+                });
+
             return result.OrderBy(w => w.IsVerify).ThenByDescending(t => t.CreateTime).ThenBy(t => t.Department);
         }
 

performance/Performance.Services/ReportGlobalService.cs

@@ -872,7 +872,7 @@ public void SaveReportTag(int hospitalId, SaveCollectData request)
             {
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<report_performance_tags>(json);
-                if (!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && !string.IsNullOrEmpty(data.Tag1) && !string.IsNullOrEmpty(data.Tag2))
+                if (!string.IsNullOrEmpty(data.UnitType) && !string.IsNullOrEmpty(data.AccountingUnit) && !string.IsNullOrEmpty(data.Tag1))
                 {
                     data.CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
                     report.Add(data);
@@ -886,8 +886,8 @@ public void SaveReportTag(int hospitalId, SaveCollectData request)
 
         public static Dictionary<string, string> ReportTag { get; } = new Dictionary<string, string>
         {
-            {nameof(report_performance_tags.UnitType), "核算单元类型"},
-            {nameof(report_performance_tags.AccountingUnit), "科室"},
+            {nameof(report_performance_tags.UnitType), "核算组别"},
+            {nameof(report_performance_tags.AccountingUnit), "核算单元"},
             {nameof(report_performance_tags.Tag1), "绩效发放情况"},
             {nameof(report_performance_tags.Tag2), "当月绩效权重"},
             {nameof(report_performance_tags.Tag3), "重点群体对比1"},

performance/Performance.Services/SecondAllot/SecondAllotService.cs

@@ -525,7 +525,7 @@ public void SaveSecondAllotHeadData(int secondId, string json)
             if (workValue == null || !workValue.Any())
                 return;
 
-            foreach (var value in workValue)
+            foreach (var value in workValue.Distinct())
             {
                 for (int i = 0; i < prefix.Length; i++)
                 {