ljx před 4 roky
rodič
revize
6b984ea2c8

+ 1 - 1
src/main/java/com/imed/costaccount/common/enums/ResultCodeEnum.java

@@ -22,7 +22,7 @@ public enum  ResultCodeEnum {
     TOKEN_EXPIRED(410, "访问令牌已过期", "Token Expired"),
     USER_NOT_FOUND(411, "用户不存在"),
     USERPASSWORD_NOT_BLANK(412, "用户名密码不正确"),
-    HOSPITAL_NOT_FOUND(413, "医院不存在"),
+    HOSPITAL_NOT_FOUND(413, "医院不存在,请检查链接"),
     USER_NOT_SYS(414, "用户没有系统权限"),
     USER_ADD_EXCEPTION(422,"当创建一个对象时,发生一个验证错误"),
     SERVER_ERROR(500,"服务器异常"),

+ 2 - 3
src/main/java/com/imed/costaccount/web/CostDepartmentProfitController.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 
 
@@ -53,10 +52,10 @@ public class CostDepartmentProfitController {
      */
     @ApiOperation("科室损益计算输出")
     @PostMapping("/getDepartProfitReport")
-    public Result getDepartProfitReport(@RequestParam String date,@RequestParam Integer reportType, HttpServletResponse response) {
+    public Result getDepartProfitReport(@RequestParam String date,@RequestParam Integer reportType) {
         try {
             Long hospId = UserContext.getHospId();
-            costDepartmentProfitService.getDepartProfitReport(date,hospId,response,reportType);
+            costDepartmentProfitService.getDepartProfitReport(date,hospId,reportType);
         } catch (Exception e) {
             throw new CostException(500,"生成错误");
         }

+ 2 - 4
src/main/java/com/imed/costaccount/web/HospProfitAndLossController.java

@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-
 @Api(tags = "全院损益相关")
 @RestController
 @RequestMapping("/costAccount/hospProfitAndLoss")
@@ -42,9 +40,9 @@ public class HospProfitAndLossController extends AbstractController {
 
     @ApiOperation("全院损益计算输出")
     @PostMapping("/report")
-    public Result hospProfitReport(@RequestParam String date, HttpServletResponse response) {
+    public Result hospProfitReport(@RequestParam String date) {
         try {
-            hospProfitAndLossService.hospProfitReport(date,getHospId(),response);
+            hospProfitAndLossService.hospProfitReport(date,getHospId());
         } catch (Exception e) {
             throw new CostException(500,"生成错误");
         }