调整全院损益计算接口

src/main/java/com/kcim/service/impl/HospProfitAndLossServiceImpl.java

@@ -192,6 +192,7 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
      * @param reportType 报表类型
      */
     @Override
+    @Transactional(rollbackFor = Throwable.class, propagation = Propagation.REQUIRED)
     public void calcHospProfit(String date, Long hospId, Integer reportType) {
         List<Responsibility> leafResp = responsibilityService.getLeafResp(hospId);
         DateTime parse = DateUtil.parse(date);
@@ -1317,7 +1318,6 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
      * @param hospId
      */
     @Override
-    @Transactional(rollbackFor = Throwable.class, propagation = Propagation.REQUIRED)
     public void calcByResponsibility(String date, Long hospId) {
         calcHospProfit(date,hospId,ReportTypeEnum.HOSP_PROFIT_LOSS.getType());
     }

src/main/java/com/kcim/web/HospProfitAndLossController.java

@@ -7,6 +7,7 @@ import com.kcim.service.HospProfitAndLossService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "全院损益相关")
@@ -20,20 +21,15 @@ public class HospProfitAndLossController extends AbstractController {
         this.hospProfitAndLossService = hospProfitAndLossService;
     }
 
-
-    @ApiOperation("计算全院损益")
-    @PostMapping("/calc")
-    public Result calc(@RequestParam @ApiParam(name = "date", value = "yyyy-MM-dd") String date) {
-//        hospProfitAndLossService.calc(date, getHospId());
-        hospProfitAndLossService.calcByResponsibility(date, getHospId());
-        return Result.ok();
-    }
-
     @ApiOperation("计算指定类型报表的全院损益")
-    @PostMapping("/calcHospProfit")
-    public Result calcHospProfit(@RequestParam @ApiParam(name = "date", value = "yyyy-MM-dd") String date,@RequestParam Integer reportType) {
-//        hospProfitAndLossService.calc(date, getHospId());
-        hospProfitAndLossService.calcHospProfit(date, getHospId(),reportType);
+    @PostMapping("/calc")
+    public Result calcHospProfit(@RequestParam @ApiParam(name = "date", value = "yyyy-MM-dd") String date,
+                                 @RequestParam(name = "reportType",required = false) Integer reportType) {
+        if(ObjectUtils.isEmpty(reportType)){
+            hospProfitAndLossService.calcByResponsibility(date, getHospId());
+        }else{
+            hospProfitAndLossService.calcHospProfit(date, getHospId(),reportType);
+        }
         return Result.ok();
     }