Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -216,7 +216,7 @@ public class BasicBussinessTypeController extends BaseController {
             } else {
                 result.addAll(bussinessTypeEntities);
             }
-            System.out.println("result:"+result.toArray());
+            System.out.println("result:" + result.toArray());
 
             PageInfo<BasicBussinessTypeEntity> pageInfo;
             pageInfo = new PageInfo<>(result);
@@ -229,6 +229,9 @@ public class BasicBussinessTypeController extends BaseController {
             List<BasicBussinessTypeResponse> bussinessTypeEntities;
             //判断是否是医院用户
             if (isHosUser()) {
+                if (bussinessTypeFilterRequest.getSpUse() == null) {
+                    bussinessTypeFilterRequest.setSpUse(3);
+                }
                 bussinessTypeFilterRequest.setUserId(getUserId());
                 bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                         bussinessTypeFilterRequest);