Merge branch '科室分配' into 单元格修改

# Conflicts:
#	performance/Performance.EntityModels/Entity/im_data.cs
#	performance/Performance.EntityModels/Entity/im_employee.cs
#	performance/Performance.EntityModels/Entity/im_employee_clinic.cs
#	performance/Performance.EntityModels/Entity/im_header.cs
#	performance/Performance.EntityModels/Entity/im_specialunit.cs

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -54,6 +54,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<cof_again> cof_again { get; set; }
 		/// <summary> 上传excel文件校验配置 </summary>
         public virtual DbSet<cof_check> cof_check { get; set; }
+		/// <summary> 科室类型 </summary>
+        public virtual DbSet<cof_depttype> cof_depttype { get; set; }
 		/// <summary> 规模绩效、效率绩效计算系数配置 </summary>
         public virtual DbSet<cof_director> cof_director { get; set; }
 		/// <summary> 工作量门诊药占比系数 </summary>

performance/Performance.EntityModels/Entity/cof_depttype.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cof_depttype.cs">
+// * FileName: 科室类型.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 科室类型
+    /// </summary>
+    [Table("cof_depttype")]
+	public class cof_depttype
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int ID { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> AllotID { get; set; }
+    
+        /// <summary>
+        /// 科室
+        /// </summary>
+        public string Charge { get; set; }
+    
+        /// <summary>
+        /// 可是分类
+        /// </summary>
+        public string ChargeType { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -205,5 +205,15 @@ public class im_accountbasic
         /// 工作量倾斜系数
         /// </summary>
         public Nullable<decimal> WorkSlopeFactor { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> UpdateDate { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_data.cs

@@ -95,9 +95,15 @@ public class im_data
         /// 
         /// </summary>
         public string SignID { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_employee.cs

@@ -125,9 +125,15 @@ public class im_employee
         /// 发放系数
         /// </summary>
         public Nullable<decimal> Grant { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -130,9 +130,15 @@ public class im_employee_clinic
         /// 发放系数
         /// </summary>
         public Nullable<decimal> Grant { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_header.cs

@@ -75,9 +75,15 @@ public class im_header
         /// 1 汇总  2原始数据
         /// </summary>
         public Nullable<int> IsTotal { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_specialunit.cs

@@ -80,9 +80,15 @@ public class im_specialunit
         /// 调节系数
         /// </summary>
         public Nullable<decimal> Adjust { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<DateTime> UpdateDate { get; set; }
-
+    
+        /// <summary>
+        /// 
+        /// </summary>
         public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_allot.cs

@@ -80,7 +80,7 @@ public class per_allot
         /// 是否在抽取数据0 否、1 是、2 抽取成功、3 抽取失败
         /// </summary>
         public Nullable<int> IsExtracting { get; set; }
-
+    
         /// <summary>
         /// 1、人事科提交重新生成
         /// </summary>

performance/Performance.EntityModels/Entity/sys_hospital.cs

@@ -80,7 +80,7 @@ public class sys_hospital
         /// 是否开启规模/效率绩效 1 启用 2 禁用
         /// </summary>
         public Nullable<int> IsOpenDirector { get; set; }
-
+    
         /// <summary>
         /// 是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
         /// </summary>

performance/Performance.Repository/Repository/PerforCofdepttypeRepository.cs

+//-----------------------------------------------------------------------
+// <copyright file=" cof_depttype.cs">
+// * FileName: cof_depttype.cs
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using Performance.EntityModels;
+
+namespace Performance.Repository
+{
+    /// <summary>
+    /// cof_depttype Repository
+    /// </summary>
+    public partial class PerforCofdepttypeRepository : PerforRepository<cof_depttype>
+    {
+		public PerforCofdepttypeRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+    }
+}

performance/Performance.Services/ConfigService.cs

@@ -26,6 +26,7 @@ public class ConfigService : IAutoInjection
         private PerforHospitalRepository perforHospitalRepository;
         private PerforPersheetRepository perforPersheetRepository;
         private PerforImheaderRepository perforImheaderRepository;
+        private PerforCofdepttypeRepository perforCofdepttypeRepository;
         //private PerforLogdbugRepository logdbug;
         private readonly LogManageService logManageService;
         public ConfigService(PerforCofdirectorRepository cofdirectorRepository,
@@ -40,6 +41,7 @@ public class ConfigService : IAutoInjection
             PerforCofworkitemRepository workitemRepository,
             PerforPersheetRepository perforPersheetRepository,
             PerforImheaderRepository perforImheaderRepository,
+            PerforCofdepttypeRepository perforCofdepttypeRepository,
             //PerforLogdbugRepository logdbug
             LogManageService logManageService)
         {
@@ -55,6 +57,7 @@ public class ConfigService : IAutoInjection
             this.perforHospitalRepository = perforHospitalRepository;
             this.perforPersheetRepository = perforPersheetRepository;
             this.perforImheaderRepository = perforImheaderRepository;
+            this.perforCofdepttypeRepository = perforCofdepttypeRepository;
             //this.logdbug = logdbug;
             this.logManageService = logManageService;
         }
@@ -416,6 +419,69 @@ public bool WorkItemkDelete(WorkItemRequest request)
         }
         #endregion
 
+        #region cof_depttype  科室别配置
+        /// <summary>
+        /// 获取cof_drugprop列表
+        /// </summary>
+        /// <returns></returns>
+        public List<cof_depttype> GetDepttypeList(int allotId)
+        {
+            var list = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allotId);
+            return list;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public cof_depttype DepttypeInsert(DrugpropRequest request)
+        {
+            var entity = new cof_depttype
+            {
+                AllotID = request.AllotID,
+                Charge = request.Charge,
+                ChargeType = request.ChargeType
+            };
+            if (!perforCofdepttypeRepository.Add(entity))
+                throw new PerformanceException("保存失败");
+            return entity;
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public cof_depttype DepttypeUpdate(DrugpropRequest request)
+        {
+            var entity = perforCofdepttypeRepository.GetEntity(t => t.ID == request.ID);
+            if (null == entity)
+                throw new PerformanceException($"ID不存在 ：{request.ID}");
+
+            entity.Charge = request.Charge;
+            entity.ChargeType = request.ChargeType;
+
+            if (!perforCofdepttypeRepository.Update(entity))
+                throw new PerformanceException("保存失败");
+            return entity;
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public bool DepttypeDelete(DrugpropRequest request)
+        {
+            var entity = perforCofdepttypeRepository.GetEntity(t => t.ID == request.ID);
+            if (null == entity)
+                throw new PerformanceException($"ID不存在 ：{request.ID}");
+
+            return perforCofdepttypeRepository.Remove(entity);
+        }
+        #endregion
+
         #region Copy
         /// <summary>
         /// 复制报表基础配置
@@ -480,6 +546,15 @@ public void Copy(per_allot allot)
                 _drugtypeRepository.AddRange(newAgains.ToArray());
             }
 
+            var cofDepttype = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allot.ID);
+            if (cofDepttype == null || cofDepttype.Count == 0)
+            {
+                var depttype = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allotId) 
+                    ?? perforCofdepttypeRepository.GetEntities(t => t.AllotID == -1);
+                var newAgains = depttype.Select(t => new cof_depttype { AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
+                perforCofdepttypeRepository.AddRange(newAgains.ToArray());
+            }
+
             var workItem = _workitemRepository.GetEntities(t => t.AllotID == allot.ID);
             if (hospital != null && hospital?.IsOpenDrugprop == 1 && (workItem == null || workItem.Count == 0))
             {

performance/Performance.Services/SecondAllotService.cs

@@ -441,7 +441,7 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
             if (workitem == null || !workitem.Any(t => t.Id > 0))
                 return;
 
-            var deptHeader = perforAgworkloadtypeRepository.GetEntities(t => request.HospitalId == t.HospitalId);
+            var deptHeader = perforAgworkloadtypeRepository.GetEntities(t => new List<int> { request.HospitalId, 0 }.Contains(t.HospitalId));
             if (deptHeader == null || !deptHeader.Any())
                 return;
 
@@ -489,6 +489,14 @@ private void SupplyHeaderByWorkItem(UseTempRequest request, SecondResponse resul
                 }
             }
 
+            var defauleHeader = deptHeader.Where(t => t.HospitalId == 0).ToList();
+            defauleHeader.Add(new ag_workload_type { Id = 2, TypeName = "工作量分配绩效金额" });
+            foreach (var item in defauleHeader)
+            {
+                result.HeadItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t => t.WorkType = item.Id);
+                result.BodyItems.Where(t => t.FiledName == item.TypeName).ToList()?.ForEach(t => t.WorkType = item.Id);
+            }
+
             var rownumber = result.BodyItems.Any(t => t.RowNumber == -1) ? -1 : 0;
             foreach (var item in headerItems)
             {