Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/PatientConsultEndpoint.java

@@ -107,11 +107,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@ApiOperation(value = "获取居民该机构的最近一次在线咨询")
	public Envelop findLastOnlineConsult(
			@ApiParam(name = "orgCode", value = "机构code")
			@RequestParam(value = "orgCode",required = true) String orgCode,
			@RequestParam(value = "orgCode",required = false) String orgCode,
            @ApiParam(name = "sessionId", value = "会话id")
            @RequestParam(value = "sessionId",required = false) String sessionId,
			@ApiParam(name = "patient", value = "居民CODE")
			@RequestParam(value = "patient",required = true) String patient)throws Exception {
		try {
			return success("请求成功",consultService.findLastOnlineConsult(patient, orgCode));
			return success("请求成功",consultService.findLastOnlineConsult(patient, orgCode,sessionId));
		}catch (Exception e){
			return failedException(e);
		}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultService.java

@@ -75,7 +75,7 @@ public class ConsultService {
     * @param patient
     * @param orgCode
     */
    public Map<String,Object> findLastOnlineConsult(String patient,String orgCode){
    public Map<String,Object> findLastOnlineConsult(String patient,String orgCode,String sessionId){
        Map<String,Object> map = new HashedMap();
        String sql = "SELECT " +
                " b.consult,b.doctor, " +
@@ -86,8 +86,14 @@ public class ConsultService {
                "WHERE " +
                " b.doctor = h.doctor_code " +
                "AND b.patient = '"+patient+"' " +
                "AND b.type = 23 "+
                "AND h.org_code = '"+orgCode+"' ORDER BY b.czrq desc LIMIT 1 ";
                "AND b.type = 23 ";
        if(StringUtils.isEmpty(orgCode)){
            String doctor = sessionId.split("_")[1];
            sql += "AND b.doctor = '"+doctor+"' ";
        }else {
            sql += "AND h.org_code = '"+orgCode+"' ";
        }
        sql += " ORDER BY b.czrq desc LIMIT 1 ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        if(list.size()>0){
            map = list.get(0);