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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildInfoService.java

@@ -86,6 +86,9 @@ public class ChildInfoService extends BaseService {
	 */
	public ChildInfoVO getChildInfoVOByCode(String code) throws Exception{
		ChildInfo c = childInfoDao.findByCode(code);
		if(c == null){
			throw new  Exception("无法找到该新生儿信息！");
		}
		ChildInfoVO vo = new ChildInfoVO();
		vo.setCode(c.getCode());
		

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

@@ -1080,6 +1080,67 @@ public class JMJkEduArticleService extends BaseService {
        List<HealthEduArticleES> esList = elasticsearchUtil.excute(sql2.toString(),HealthEduArticleES.class, esIndex, esType);
        return esList;
    }
    
    /**
     * 获取居民被制定团队下的医生推送的文章列表
     * @param patientCode 居民CODE
     * @param teamCode 团队CODE
     * @param uid 医生CODE
     * @param page 分页
     * @param pagesize 分页数
     * @param level1Type 文章类型
     * @return
     */
    public JSONArray fetchPatientArticlePushedList(String patientCode, String teamCode, String uid, Integer page, Integer pagesize, String level1Type) throws Exception {
    
    
        page = (page - 1) * pagesize;
    
        String sql = "SELECT * FROM " + esType + "  where patientCode= '" + patientCode + "' and adminTeamCode = '"+teamCode+"' doctorCode='" + uid + "' and userType = 1";
    
        if(!StringUtils.isEmpty(level1Type)){
            sql= sql + " and firstLevelCategoryId = '"+level1Type+"' ";
        }
        sql += " order by createTime desc ";
        if(pagesize !=0){
            sql= sql+  " limit " + page + "," + pagesize;
        }
    
        List<HealthEduArticleES> esList = elasticsearchUtil.excute(sql, HealthEduArticleES.class, esIndex, esType);
        HealthEduArticlePatientModel heapm = null;
        JSONObject article = null;
        List<HealthEduArticlePatientModel> result = new ArrayList<>();
        Doctor doctor = null;
        for (HealthEduArticleES one : esList) {
            article = thirdJkEduArticleService.getArticalById(one.getArticleId(),"");
            heapm = new HealthEduArticlePatientModel();
            heapm.setSendName(one.getSendName());
            heapm.setSendCode(one.getDoctorCode());
            heapm.setCreateTime(DateUtil.dateToStrLong(one.getCreateTime()));
            heapm.setArticleId(article.containsKey("articleId")?article.getString("articleId"):"");
            heapm.setAttachedTitle(article.containsKey("articleTitle")?article.getString("articleTitle"):"");
            heapm.setAttachedContent(article.containsKey("articleContent")?article.getString("articleContent"):"");
            heapm.setArticleType(article.containsKey("articleType")?article.getString("articleType"):"");
            heapm.setLevel1Type(article.containsKey("firstLevelCategoryId")?article.getString("firstLevelCategoryId"):"");
            heapm.setLevel2Type(article.containsKey("secondLevelCategoryId")?article.getString("secondLevelCategoryId"):"");
            heapm.setLevel(article.containsKey("articlelevel")?article.getString("articlelevel"):"");
//            heapm.setAllCount(heapm.getAllCount() + one.getPatients().size());
            heapm.setBrowseNumbere(Integer.valueOf(article.containsKey("browseNumber")?article.getString("browseNumber"):"0"));//文章浏览数
            heapm.setCommentNumber(Integer.valueOf(article.containsKey("commentNumber")?article.getString("commentNumber"):"0"));//文章评论数
            heapm.setPointNumber(Integer.valueOf(article.containsKey("pointNumber")?article.getString("pointNumber"):"0"));//文章点赞数
            heapm.setArticleCover(article.containsKey("articleCover")?article.getString("articleCover"):"");//封面
            heapm.setComputeTime(article.containsKey("insertTime")?computeTime(article.getString("insertTime")):"");
            heapm.setOperatorName(article.containsKey("operatorName")?article.getString("operatorName"):"");
            heapm.setSendType(one.getSendType());//发送类型
            heapm.setIsread(String.valueOf(one.getIsRead()));//已读未读标识，1已读，2未读
            heapm.setLeaveWords(one.getLeaveWords());//医生留言
            doctor = doctorDao.findByCode(one.getDoctorCode());
            heapm.setPhoto(doctor.getPhoto());
            result.add(heapm);
            // heapm.setTime();//时间  xx小时前  2017-10-11
        }
        JSONArray re = new JSONArray();
        re.addAll(result);
        return re;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -25,7 +25,7 @@ import java.util.Set;
 */
@RestController
@RequestMapping(value = "/doctor/jkEdu/article/PC", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生、卫计委")
@Api(description = "健康教育文章：医生、卫计委")
public class DoctorJMJkEduArticlePCController extends BaseController {
    @Autowired
@@ -314,5 +314,23 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            return error(-1,"失败！");
        }
    }
    
    @RequestMapping(value = "fetchPatientArticlePushedList", method = RequestMethod.GET)
    @ApiOperation("获取居民被团队下的医生推送的文章列表 ")
    public String pushArticleLogs(
            @ApiParam(name = "patientCode", value = "居民CODE", required = true) @RequestParam(value = "patientCode", required = true) String patientCode,
            @ApiParam(name = "teamCode", value = "团队CODE", required = true) @RequestParam(value = "teamCode", required = true) String teamCode,
            @ApiParam(name = "page", value = "当前页 起始1", required = true) @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize,
            @ApiParam(name = "level1Type", value = "", required = false) @RequestParam(value = "level1Type", required = false) String  level1Type){
        try {
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.fetchPatientArticlePushedList(patientCode,teamCode,getUID(),page,pagesize,level1Type);
//            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.fetchPatientArticlePushedList("ed57f0d34e11458db8540bb8c942ff4f","649","xh1D2017031502222",page,pagesize,level1Type);
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1,"查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -544,7 +544,7 @@ public class FamilyMemberController extends WeixinBaseController {
            return write(200,"查询成功！","data",childInfo);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
            return error(-1, e.getMessage());
        }
    }
}