Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

bingbing

2020-07-22 d7a58eb17814af2a16ee13afaf93acda09745ed9

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java

@@ -80,7 +80,7 @@
            params.put("page", 1);
            params.put("limit", 10);
        }
        return sysHospitalService.findHospitalList(params,user);
        return sysHospitalService.findHospitalList(params, user);
    }

    @PostMapping("findAll")
@@ -96,7 +96,7 @@
    @PostMapping("findAllByMap")
    @ApiOperation(value = "查询所有列表")
    public ResultBody<SysHospital> findAllByMap(@RequestBody Map<String, Object> params) {
            return sysHospitalService.findAll(params);
        return sysHospitalService.findAll(params);
    }

    /**
@@ -108,6 +108,7 @@
        SysHospital model = sysHospitalService.getById(id);
        return ResultBody.ok().data(model).msg("查询成功");
    }

    /**
     * 查询
     */
@@ -120,6 +121,7 @@
            return ResultBody.ok().data(null).msg("");
        }
    }

    /**
     * 根据SysHospital当做查询条件进行查询
     */
@@ -129,15 +131,16 @@
        SysHospital model = sysHospitalService.findByObject(sysHospital);
        return ResultBody.ok().data(model).msg("查询成功");
    }

    /**
     * 修改医院logo
     */
    @ApiOperation(value = "保存")
    @PostMapping("/updateLogo")
    public ResultBody updateLogo(@RequestBody Map<String, Object> params)
    {
    public ResultBody updateLogo(@RequestBody Map<String, Object> params) {
        return sysHospitalService.updateLogo(params);
    }

    /**
     * 新增or更新
     */
@@ -152,32 +155,29 @@
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            //先检查该医院是否存在组织信息
            SysOrganization sysOrganization=new SysOrganization();
            if(sysHospital.getOrgId()!=null){
                sysOrganization.setId(sysHospital.getOrgId());}
            else{
            SysOrganization sysOrganization = new SysOrganization();
            if (sysHospital.getOrgId() != null) {
                sysOrganization.setId(sysHospital.getOrgId());
            } else {
                sysOrganization.setOrgName(sysHospital.getHospitalName());
                sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
            }
            sysOrganization=organizationService.findByObject(sysOrganization);
            if(sysOrganization==null)
            {
            sysOrganization = organizationService.findByObject(sysOrganization);
            if (sysOrganization == null) {
                //创建一个组织
                sysOrganization=new SysOrganization();
                sysOrganization = new SysOrganization();
                sysOrganization.setOrgName(sysHospital.getHospitalName());
                sysOrganization.setOrgAttr(1);
                sysOrganization.setOrgLevel(1);
                sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
            }
            else
            {
            } else {
                sysOrganization.setOrgName(sysHospital.getHospitalName());
            }
            boolean org=organizationService.saveOrUpdate(sysOrganization);
            boolean org = organizationService.saveOrUpdate(sysOrganization);
            sysHospital.setOrgId(sysOrganization.getId());
            List<SysOrganization> organizations = sysUser.getOrganizations();
            if (organizations.size()>0) {
                sysHospital.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
            if (organizations.size() > 0) {
                sysHospital.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode());
            }
            boolean v = sysHospitalService.saveOrUpdate(sysHospital);
            if (v) {