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();
    }

@@ -157,30 +170,30 @@
        //科室数据
        SysDepartment sysDepartment=departmentMapper.selectById(departmentId);
        //医院数据
        SysHospital sysHospital = baseMapper.selectById(id);
        if (sysHospital == null) {
            return ResultBody.failed("医院数据不存在！");
        }
        //SysHospital sysHospital = baseMapper.selectById(id);
//        if (sysHospital == null) {
//            return ResultBody.failed("医院数据不存在！");
//        }
        if (sysDepartment == null) {
            return ResultBody.failed("科室数据不存在！");
        }
        //医院下的所有科室数据
        Map<String,Object> columnMap=new HashMap<String,Object>();
        columnMap.put("org_parent_id",sysHospital.getOrgId());
        columnMap.put("is_del",0);
        columnMap.put("enabled",1);
        List<SysOrganization> sysOrganizationList=sysOrganizationMapper.selectByMap(columnMap);
        //如果这个医院下有多个科室，禁用只对当前科室有效，否则也要禁用医院
        if(sysOrganizationList.size()==1)
        {
            sysHospital.setIsDel(true);
            baseMapper.updateById(sysHospital);
            SysOrganization sysOrganizationH=sysOrganizationMapper.selectById(sysHospital.getOrgId());
            if (sysOrganizationH != null) {
                sysOrganizationH.setIsDel(true);
                sysOrganizationMapper.updateById(sysOrganizationH);
            }
        }
//        Map<String,Object> columnMap=new HashMap<String,Object>();
//        columnMap.put("org_parent_id",sysHospital.getOrgId());
//        columnMap.put("is_del",0);
//        columnMap.put("enabled",1);
//        List<SysOrganization> sysOrganizationList=sysOrganizationMapper.selectByMap(columnMap);
//        //如果这个医院下有多个科室，删除只对当前科室有效，否则也要删除医院
//        if(sysOrganizationList.size()==1)
//        {
//            sysHospital.setIsDel(true);
//            baseMapper.updateById(sysHospital);
//            SysOrganization sysOrganizationH=sysOrganizationMapper.selectById(sysHospital.getOrgId());
//            if (sysOrganizationH != null) {
//                sysOrganizationH.setIsDel(true);
//                sysOrganizationMapper.updateById(sysOrganizationH);
//            }
//        }
        sysDepartment.setIsDel(true);
        int j=departmentMapper.updateById(sysDepartment);
        //删除组织数据
@@ -189,7 +202,7 @@
            sysOrganizationD.setIsDel(true);
            sysOrganizationMapper.updateById(sysOrganizationD);
        }
        return (j>0) ? ResultBody.ok().data(sysHospital).msg("删除成功") : ResultBody.failed("删除失败");
        return (j>0) ? ResultBody.ok().data(sysDepartment).msg("科室删除成功") : ResultBody.failed("科室删除失败");
    }

    /**
@@ -231,7 +244,7 @@
     * @return
     */
    @Override
    public ResultBody chartHospital(Integer datatype) {
    public ResultBody chartHospital(int datatype) {
        int hospitalCount=baseMapper.chartHospital(datatype);
        return ResultBody.ok().data(hospitalCount).msg("获取数据成功");
    }