From 482f58537fa3f0cab93b88c6d0bcb803e0431cfc Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 23 Sep 2020 15:51:08 +0800
Subject: [PATCH] 1.增加后台开通医院/科室的单次支付功能,并自动充入指定套餐 2.新增查询医院科室是否开通单次支付功能的接口 3.新增查询医院科室的支付单价 4.修改扣费业务4个接口,增加支持单次支付的判断与处理 5.增加接口,查看某个诊断的支付状态

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
index ecc3eec..595630a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DataNeedController.java
@@ -14,10 +14,12 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -27,6 +29,7 @@
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
  * @Description: 医生的数据需求
  * @Project: 用户中心
  * @CreateDate: Created in 2020-04-01 09:37:04 <br>
@@ -37,7 +40,7 @@
 @RestController
 @RequestMapping("/dataneed")
 @Api(tags = "医生的数据需求")
-public class DataNeedController  extends BaseController{
+public class DataNeedController extends BaseController {
     @Autowired
     private IDataNeedService dataNeedService;
 
@@ -51,20 +54,31 @@
     })
     @GetMapping
     public PageResult list(@RequestParam Map<String, Object> params) {
-        if(params.size()==0){
-            params.put("page",1);
-            params.put("limit",10);
+        if (params.size() == 0) {
+            params.put("page", 1);
+            params.put("limit", 10);
         }
         return dataNeedService.findList(params);
     }
+
     /**
      * H端列表  需要医院和科室id
      */
     @ApiOperation(value = "H端列表,需要医院和科室id")
     @GetMapping("/hlist")
-    public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true)SysUser sysUser) {
-        return dataNeedService.FindAllByHId(params,sysUser);
+    public ResultBody list(@RequestParam Map<String, Object> params, @LoginUser(isFull = true) SysUser sysUser) {
+        if (params.size() == 0) {
+            params.put("page", 1);
+            params.put("limit", 10);
+        }
+        if(MapUtils.getString(params,"page")==null){
+            params.put("page", 1);
+        }if(MapUtils.getString(params,"limit")==null){
+            params.put("limit", 10);
+        }
+        return dataNeedService.FindAllByHId(params, sysUser);
     }
+
     /**
      * 查询
      */
@@ -74,21 +88,23 @@
         DataNeed model = dataNeedService.getById(id);
         return ResultBody.ok().data(model).msg("查询成功");
     }
+
     /**
-     *更新状态和文件地址
+     * 更新状态和文件地址
      */
     @ApiOperation(value = "更新状态和文件地址")
     @GetMapping("updateEnabled")
-    public ResultBody updateEnabled(@RequestParam Map<String,Object> map) {
+    public ResultBody updateEnabled(@RequestParam Map<String, Object> map) {
         return dataNeedService.updateEnabled(map);
     }
+
     /**
-     *更新使用状态
+     * 更新使用状态
      */
     @ApiOperation(value = "更新使用状态")
     @GetMapping("updateDelete")
-    public ResultBody updateDelete(@RequestParam Long id,@LoginUser(isFull = true) SysUser sysUser) {
-        return dataNeedService.updateDelete(id,sysUser);
+    public ResultBody updateDelete(@RequestParam Long id, @LoginUser(isFull = true) SysUser sysUser) {
+        return dataNeedService.updateDelete(id, sysUser);
     }
 
     /**
@@ -114,7 +130,6 @@
             return ResultBody.ok().data(dataNeed).msg("保存成功");
         }
     }
-
     /**
      * 删除
      */
@@ -124,6 +139,7 @@
         dataNeedService.removeById(id);
         return ResultBody.ok().msg("删除成功");
     }
+
     /**
      * 导出excel
      *

--
Gitblit v1.8.0