新增报表中增加年月过滤条件

performance/Performance.Api/Controllers/ReportController.cs

@@ -156,7 +156,7 @@ public ApiResponse IndexReport([CustomizeValidator(RuleSet = "Index"), FromBody]
         [HttpPost]
         public ApiResponse MenuReport([CustomizeValidator(RuleSet = "Menu"), FromBody]ReportRequest request)
         {
-            var list = reportService.MenuReport(request.HospitalId, request.OnlyYear, request.Source);
+            var list = reportService.MenuReport(request);
             return new ApiResponse(ResponseType.OK, "", list);
         }
     }

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

@@ -1458,6 +1458,12 @@
         <member name="P:Performance.DtoModels.ReportRequest.Source">
             <summary> 报表名称 </summary>
         </member>
+        <member name="P:Performance.DtoModels.ReportRequest.Year">
+            <summary> 年 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ReportRequest.Month">
+            <summary> 月 </summary>
+        </member>
         <member name="T:Performance.DtoModels.SetDepartmentRequest">
             <summary>
             登录请求

performance/Performance.DtoModels/Request/ReportRequest.cs

@@ -17,6 +17,12 @@ public class ReportRequest
 
         /// <summary> 报表名称 </summary>
         public string Source { get; set; }
+
+        /// <summary> 年 </summary>
+        public string Year { get; set; }
+
+        /// <summary> 月 </summary>
+        public string Month { get; set; }
     }
     public class ReportRequestValidator : AbstractValidator<ReportRequest>
     {

performance/Performance.Services/ReportService.cs

@@ -280,37 +280,37 @@ public List<PerReport> IndexReport(int hospitalId, string source)
         /// </summary>
         /// <param name="hospitalId"></param>
         /// <returns></returns>
-        public List<PerReport> MenuReport(int hospitalId, int isOnlyYear, string source)
+        public List<PerReport> MenuReport(ReportRequest request)
         {
             var report = new List<PerReport>();
-            switch (source)
+            switch (request.Source)
             {
                 case "业务总收入":
-                    report = perforReportRepository.GeneralIncome(hospitalId, isOnlyYear);
+                    report = perforReportRepository.GeneralIncome(request);
                     break;
                 case "门诊住院业务收入占比":
-                    report = perforReportRepository.InHosIncome(hospitalId, isOnlyYear);
+                    report = perforReportRepository.InHosIncome(request);
                     break;
                 case "业务收入结构占比":
-                    report = perforReportRepository.StructRatio(hospitalId, isOnlyYear);
+                    report = perforReportRepository.StructRatio(request);
                     break;
                 case "药占比":
-                    report = perforReportRepository.DrugRatio(hospitalId, isOnlyYear);
+                    report = perforReportRepository.DrugRatio(request);
                     break;
                 case "材料占比":
-                    report = perforReportRepository.MaterialRatio(hospitalId, isOnlyYear);
+                    report = perforReportRepository.MaterialRatio(request);
                     break;
                 case "绩效发放金额占全院收入占比":
-                    report = perforReportRepository.PerforRatio(hospitalId, isOnlyYear);
+                    report = perforReportRepository.PerforRatio(request);
                     break;
                 case "绩效群体收入":
-                    report = perforReportRepository.PerforGroup(hospitalId, isOnlyYear);
+                    report = perforReportRepository.PerforGroup(request);
                     break;
                 case "医生核算单元人均绩效":
-                    report = perforReportRepository.DoctorAvg(hospitalId, isOnlyYear);
+                    report = perforReportRepository.DoctorAvg(request);
                     break;
                 case "护理核算单元人均绩效":
-                    report = perforReportRepository.NurseAvg(hospitalId, isOnlyYear);
+                    report = perforReportRepository.NurseAvg(request);
                     break;
             }