添加筛选条件 - 科室

performance/Performance.Api/GraphQLSchema/PerformanceQuery.cs

@@ -5,6 +5,7 @@
 using Performance.Services;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 
 namespace Performance.Api
 {
@@ -34,14 +35,17 @@ public PerformanceQuery(GraphQLService service)
             );
 
             Field<ListGraphType<ChartDataType>>("chartdata",
-                arguments: Arguments(),
+                arguments: Arguments(
+                    new QueryArgument<StringGraphType>() { Name = QueryParams.accountingUnit }
+                ),
                 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);
-                    return service.GetChartData(reportId, parameters);
+                    StringBuilder where = new StringBuilder();
+                    var parameters = GetDynamicParameters(context.Arguments, where, QueryParams.hospitalId, QueryParams.year, QueryParams.month, QueryParams.accountingUnit);
+                    return service.GetChartData(reportId, parameters, where.ToString());
                 }
             );
 
@@ -56,23 +60,9 @@ 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.accountingUnit, QueryParams.category, QueryParams.itemName);
-                    return service.GetReportPerformance(reportId, parameters);
-                }
-            );
-
-            Field<ListGraphType<ReportPerformanceType>>("dictionary",
-                arguments: new QueryArguments(
-                    new QueryArgument<IntGraphType>() { Name = QueryParams.reportId },
-                    new QueryArgument<ListGraphType<StringGraphType>>() { Name = QueryParams.sourceType }
-                ),
-                resolve: context =>
-                {
-                    int reportId = context.Arguments.ContainsKey(QueryParams.reportId)
-                    ? ConvertHelper.To<int>(context.Arguments[QueryParams.reportId])
-                    : 15;
-                    var parameters = GetDynamicParameters(context.Arguments, QueryParams.sourceType);
-                    return service.GetReportPerformance(reportId, parameters);
+                    StringBuilder where = new StringBuilder();
+                    var parameters = GetDynamicParameters(context.Arguments, where, QueryParams.hospitalId, QueryParams.year, QueryParams.month, QueryParams.accountingUnit, QueryParams.category, QueryParams.itemName);
+                    return service.GetReportPerformance(reportId, parameters, where.ToString());
                 }
             );
         }
@@ -98,7 +88,7 @@ public static QueryArguments Arguments(params QueryArgument[] args)
             return basic;
         }
 
-        public DynamicParameters GetDynamicParameters(Dictionary<string, object> arguments, params string[] fields)
+        public DynamicParameters GetDynamicParameters(Dictionary<string, object> arguments, StringBuilder builder, params string[] fields)
         {
             DynamicParameters parameters = new DynamicParameters();
             if (arguments == null || !arguments.Any()) return parameters;
@@ -109,6 +99,7 @@ public DynamicParameters GetDynamicParameters(Dictionary<string, object> argumen
                     if (arguments.ContainsKey(item))
                     {
                         parameters.Add(item.ToLower(), arguments[item]);
+                        builder.Append($" and {item.ToLower()}=@{item.ToLower()} ");
                     }
                 }
             }

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

@@ -1697,6 +1697,16 @@
             Not In
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ReportTable.PersonnelName">
+            <summary>
+            人员信息
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportTable.PersonnelNumber">
+            <summary>
+            人员工号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ReportTable.AccountingUnit">
             <summary>
             核算单元

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -377,7 +377,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 dept.Number = empolyees.Count();
                 dept.AccountingUnit = account.AccountingUnit;
                 dept.UnitType = account.AccountType;
-                dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
+                dept.ScoringAverage = resAccount?.ScoringAverage == null ? 1 : resAccount.ScoringAverage;
                 dept.AdjustFactor = (isBudget ? adjust : resAccount?.AdjustFactor) ?? 1;
                 dept.Income = empolyees.Sum(w => w.PerforTotal ?? 0);
                 //dept.Extra = (extra ?? 0);

performance/Performance.Services/GraphQLService.cs

@@ -52,7 +52,7 @@ public ReportData GetReport(int reportId)
             return new ReportData(report);
         }
 
-        public List<ChartData> GetChartData(int reportId, DynamicParameters parameters)
+        public List<ChartData> GetChartData(int reportId, DynamicParameters parameters, string where = null)
         {
             if (reportId == 0) return new List<ChartData>();
 
@@ -62,6 +62,7 @@ public List<ChartData> GetChartData(int reportId, DynamicParameters parameters)
                 if (report == null || string.IsNullOrEmpty(report.Content)) return new List<ChartData>();
 
                 var sql = report.Content.ToLower();
+                if (!string.IsNullOrEmpty(where)) sql = sql.Replace("{wh}", where);
 
                 var chartData = repreportRepository.DapperQuery<ChartData>(sql, parameters, 60 * 5);
 
@@ -74,7 +75,7 @@ public List<ChartData> GetChartData(int reportId, DynamicParameters parameters)
             }
         }
 
-        public List<ReportTable> GetReportPerformance(int reportId, DynamicParameters parameters)
+        public List<ReportTable> GetReportPerformance(int reportId, DynamicParameters parameters, string where = null)
         {
             if (reportId == 0) return new List<ReportTable>();
 
@@ -84,6 +85,7 @@ public List<ReportTable> GetReportPerformance(int reportId, DynamicParameters pa
                 if (report == null || string.IsNullOrEmpty(report.Content)) return new List<ReportTable>();
 
                 var sql = report.Content.ToLower();
+                if (!string.IsNullOrEmpty(where)) sql = sql.Replace("{wh}", where);
 
                 var chartData = repreportRepository.DapperQuery<ReportTable>(sql, parameters, 60 * 5);