Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java

@@ -7,6 +7,8 @@
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.ProductOrderService;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.mapper.SysHospitalMapper;
import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
@@ -42,6 +44,8 @@
    private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
    @Autowired
    private SysOrganizationMapper sysOrganizationMapper;
    @Autowired
    private ProductOrderService productOrderService;
    /**
     * 列表
     * @param params
@@ -67,6 +71,15 @@
            return PageResult.<HospitalListVo>builder().data(null).code(0).count(page.getTotal()).build();
        }
        List<HospitalListVo> list  =  baseMapper.findHospitalList(page, params);
        for (HospitalListVo hospitalListVo : list) {
            ProductOrder productOrder = new ProductOrder();
            productOrder.setHospitalId(hospitalListVo.getHospitalId());
            productOrder.setDepartmentId(hospitalListVo.getDepartmentId());
            ResultBody status = productOrderService.getStatus(productOrder);
            if (status.getCode()==0) {
                hospitalListVo.setOrderType(status.getData() instanceof Boolean ? ((Boolean) status.getData()) : null);
            }
        }
        return PageResult.<HospitalListVo>builder().data(list).code(0).count(page.getTotal()).build();
    }