Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/org/OrgEndpoint.java

@@ -1,5 +1,7 @@
package com.yihu.jw.care.endpoint.org;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.service.common.PermissionService;
import com.yihu.jw.care.service.org.BaseOrgService;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -10,6 +12,9 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * Created by yeshijie on 2021/3/3.
 */
@@ -20,9 +25,11 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseOrgService orgService;
    @Autowired
    private PermissionService permissionService;
    @RequestMapping(value = "/findOrgList", method = RequestMethod.GET)
    @ApiOperation(value = "获取机构成员")
    @ApiOperation(value = "获取机构")
    public ListEnvelop findOrgList(@ApiParam(name = "type", value = "机构类型1. 等级医院2. 社区医院3.  养老机构 4.  托育机构")
                                      @RequestParam(value = "type", required = false) String type,
                                      @ApiParam(name = "name", value = "机构名称")
@@ -30,6 +37,14 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
                                      @ApiParam(name = "orgCode", value = "orgCode")
                                      @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ListEnvelop.getError("该操作没有权限");
            }
            return ListEnvelop.getSuccess("获取成功",orgService.findOrgList(type,name,orgCode));
        } catch (Exception e) {
            return failedListEnvelopException2(e);
@@ -43,11 +58,58 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
                                   @ApiParam(name = "orgCode", value = "orgCode")
                                   @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ObjEnvelop.getError("该操作没有权限");
            }
            return ObjEnvelop.getSuccess("获取成功",orgService.findOrgByCode(orgCode));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "/findCommunity")
    @ApiOperation(value = "获取机构社区-朝晖街道养老机构用")
    public ListEnvelop findCommunity(){
        try {
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ListEnvelop.getError("该操作没有权限");
            }
            List<Map<String, Object>> community = orgService.findCommunity();
            return success(community);
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
    }
    @GetMapping(value = "/findCommunity")
    @ApiOperation(value = "获取社区成员-朝晖街道养老机构用")
    public ListEnvelop findCommunityZly(@ApiParam(name = "teamId", value = "teamId")
                                        @RequestParam(value = "teamId", required = true) String teamId){
        try {
            JSONObject param = new JSONObject();
            String doctorId =  permissionService.getUID();
            param.put("doctorId",doctorId);
            if(permissionService.noPermission(0,param)){
                return ListEnvelop.getError("该操作没有权限");
            }
            List<Map<String, Object>> communityZly = orgService.findCommunityZly(teamId);
            return success(communityZly);
        } catch (Exception e) {
            return failedListEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/wlyygc/WlyygcDataEndpoint.java

@@ -23,7 +23,7 @@ import java.util.Map;
 * Created by yeshijie on 2022/1/18.
 */
@RestController
@RequestMapping(value = "/gc/data")
@RequestMapping(value = "open/gc/data")
@Api(value = "对外开放统计数据", tags = {"对外开放统计数据"})
public class WlyygcDataEndpoint extends EnvelopRestEndpoint {
@@ -280,7 +280,7 @@ public class WlyygcDataEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "communityTotal")
    @ApiOperation(value = "老人信息计数统计")
    @ApiOperation(value = "社区信息计数统计")
    public  ListEnvelop getOlderTeamListWithPage(@ApiParam(name = "page", value = "分页大小", required = true)
                                                @RequestParam(value = "page") Integer page,
                                                @ApiParam(name = "size", value = "页码", required = true)

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/org/BaseOrgService.java

@@ -20,6 +20,8 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
    @Autowired
    private BaseOrgDao orgDao;
    private final String orgCode = "zdjsylfwyxgszhfgs";
    public List<BaseOrgDO> findOrgList(String type,String name,String orgCode){
        String sql = "select a.* from base_org a where a.del = 1";
        if(!StringUtil.isBlank(type)){
@@ -33,6 +35,8 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
            sql += " and a.code = '"+orgCode+"' ";
        }
        sql += "a.code NOT IN (SELECT DISTINCT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null)";
        return jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseOrgDO.class));
    }
@@ -50,4 +54,21 @@ public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
        }
        return maps;
    }
    public List<Map<String, Object>>  findCommunity() {
   /*     String orgSql = "SELECT tm.team_code AS teamCode,tm.org_code AS orgCode,tm.doctor_code AS doctorCode,d.`name` AS `name` " +
                " FROM base_team_member tm LEFT JOIN base_doctor d ON tm.doctor_code = d.id WHERE tm.del = 1 AND d.del =1 AND org_code = '" + orgCode + "'";
   */
        String orgSql = "SELECT id,org_code,org_name,`name` from base_team WHERE org_code = '"+orgCode+"' ";
        List<Map<String, Object>> maps = jdbcTemplate.queryForList(orgSql);
        return maps;
    }
    public List<Map<String, Object>> findCommunityZly(String teamId){
        String sql = "SELECT tm.team_code AS teamCode,tm.org_code AS orgCode,tm.doctor_code AS doctorCode,d.`name` AS `name`  FROM base_team_member tm LEFT JOIN base_doctor d ON tm.doctor_code = d.id WHERE tm.del = 1 AND d.del =1 AND tm.id = '"+teamId+"'";
        List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
        return maps;
    }
}