更新实体

performance/Performance.Api/Performance.Api.csproj

@@ -45,7 +45,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.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />
     <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.EntityModels/Context/PerformanceDbContext.cs

@@ -100,20 +100,26 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<per_againallot> per_againallot { get; set; }
 		/// <summary> 医院绩效分配 </summary>
         public virtual DbSet<per_allot> per_allot { get; set; }
+		/// <summary> 预算管理金额 </summary>
+        public virtual DbSet<per_budget_amount> per_budget_amount { get; set; }
+		/// <summary> 预算管理占比 </summary>
+        public virtual DbSet<per_budget_ratio> per_budget_ratio { get; set; }
+		/// <summary> 预算控制年度合计 </summary>
+        public virtual DbSet<per_budget_result> per_budget_result { get; set; }
 		/// <summary> 首次上传文件地址（当医院存在标准库时，首次上传用户提交固定格式的excel，开发人员配置SQL脚本） </summary>
         public virtual DbSet<per_first> per_first { get; set; }
 		/// <summary> 上传数据解析 </summary>
         public virtual DbSet<per_sheet> per_sheet { get; set; }
-        /// <summary> 报表配置表 </summary>
-        public virtual DbSet<rep_report> rep_report { get; set; }
 		/// <summary>  </summary>
         public virtual DbSet<rep_group> rep_group { get; set; }
 		/// <summary>  </summary>
         public virtual DbSet<rep_group_selection> rep_group_selection { get; set; }
-        /// <summary> 条件表 </summary>
-        public virtual DbSet<rep_selection> rep_selection { get; set; }
 		/// <summary> 导入报表SQL配置 </summary>
         public virtual DbSet<rep_importconfig> rep_importconfig { get; set; }
+		/// <summary> 报表配置表 </summary>
+        public virtual DbSet<rep_report> rep_report { get; set; }
+		/// <summary> 条件表 </summary>
+        public virtual DbSet<rep_selection> rep_selection { get; set; }
 		/// <summary> 科室核算结果 </summary>
         public virtual DbSet<res_account> res_account { get; set; }
 		/// <summary> 医生科室核算结果 </summary>

performance/Performance.EntityModels/Entity/per_allot.cs

@@ -62,7 +62,7 @@ public class per_allot
         public Nullable<DateTime> UploadDate { get; set; }
     
         /// <summary>
-        /// 0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过 4 数据错误 5 正在生成绩效 6 绩效结果解析成功 7 绩效解析失败 8 归档 9 等待生成
+        /// 0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过 4 数据错误 5 正在生成绩效 6 下发绩效 7 绩效解析失败 8 归档 9 等待生成 10 绩效结果解析成功
         /// </summary>
         public int States { get; set; }
     

performance/Performance.EntityModels/Entity/per_budget_amount.cs

+//-----------------------------------------------------------------------
+// <copyright file=" per_budget_amount.cs">
+// * FileName: 预算管理金额.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 预算管理金额
+    /// </summary>
+    [Table("per_budget_amount")]
+	public class per_budget_amount
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 医院业务收入(万)
+        /// </summary>
+        public Nullable<decimal> HospitalRevenue { get; set; }
+    
+        /// <summary>
+        /// 人力总成本（万）
+        /// </summary>
+        public Nullable<decimal> TotalLaborCost { get; set; }
+    
+        /// <summary>
+        /// 人员支出固定部分（万）
+        /// </summary>
+        public Nullable<decimal> StaffSpendingFixed { get; set; }
+    
+        /// <summary>
+        /// 人员支出浮动部分（奖金）
+        /// </summary>
+        public Nullable<decimal> StaffSpendingBonus { get; set; }
+    
+        /// <summary>
+        /// 绩效工资合计
+        /// </summary>
+        public Nullable<decimal> TotalMeritPay { get; set; }
+    
+        /// <summary>
+        /// 人员数
+        /// </summary>
+        public Nullable<decimal> AmountOfStaff { get; set; }
+    
+        /// <summary>
+        /// 原人均月绩效（元）
+        /// </summary>
+        public Nullable<decimal> ThePerCapitaMerit { get; set; }
+    
+        /// <summary>
+        /// 增量后人均绩效（元）
+        /// </summary>
+        public Nullable<decimal> TheIncrementCapita { get; set; }
+    
+        /// <summary>
+        /// 药品收入（万）
+        /// </summary>
+        public Nullable<decimal> TheDrugIncome { get; set; }
+    
+        /// <summary>
+        /// 材料支出（万）
+        /// </summary>
+        public Nullable<decimal> MaterialIncome { get; set; }
+    
+        /// <summary>
+        /// 药品+材料+人支（万）
+        /// </summary>
+        public Nullable<decimal> TheCostInTotal { get; set; }
+    
+        /// <summary>
+        /// 固定资产折旧费（万）
+        /// </summary>
+        public Nullable<decimal> DepreOfFixedAssets { get; set; }
+    
+        /// <summary>
+        /// 无形资产摊销费（万）
+        /// </summary>
+        public Nullable<decimal> AmortOfIntangibleAssets { get; set; }
+    
+        /// <summary>
+        /// 提取医疗风险基金（万）
+        /// </summary>
+        public Nullable<decimal> MedicalRisk { get; set; }
+    
+        /// <summary>
+        /// 其他费用（万）
+        /// </summary>
+        public Nullable<decimal> OtherExpenses { get; set; }
+    
+        /// <summary>
+        /// 收支结余（%）
+        /// </summary>
+        public Nullable<decimal> BalanceOfPayments { get; set; }
+    
+        /// <summary>
+        /// 财政补贴
+        /// </summary>
+        public Nullable<decimal> FiscalSubsidies { get; set; }
+    
+        /// <summary>
+        /// 医院总收支结余
+        /// </summary>
+        public Nullable<decimal> TheTotalHospitalBalance { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> CreateUser { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/per_budget_ratio.cs

+//-----------------------------------------------------------------------
+// <copyright file=" per_budget_ratio.cs">
+// * FileName: 预算管理占比.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 预算管理占比
+    /// </summary>
+    [Table("per_budget_ratio")]
+	public class per_budget_ratio
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 医院业务收入预算比例
+        /// </summary>
+        public Nullable<decimal> HospitalRevenue { get; set; }
+    
+        /// <summary>
+        /// 人力总成本占比
+        /// </summary>
+        public Nullable<decimal> TotalLaborCost { get; set; }
+    
+        /// <summary>
+        /// 人员支出固定部分占比
+        /// </summary>
+        public Nullable<decimal> StaffSpendingFixed { get; set; }
+    
+        /// <summary>
+        /// 人员支出浮动部分占比
+        /// </summary>
+        public Nullable<decimal> StaffSpendingBonus { get; set; }
+    
+        /// <summary>
+        /// 绩效工资增量预算比例
+        /// </summary>
+        public Nullable<decimal> MeritPayIncrement { get; set; }
+    
+        /// <summary>
+        /// 绩效工资合计
+        /// </summary>
+        public Nullable<decimal> TotalMeritPay { get; set; }
+    
+        /// <summary>
+        /// 增长幅度
+        /// </summary>
+        public Nullable<decimal> Amplification { get; set; }
+    
+        /// <summary>
+        /// 增量后绩效工资人员经费比例
+        /// </summary>
+        public Nullable<decimal> IncrementCapitaRatio { get; set; }
+    
+        /// <summary>
+        /// 药品收入占比
+        /// </summary>
+        public Nullable<decimal> TheDrugIncome { get; set; }
+    
+        /// <summary>
+        /// 药品收入预算比例
+        /// </summary>
+        public Nullable<decimal> TheDrugIncomeBudget { get; set; }
+    
+        /// <summary>
+        /// 材料支出占比
+        /// </summary>
+        public Nullable<decimal> MaterialIncome { get; set; }
+    
+        /// <summary>
+        /// 材料支出预算比例
+        /// </summary>
+        public Nullable<decimal> MaterialIncomeBudget { get; set; }
+    
+        /// <summary>
+        /// 药品+材料+人支占比
+        /// </summary>
+        public Nullable<decimal> TheCostInTotal { get; set; }
+    
+        /// <summary>
+        /// 固定资产折旧费占比
+        /// </summary>
+        public Nullable<decimal> DepreOfFixedAssets { get; set; }
+    
+        /// <summary>
+        /// 无形资产摊销费占比
+        /// </summary>
+        public Nullable<decimal> AmortOfIntangibleAssets { get; set; }
+    
+        /// <summary>
+        /// 提取医疗风险基金占比
+        /// </summary>
+        public Nullable<decimal> MedicalRisk { get; set; }
+    
+        /// <summary>
+        /// 其他费用占比
+        /// </summary>
+        public Nullable<decimal> OtherExpenses { get; set; }
+    
+        /// <summary>
+        /// 收支结余（%）
+        /// </summary>
+        public Nullable<decimal> BalanceOfPayments { get; set; }
+    
+        /// <summary>
+        /// 医院总收支结余
+        /// </summary>
+        public Nullable<decimal> TheTotalHospitalBalance { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> CreateTime { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> CreateUser { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/per_budget_result.cs

+//-----------------------------------------------------------------------
+// <copyright file=" per_budget_result.cs">
+// * FileName: 预算控制年度合计.cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 预算控制年度合计
+    /// </summary>
+    [Table("per_budget_result")]
+	public class per_budget_result
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Year { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Month { get; set; }
+    
+        /// <summary>
+        /// 绩效可发比例
+        /// </summary>
+        public Nullable<decimal> Grant { get; set; }
+    
+        /// <summary>
+        /// 调节系数
+        /// </summary>
+        public Nullable<decimal> Adjust { get; set; }
+    
+        /// <summary>
+        /// 医疗收入
+        /// </summary>
+        public Nullable<decimal> MedicalIncome { get; set; }
+    
+        /// <summary>
+        /// 人员经费
+        /// </summary>
+        public Nullable<decimal> PersonnelExpenditure { get; set; }
+    
+        /// <summary>
+        /// 新绩效
+        /// </summary>
+        public Nullable<decimal> TheNewPerformance { get; set; }
+    
+        /// <summary>
+        /// 药占比（收入）
+        /// </summary>
+        public Nullable<decimal> MedicineProportion { get; set; }
+    
+        /// <summary>
+        /// 材料支出
+        /// </summary>
+        public Nullable<decimal> MaterialCosts { get; set; }
+    
+        /// <summary>
+        /// 药材比例合计
+        /// </summary>
+        public Nullable<decimal> TotalMedicine { get; set; }
+    
+        /// <summary>
+        /// 固定资产折旧
+        /// </summary>
+        public Nullable<decimal> DepreOfFixedAssets { get; set; }
+    
+        /// <summary>
+        /// 其他
+        /// </summary>
+        public Nullable<decimal> OtherExpenses { get; set; }
+    
+        /// <summary>
+        /// 人+药+材的支出比例
+        /// </summary>
+        public Nullable<decimal> TheCostInTotal { get; set; }
+    
+        /// <summary>
+        /// 成本合计
+        /// </summary>
+        public Nullable<decimal> TheCostCombined { get; set; }
+    
+        /// <summary>
+        /// 人员经费实际比例
+        /// </summary>
+        public Nullable<decimal> PersonExpendRatio { get; set; }
+    
+        /// <summary>
+        /// 新绩效实际比例
+        /// </summary>
+        public Nullable<decimal> NewPerformanceRatio { get; set; }
+    
+        /// <summary>
+        /// 药占比实际比例
+        /// </summary>
+        public Nullable<decimal> MedicinePropRatio { get; set; }
+    
+        /// <summary>
+        /// 材料支出实际比例
+        /// </summary>
+        public Nullable<decimal> MaterialCostsRatio { get; set; }
+    
+        /// <summary>
+        /// 药材合计实际比例
+        /// </summary>
+        public Nullable<decimal> TotalMedicineRatio { get; set; }
+    
+        /// <summary>
+        /// 固定资产折旧实际比例
+        /// </summary>
+        public Nullable<decimal> DepreOfFixedAssetsRatio { get; set; }
+    
+        /// <summary>
+        /// 其他费用实际比例
+        /// </summary>
+        public Nullable<decimal> OtherExpensesRatio { get; set; }
+    
+        /// <summary>
+        /// 人+药+材的支出实际比例
+        /// </summary>
+        public Nullable<decimal> TheCostInTotalRatio { get; set; }
+    
+        /// <summary>
+        /// 成本合计实际比例
+        /// </summary>
+        public Nullable<decimal> TheCostCombinedRatio { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<DateTime> CreateDate { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<int> CreateUser { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/rep_group.cs

@@ -30,5 +30,10 @@ public class rep_group
         /// 报表Id
         /// </summary>
         public Nullable<int> ReportId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GroupName { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/rep_selection.cs

@@ -77,7 +77,7 @@ public class rep_selection
         public string DefaultValue { get; set; }
     
         /// <summary>
-        /// SQL拼接条件
+        /// SQL拼接条件 Equal、Like、In、Not Like、Not In
         /// </summary>
         public string Joint { get; set; }
     

performance/Performance.Repository/Repository/PerforPerbudgetamountRepository.cs

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

performance/Performance.Repository/Repository/PerforPerbudgetratioRepository.cs

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

performance/Performance.Repository/Repository/PerforPerbudgetresultRepository.cs

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