报表

performance/Performance.Api/Controllers/ReportController.cs

@@ -224,11 +224,30 @@ public ApiResponse MenuReport([CustomizeValidator(RuleSet = "Menu"), FromBody] R
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        [Route("table")]
+        [Route("table/normal")]
         [HttpPost]
-        public ApiResponse Table([FromBody] ConditionRequest request)
+        public ApiResponse TableNormal([FromBody] ConditionRequest request)
         {
-            var list = reportService.Table(request);
+            if (request == null)
+                return new ApiResponse(ResponseType.OK, "", new TableData());
+
+            var list = reportService.TableNormal(request);
+            return new ApiResponse(ResponseType.OK, "", list);
+        }
+
+        /// <summary>
+        /// 科室绩效对比
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("table/special")]
+        [HttpPost]
+        public ApiResponse TableSpecial([FromBody] ConditionRequest request)
+        {
+            if (request == null)
+                return new ApiResponse(ResponseType.OK, "", new TableData());
+
+            var list = reportService.TableSpecial(request);
             return new ApiResponse(ResponseType.OK, "", list);
         }
     }

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

@@ -1455,6 +1455,20 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ReportController.TableNormal(Performance.DtoModels.ConditionRequest)">
+            <summary>
+            绩效汇报表
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ReportController.TableSpecial(Performance.DtoModels.ConditionRequest)">
+            <summary>
+            科室绩效对比
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ReportGlobalController.GetAllReportGlobal(System.Int32)">
             <summary>
             获取报表配置信息

performance/Performance.DtoModels/Request/ConditionRequest.cs

@@ -6,6 +6,12 @@ namespace Performance.DtoModels
 {
     public class ConditionRequest
     {
+        public int HospitalId { get; set; }
+
+        public int GroupId { get; set; }
+
+        public int ReportId { get; set; }
+
         public int[] Year { get; set; }
 
         public int[] Month { get; set; }
@@ -15,22 +21,31 @@ public class ConditionRequest
         public string[] UnitType { get; set; }
     }
 
+    public class Condition
+    {
+        public int Year { get; set; }
+
+        public int Month { get; set; }
+
+        public string AccountingUnit { get; set; }
+
+        public string UnitType { get; set; }
+    }
+
     public class TableData
     {
-        public List<Header> Headers { get; set; }
+        public List<Column> Columns { get; set; }
 
         public string Data { get; set; }
     }
 
-    public class Header
+    public class Column
     {
-        public string Date { get; set; }
+        public string Label { get; set; }
 
-        public string AccountingUnit { get; set; }
+        public string Prop { get; set; }
 
-        public string UnitType { get; set; }
-
-        public string Field { get; set; }
+        public List<Column> Children { get; set; }
     }
 
     public class QueryData
@@ -51,6 +66,29 @@ public class QueryData
 
         public string ItemName { get; set; }
 
-        public Nullable<decimal> Value { get; set; }
+        public decimal? Value { get; set; }
+
+        public List<QueryData> Children { get; set; }
+    }
+
+    public class QueryResult
+    {
+        public string Fixed1 { get; set; }
+
+        public string Fixed2 { get; set; }
+
+        public string Fixed3 { get; set; }
+
+        public string Fixed4 { get; set; }
+
+        public string Fixed5 { get; set; }
+
+        public string Column1 { get; set; }
+
+        public string Column2 { get; set; }
+
+        public string Column3 { get; set; }
+
+        public decimal? Value { get; set; }
     }
 }