Merge branch 'feature/绩效汇报表' into develop

performance/Performance.Api/Controllers/ReportController.cs

@@ -219,20 +219,51 @@ public ApiResponse MenuReport([CustomizeValidator(RuleSet = "Menu"), FromBody] R
             return new ApiResponse(ResponseType.OK, "", list);
         }
 
-        /// <summary>
         /// 菜单报表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [Route("operation")]
         [HttpPost]
-        public ApiResponse Operation([ FromBody] ReportRequest request)
+        public ApiResponse Operation([FromBody] ReportRequest request)
         {
-            if(request == null)
+            if (request == null)
                 return new ApiResponse(ResponseType.Fail, "参数错误！");
 
             var list = reportService.Operation(request);
             return new ApiResponse(ResponseType.OK, "", list);
         }
+
+        /// <summary>
+        /// 绩效汇报表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("table/normal")]
+        [HttpPost]
+        public ApiResponse TableNormal([FromBody] ConditionRequest 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);
+        }
     }
 }
\ No newline at end of file

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

@@ -1455,9 +1455,17 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ReportController.Operation(Performance.DtoModels.ReportRequest)">
+        <!-- Badly formed XML comment ignored for member "M:Performance.Api.Controllers.ReportController.Operation(Performance.DtoModels.ReportRequest)" -->
+        <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>

performance/Performance.DtoModels/Request/ConditionRequest.cs

+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class ConditionRequest
+    {
+        public int HospitalId { get; set; }
+
+        public int ReportId { get; set; }
+
+        public int[] Year { get; set; }
+
+        public int[] Month { get; set; }
+
+        public string[] AccountingUnit { get; set; }
+
+        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<Column> Columns { get; set; }
+
+        public JArray Data { get; set; }
+    }
+
+    public class Column
+    {
+        public string Label { get; set; }
+
+        public string Prop { get; set; }
+
+        public List<Column> Children { get; set; }
+    }
+
+    public class QueryData
+    {
+        public int HospitalId { get; set; }
+
+        public int Year { get; set; }
+
+        public int Month { get; set; }
+
+        public string AccountingUnit { get; set; }
+
+        public string UnitType { get; set; }
+
+        public string SourceType { get; set; }
+
+        public string Category { get; set; }
+
+        public string ItemName { 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; }
+    }
+}