首页统计

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiHospitalController.java

@@ -38,7 +38,9 @@ public class ApiHospitalController {
     @ApiOperation("查询医院信息列表")
     @GetMapping("/list")
     public R<List<HospitalVo>> list(@ApiParam("经纬度，以逗号隔开") @RequestParam(required = false) String coordinates) {
-        List<HospitalVo> hospitalVoList = iHospitalService.queryList(new HospitalBo());
+        HospitalBo hospitalBo = new HospitalBo();
+        hospitalBo.setRackStatus("0");
+        List<HospitalVo> hospitalVoList = iHospitalService.queryList(hospitalBo);
         if (!StrUtil.isEmpty(coordinates)) {
             // 如果坐标不为空，则计算相对距离
             for (HospitalVo hospitalVo : hospitalVoList) {

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiHospitalDepartmentController.java

@@ -37,7 +37,8 @@ public class ApiHospitalDepartmentController {
     @ApiOperation("获取科室列表")
     @GetMapping("/list")
     public R<List<HospitalDepartmentVo>> list(@Validated(QueryGroup.class) HospitalDepartmentBo bo) {
-        return R.ok(iHospitalDepartmentService.queryByHospitalId(bo.getHospitalId()));
+        bo.setRackStatus("0");
+        return R.ok(iHospitalDepartmentService.queryByHospitalId(bo));
     }
 
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiServiceProductController.java

@@ -40,6 +40,7 @@ public class ApiServiceProductController extends AbstractApiController {
     @ApiOperation("查询服务列表")
     @GetMapping("/list")
     public R<List<ServiceProductVo>> list(@Validated(QueryGroup.class) ServiceProductBo bo) {
+        bo.setStatus(true);
         return R.ok(iServiceProductService.queryList(bo));
     }
 

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/IHospitalDepartmentService.java

@@ -89,7 +89,7 @@ public interface IHospitalDepartmentService {
      * @param hospitalId 医院id
      * @return 医院科室信息集合
      */
-    List<HospitalDepartmentVo> queryByHospitalId(Long hospitalId);
+    List<HospitalDepartmentVo> queryByHospitalId(HospitalDepartmentBo bo);
 
     String queryNameById(Long id);
 }

ruoyi-info/src/main/java/com/ruoyi/info/hospital/service/impl/HospitalDepartmentServiceImpl.java

@@ -203,15 +203,16 @@ public class HospitalDepartmentServiceImpl implements IHospitalDepartmentService
     /**
      * 根据医院id查询科室信息列表
      *
-     * @param hospitalId 医院id
+     * @param bo 医院科室信息
      * @return
      */
     @Override
-    public List<HospitalDepartmentVo> queryByHospitalId(Long hospitalId) {
+    public List<HospitalDepartmentVo> queryByHospitalId(HospitalDepartmentBo bo) {
         // 医院名称不可重复
         LambdaQueryWrapper<HospitalDepartment> lqw = new LambdaQueryWrapper<HospitalDepartment>()
-            .eq(HospitalDepartment::getHospitalId, hospitalId);
-
+            .eq(HospitalDepartment::getHospitalId, bo.getHospitalId());
+        lqw.eq(StringUtils.isNotBlank(bo.getRackStatus()), HospitalDepartment::getRackStatus, bo.getRackStatus());
+        lqw.orderByDesc(HospitalDepartment::getSortOrder).orderByDesc(HospitalDepartment::getId);
         return baseMapper.selectVoList(lqw);
     }
 

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -109,6 +109,7 @@ public class UserServiceImpl implements IUserService {
         lqw.eq(ObjectUtil.isNotNull(bo.getLastLoginTime()), User::getLastLoginTime, bo.getLastLoginTime());
         lqw.ge(ObjectUtil.isNotNull(bo.getCreateDayStart()), User::getCreateTime, bo.getCreateDayStart());
         lqw.le(ObjectUtil.isNotNull(bo.getCreateDayEnd()), User::getCreateTime, bo.getCreateDayEnd());
+        lqw.orderByDesc(User::getCreateTime);
         return lqw;
     }