Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/web/CostDepartmentProfitController.java

@@ -53,7 +53,7 @@ public class CostDepartmentProfitController {
      */
     @ApiOperation("科室损益计算输出")
     @PostMapping("/getDepartProfitReport")
-    public Result getDepartProfitReport(@RequestParam String date, HttpServletResponse response,Integer reportType) {
+    public Result getDepartProfitReport(@RequestParam String date,@RequestParam Integer reportType, HttpServletResponse response) {
         try {
             Long hospId = UserContext.getHospId();
             costDepartmentProfitService.getDepartProfitReport(date,hospId,response,reportType);