Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -536,6 +536,33 @@ public class JMJkEduArticleService extends BaseService {
        }
        Patient one = null;
        String batchNo = UUID.randomUUID().toString();
        String sendName = "";
        if(sendType==2){
            String resultSql ="";
            String whereSql ="";
            switch (currentUserRoleLevel){
                case "1":{resultSql +=" DISTINCT (province_name) as name";
                    whereSql+=" and province ='"+currentUserRoleCode+"'";break;}
                case "2":{resultSql +=" DISTINCT (city_name) as name";
                    whereSql+=" and city ='"+currentUserRoleCode+"'";break;}
                case "3":{resultSql +=" DISTINCT (town_name) as name";
                    whereSql+=" and town ='"+currentUserRoleCode+"'";break;}
                case "4":{resultSql +=" DISTINCT (name) as name";
                    whereSql+=" and code ='"+currentUserRoleCode+"'";break;}
            }
            String sql = "select "+resultSql+" from dm_hospital  where level=2 "+whereSql ;
            List<Map<String, Object>> returnList = jdbcTemplate.queryForList(sql);
            sendName = returnList.get(0).get("name")+"";
        }
        Map<String,Object> resultMap = labelService.fetchUserHighestAuthority(sendCode);
        List<String> roleList = (List<String>)resultMap.get("roleList");
        List<RoleVo> roleVoLists= new ArrayList<>();
        for(String temp:roleList){
            RoleVo roleVo = new RoleVo();
            roleVo.setCode(temp);
            roleVoLists.add(roleVo);
        }
        JSONObject article = thirdJkEduArticleService.getArticalById(articleId,"");
        for (String patient : patientSet) {
            one = patientDao.findByCode(patient);
@@ -546,21 +573,7 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setPatientCode(patient);
            healthEduArticleES.setPatientName(one.getName());
            if(sendType==2){
                String resultSql ="";
                String whereSql ="";
                switch (currentUserRoleLevel){
                    case "1":{resultSql +=" DISTINCT (province_name) as name";
                        whereSql+=" and province ='"+currentUserRoleCode+"'";break;}
                    case "2":{resultSql +=" DISTINCT (city_name) as name";
                        whereSql+=" and city ='"+currentUserRoleCode+"'";break;}
                    case "3":{resultSql +=" DISTINCT (town_name) as name";
                        whereSql+=" and town ='"+currentUserRoleCode+"'";break;}
                    case "4":{resultSql +=" DISTINCT (name) as name";
                        whereSql+=" and code ='"+currentUserRoleCode+"'";break;}
                }
                String sql = "select "+resultSql+" from dm_hospital  where level=2 "+whereSql ;
                List<Map<String, Object>> returnList = jdbcTemplate.queryForList(sql);
                String sendName = returnList.get(0).get("name")+"";
                healthEduArticleES.setSendName(sendName);
                healthEduArticleES.setSendLevel("4");
@@ -582,7 +595,7 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setTownName(doctor.getTownName());
            healthEduArticleES.setCreateTime(new Date());
            healthEduArticleES.setSendType(sendType);
            JSONObject article = thirdJkEduArticleService.getArticalById(articleId,"");
            healthEduArticleES.setArticleId(article.get("articleId") + "");
            healthEduArticleES.setArticleTitle(article.get("articleTitle") + "");
            healthEduArticleES.setArticleCover(article.get("articleCover") + "");
@@ -594,14 +607,7 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setSecondLevelCategoryName(article.get("secondLevelCategoryName") + "");
            healthEduArticleES.setOperatorId(article.get("operatorId") + "");
            healthEduArticleES.setArticleSource(article.get("articleSource") + "");
            Map<String,Object> resultMap = labelService.fetchUserHighestAuthority(sendCode);
            List<String> roleList = (List<String>)resultMap.get("roleList");
            List<RoleVo> roleVoLists= new ArrayList<>();
            for(String temp:roleList){
                RoleVo roleVo = new RoleVo();
                roleVo.setCode(temp);
                roleVoLists.add(roleVo);
            }
            healthEduArticleES.setRoleList(roleVoLists);
            healthEduArticleES.setLeaveWords(leaveWords);
            healthEduArticleES.setCurrentUserRoleCode(currentUserRoleCode);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -121,7 +121,7 @@ public class ThirdJkEduArticleController extends BaseController {
                                 @ApiParam(name = "userType", value = "用户类型：1医生，2居民",defaultValue = "1")
                                 @RequestParam(value = "userType", required = false) String userType){
        try {
            com.alibaba.fastjson.JSONObject response = thirdJkEduArticleService.getArticalById(articleId,getRepUID());
            com.alibaba.fastjson.JSONObject response = thirdJkEduArticleService.getArticalById(articleId,getUID());
            
            if("2".equals(userType)){
                jmJkEduArticleService.readPatientArticle(getRepUID(),articleId);