修改实体内容

performance/Performance.Api/GraphQLSchema/PerformanceQuery.cs

@@ -40,19 +40,22 @@ public PerformanceQuery(GraphQLService service)
                     int reportId = context.Arguments.ContainsKey(QueryParams.reportId)
                     ? ConvertHelper.To<int>(context.Arguments[QueryParams.reportId])
                     : 0;
-                    var parameters = GetDynamicParameters(context.Arguments, QueryParams.hospitalId, QueryParams.year, QueryParams.month, QueryParams.itemName);
+                    var parameters = GetDynamicParameters(context.Arguments, QueryParams.hospitalId, QueryParams.year, QueryParams.month);
                     return service.GetChartData(reportId, parameters);
                 }
             );
 
             Field<ListGraphType<ReportPerformanceType>>("performances",
-                arguments: Arguments(new QueryArgument<StringGraphType>() { Name = QueryParams.itemName }),
+                arguments: Arguments(
+                    new QueryArgument<StringGraphType>() { Name = QueryParams.category },
+                    new QueryArgument<StringGraphType>() { Name = QueryParams.itemName }
+                ),
                 resolve: context =>
                 {
                     int reportId = context.Arguments.ContainsKey(QueryParams.reportId)
                     ? ConvertHelper.To<int>(context.Arguments[QueryParams.reportId])
                     : 0;
-                    var parameters = GetDynamicParameters(context.Arguments, QueryParams.hospitalId, QueryParams.year, QueryParams.month);
+                    var parameters = GetDynamicParameters(context.Arguments, QueryParams.hospitalId, QueryParams.year, QueryParams.month, QueryParams.category, QueryParams.itemName);
                     return service.GetReportPerformance(reportId, parameters);
                 }
             );
@@ -89,7 +92,10 @@ public DynamicParameters GetDynamicParameters(Dictionary<string, object> argumen
                 {
                     if (arguments.ContainsKey(item))
                     {
-                        parameters.Add(item.ToLower(), arguments[item]);
+                        if (item == QueryParams.category)
+                            parameters.Add(item.ToLower(), arguments[item]?.ToString().Split(','));
+                        else
+                            parameters.Add(item.ToLower(), arguments[item]);
                     }
                 }
             }

performance/Performance.Api/GraphQLSchema/ReportDataType.cs

@@ -7,12 +7,14 @@ namespace Performance.Api
 {
     public class ReportDataType : ObjectGraphType<ReportData>
     {
-        public ReportDataType(GraphQLService service)
+        public ReportDataType()
         {
             Field(x => x.ReportID);
             Field(x => x.ChartType);
             Field(x => x.Sort);
             Field(x => x.Title);
+            Field(x => x.QueryName);
+            Field(x => x.QueryArguments);
             Field(x => x.XTitle);
             Field(x => x.XUnit);
             Field(x => x.YTitle);

performance/Performance.Api/GraphQLSchema/ReportPerformanceType.cs

 using GraphQL.Types;
+using Performance.DtoModels;
 using Performance.EntityModels;
 
 namespace Performance.Api
 {
-    public class ReportPerformanceType : ObjectGraphType<report_performance>
+    public class ReportPerformanceType : ObjectGraphType<ReportTable>
     {
         public ReportPerformanceType()
         {
-            Field(x => x.Id, type: typeof(IdGraphType));
-            Field(x => x.HospitalId);
-            Field(x => x.Year);
-            Field(x => x.Month);
-            Field(x => x.PersonnelName);
-            Field(x => x.PersonnelNumber);
             Field(x => x.AccountingUnit);
-            Field(x => x.Department);
             Field(x => x.Category);
             Field(x => x.ItemName);
             Field(x => x.CurrentValue);
             Field(x => x.LastIssueValue);
             Field(x => x.SamePeriodValue);
             Field(x => x.BudgetValue);
+            Field(x => x.RatioValue);
         }
     }
 }

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

@@ -1517,6 +1517,16 @@
             报表标题
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ReportData.QueryName">
+            <summary>
+            查询方法名称
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportData.QueryArguments">
+            <summary>
+            查询参数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ReportData.XTitle">
             <summary>
             X轴标题
@@ -1687,6 +1697,46 @@
             Not In
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ReportTable.AccountingUnit">
+            <summary>
+            核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.Category">
+            <summary>
+            统计大分类
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.ItemName">
+            <summary>
+            统计小分类
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.CurrentValue">
+            <summary>
+            本期
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.LastIssueValue">
+            <summary>
+            上期
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.SamePeriodValue">
+            <summary>
+            同期
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.BudgetValue">
+            <summary>
+            预算
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.RatioValue">
+            <summary>
+            比率
+            </summary>
+        </member>
         <member name="T:Performance.DtoModels.AgainAllotRequest">
             <summary>
             二次分配请求

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

@@ -4607,19 +4607,19 @@
             </summary>
         </member>
         <member name="P:Performance.EntityModels.rep_report.ID">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.rep_report.ChartType">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.rep_report.Sort">
-            <summary>
+             <summary>
             
-            </summary>
+             </summary>
         </member>
         <member name="P:Performance.EntityModels.rep_report.Content">
             <summary>
@@ -4631,6 +4631,16 @@
             报表标题
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.rep_report.QueryName">
+            <summary>
+            查询方法名称
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.rep_report.QueryArguments">
+            <summary>
+            查询参数
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.rep_report.XTitle">
             <summary>
             X轴标题

performance/Performance.DtoModels/ReportData.cs

@@ -13,6 +13,8 @@ public ReportData(rep_report report)
             ChartType = report.ChartType ?? 0;
             Sort = report.Sort ?? 0;
             Title = report.Title;
+            QueryName = report.QueryName;
+            QueryArguments = report.QueryArguments;
             XTitle = report.XTitle;
             XUnit = report.XUnit;
             YTitle = report.YTitle;
@@ -45,6 +47,16 @@ public ReportData(rep_report report)
         public string Title { get; set; }
 
         /// <summary>
+        /// 查询方法名称
+        /// </summary>
+        public string QueryName { get; set; }
+
+        /// <summary>
+        /// 查询参数
+        /// </summary>
+        public string QueryArguments { get; set; }
+
+        /// <summary>
         /// X轴标题
         /// </summary>
         public string XTitle { get; set; }

performance/Performance.EntityModels/Entity/rep_report.cs

 //-----------------------------------------------------------------------
 // <copyright file=" rep_report.cs">
-// * FileName: 报表配置表.cs 
+// * FileName: 报表配置表.cs
 // </copyright>
 //-----------------------------------------------------------------------
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 报表配置表
     /// </summary>
     [Table("rep_report")]
-	public class rep_report
+    public class rep_report
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         [Key]
-		public int ID { get; set; }
-    
+        public int ID { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public Nullable<int> ChartType { get; set; }
-    
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public Nullable<int> Sort { get; set; }
-    
+
         /// <summary>
         /// sql执行语句（{wh}及{w}为占位符）
         /// </summary>
         public string Content { get; set; }
-    
+
         /// <summary>
         /// 报表标题
         /// </summary>
         public string Title { get; set; }
-    
+
+        /// <summary>
+        /// 查询方法名称
+        /// </summary>
+        public string QueryName { get; set; }
+
+        /// <summary>
+        /// 查询参数
+        /// </summary>
+        public string QueryArguments { get; set; }
+
         /// <summary>
         /// X轴标题
         /// </summary>
         public string XTitle { get; set; }
-    
+
         /// <summary>
         /// X轴单位
         /// </summary>
         public string XUnit { get; set; }
-    
+
         /// <summary>
         /// Y轴标题
         /// </summary>
         public string YTitle { get; set; }
-    
+
         /// <summary>
         /// Y轴单位
         /// </summary>
         public string YUnit { get; set; }
-    
+
         /// <summary>
         /// 值标题
         /// </summary>
         public string VTitle { get; set; }
-    
+
         /// <summary>
         /// 值单位
         /// </summary>
         public string VUnit { get; set; }
-    
+
         /// <summary>
         /// name标题
         /// </summary>
         public string NTitle { get; set; }
-    
+
         /// <summary>
         /// name单位
         /// </summary>
         public string NUnit { get; set; }
-    
+
         /// <summary>
         /// 图表说明
         /// </summary>
         public string Formula { get; set; }
-    
+
         /// <summary>
         /// 1表示需要进行小于百分2的类型进行合并
         /// </summary>
         public Nullable<int> DataType { get; set; }
-    
+
         /// <summary>
         /// 图标value过滤执值
         /// </summary>

performance/Performance.EntityModels/Entity/report_performance.cs

@@ -66,21 +66,21 @@ public class report_performance
         /// <summary>
         /// 本期
         /// </summary>
-        public decimal CurrentValue { get; set; }
+        public Nullable<decimal> CurrentValue { get; set; }
 
         /// <summary>
         /// 上期
         /// </summary>
-        public decimal LastIssueValue { get; set; }
+        public Nullable<decimal> LastIssueValue { get; set; }
 
         /// <summary>
         /// 同期
         /// </summary>
-        public decimal SamePeriodValue { get; set; }
+        public Nullable<decimal> SamePeriodValue { get; set; }
 
         /// <summary>
         /// 预算
         /// </summary>
-        public decimal BudgetValue { get; set; }
+        public Nullable<decimal> BudgetValue { get; set; }
     }
 }

performance/Performance.Services/GraphQLService.cs

@@ -74,25 +74,25 @@ public List<ChartData> GetChartData(int reportId, DynamicParameters parameters)
             }
         }
 
-        public List<report_performance> GetReportPerformance(int reportId, DynamicParameters parameters)
+        public List<ReportTable> GetReportPerformance(int reportId, DynamicParameters parameters)
         {
-            if (reportId == 0) return new List<report_performance>();
+            if (reportId == 0) return new List<ReportTable>();
 
             try
             {
                 var report = repreportRepository.GetEntity(t => t.ID == reportId);
-                if (report == null || string.IsNullOrEmpty(report.Content)) return new List<report_performance>();
+                if (report == null || string.IsNullOrEmpty(report.Content)) return new List<ReportTable>();
 
                 var sql = report.Content.ToLower();
 
-                var chartData = repreportRepository.DapperQuery<report_performance>(sql, parameters, 60 * 5);
+                var chartData = repreportRepository.DapperQuery<ReportTable>(sql, parameters, 60 * 5);
 
-                return chartData != null && chartData.Any() ? chartData.ToList() : new List<report_performance>();
+                return chartData != null && chartData.Any() ? chartData.ToList() : new List<ReportTable>();
             }
             catch (Exception ex)
             {
                 logger.LogError("GetReportPerformance获取报表数据异常: " + ex.ToString());
-                return new List<report_performance>();
+                return new List<ReportTable>();
             }
         }
     }