Merge remote-tracking branch 'origin/master'

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

@@ -61,6 +61,16 @@ public class BasicHospTypeController {
         return ResultVOUtils.success(basicHospTypeEntities);
     }
 
+    @PostMapping("/udiwms/basic/hosp/type/menuAllList")
+    public BaseResponse menuAllList(@RequestBody BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.getAllMenuList(basicHospTypeFilterRequest);
+        return ResultVOUtils.success(basicHospTypeEntities);
+    }
+
     @GetMapping("/udiwms/basic/hosp/type/getOneName")
     public BaseResponse getOneName() {
 

src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java

@@ -17,6 +17,8 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
 
     List<BasicHospTypeEntity> getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest);
 
+    List<BasicHospTypeEntity> getAllMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest);
+
     BasicHospTypeEntity selectBasicHospTypeEntity();
 
     Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest);

src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java

@@ -72,6 +72,15 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, Basi
         return data;
     }
 
+    @Override
+    public List<BasicHospTypeEntity> getAllMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) {
+
+        QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
+        ew.ne("code", 10000);
+        List<BasicHospTypeEntity> data = basicHospTypeDao.selectList(ew);
+        return data;
+    }
+
     @Override
     public BasicHospTypeEntity selectBasicHospTypeEntity() {
         QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();