Merge branch 'v2020morge' into v2020morge-graphql

# Conflicts:
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/report_global.cs
#	performance/Performance.Repository/Repository/PerforReportglobalRepository.cs

performance/Performance.Api/Controllers/ReportGlobalController.cs

+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Performance.Api.Controllers
+{
+    [ApiController]
+    [Route("api/{hospitalId}/report/global")]
+    public class ReportGlobalController : Controller
+    {
+        //private readonly
+
+        public ReportGlobalController()
+        {
+        }
+    }
+}

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

@@ -1660,34 +1660,34 @@
             </summary>
         </member>
         <member name="T:Performance.EntityModels.collect_permission">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.Id">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.HospitalId">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.UserId">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.SheetType">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.SheetName">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_permission.HeadName">
             <summary>
@@ -2054,6 +2054,16 @@
             
              </summary>
         </member>
+        <member name="P:Performance.EntityModels.his_data.HisDepartment">
+            <summary>
+            His科室
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.his_data.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.his_data.Department">
             <summary>
             科室
@@ -2065,9 +2075,9 @@
             </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.PersonnelNumber">
-             <summary>
+            <summary>
             人员工号
-             </summary>
+            </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.SourceType">
              <summary>
@@ -2075,19 +2085,24 @@
              </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.Category">
-             <summary>
+            <summary>
             费用类型
-             </summary>
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.his_data.Original">
+            <summary>
+            原始分类
+            </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.ItemName">
-             <summary>
-            
-             </summary>
+            <summary>
+            标准分类
+            </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.Value">
-             <summary>
+            <summary>
             费用
-             </summary>
+            </summary>
         </member>
         <member name="P:Performance.EntityModels.his_data.CreateTime">
             <summary>

performance/Performance.Services/Details/SecondAllotDetails.cs

@@ -97,9 +97,9 @@ public SecondResponse GetSecondDetails(int userId, int secondId, int hospitalId,
 
             // 历史保存过的数据
             var savedDataList = agfixatitemRepository.GetEntities(w => w.SecondId == secondAllot.Id);
-            
+
             if (secondAllot.UseTempId != null) tempId = (int)secondAllot.UseTempId;
-            
+
             var header = GetHeadItems(hospitalId, tempId, secondAllot);
 
             var body = GetBodyItems(userId, employeeSource, secondAllot, prevSecondAllot, header, savedDataList);
@@ -135,13 +135,16 @@ public List<HeadItem> GetHeadItems(int hospitalId, int tempId, ag_secondallot se
             //获取工作量、单项奖励列
             if (configHeaders != null && configHeaders.Any())
             {
-                var workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == (int)AgWorkloadType.Workload));
-                workDtos.ForEach(t => { t.Type = (int)TempColumnType.WorkloadColumns; });
-                headItems.AddRange(workDtos);
+                foreach (var workTypeId in configHeaders.Select(t => t.WorkTypeId).Distinct())
+                {
+                    var workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == workTypeId));
+                    int type = workTypeId == (int)AgWorkloadType.SingleAwards
+                        ? (int)TempColumnType.SingleAwardsColumns
+                        : (int)TempColumnType.WorkloadColumns;
 
-                workDtos = Mapper.Map<List<HeadItem>>(configHeaders.Where(t => t.WorkTypeId == (int)AgWorkloadType.SingleAwards));
-                workDtos.ForEach(t => { t.Type = (int)TempColumnType.SingleAwardsColumns; });
-                headItems.AddRange(workDtos);
+                    workDtos.ForEach(t => t.Type = type);
+                    headItems.AddRange(workDtos);
+                }
             }
 
             if (headItems != null && headItems.Any())

performance/Performance.Services/ReportGlobalService.cs

+using Performance.EntityModels;
+using Performance.Repository;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.Services
+{
+    public class ReportGlobalService : IAutoInjection
+    {
+        private readonly PerforReportglobalRepository reportglobalRepository;
+
+        public ReportGlobalService(PerforReportglobalRepository reportglobalRepository)
+        {
+            this.reportglobalRepository = reportglobalRepository;
+        }
+
+        public List<report_global> GetReportGlobals(int hospitalId)
+        {
+            var globals = reportglobalRepository.GetEntities(t => t.HospitalID == hospitalId);
+            return globals;
+        }
+    }
+}