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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

business/base-service/src/main/java/com/yihu/jw/internet/service/ykyy/YkyyInternetService.java

@@ -697,24 +697,24 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
                "         JOIN base_doctor_hospital e on e.doctor_code = b.doctor\n" +
                " where a.id = b.consult AND a.symptoms <>'' AND a.symptoms IS NOT NULL ";*/
       String sql = "SELECT\n" +
               "\ta.id,\n" +
               "\ta.type,\n" +
               "\tc. NAME AS docName,\n" +
               "\tc.idcard AS docIdCard,\n" +
               "\tc.id AS docId,\n" +
               "\tb.patient,\n" +
               "\tb. NAME AS patientName,\n" +
               "\tb.birthday,\n" +
               "\ta.czrq,\n" +
               "\ta.end_time ,\n" +
               "\ta.symptoms,\n" +
               "\td.sex,\n" +
               "\td.mobile,\n" +
               "\td.idcard AS patIdCard,\n" +
               "\td.city_code,\n" +
               "\te.dept_code,\n" +
               "\te.dept_name,\n" +
               "\tt.id AS consult \n" +
               "\ta.id as \"id\",\n" +
               "\ta.type as \"type\",\n" +
               "\tc. NAME AS \"docName\",\n" +
               "\tc.idcard AS \"docIdCard\",\n" +
               "\tc.id AS \"docId\",\n" +
               "\tb.patient AS \"patient\",\n" +
               "\tb. NAME AS \"patientName\",\n" +
               "\tb.birthday as \"birthday\",\n" +
               "\ta.czrq as \"czrq\",\n" +
               "\ta.end_time as \"end_time\",\n" +
               "\ta.symptoms as \"symptoms\",\n" +
               "\td.sex AS \"sex\",\n" +
               "\td.mobile AS \"mobile\",\n" +
               "\td.idcard AS \"patIdCard\",\n" +
               "\td.city_code AS \"city_code\",\n" +
               "\te.dept_code AS \"dept_code\",\n" +
               "\te.dept_name AS \"dept_name\",\n" +
               "\tt.id AS \"consult\" \n" +
               "FROM\n" +
               "\twlyy_consult a ,\n" +
               "\twlyy_consult_team b \n" +
@@ -742,7 +742,7 @@ public class YkyyInternetService extends BaseJpaService<InternetUpErrorLogDO, In
        total = list.size();
        for(int i=0; i<total; i++) {
            LinkedCaseInsensitiveMap info = (LinkedCaseInsensitiveMap) list.get(i);
            String sqlMessage = "SELECT m.sender_name, m.`timestamp`, m.content, t.id FROM im_internet_hospital.topics t " +
            String sqlMessage = "SELECT m.sender_name AS \"sender_name\", m.`timestamp` AS \"timestamp\", m.content AS  \"content\", t.id AS \"id\"  FROM im_internet_hospital.topics t " +
                    "JOIN im_internet_hospital.muc_messages m ON m.session_id = t.session_id AND m.`timestamp` >= t.create_time AND m.`timestamp` <= t.end_time " +
                    "AND t.id = '"+info.get("consult").toString()+"' ORDER BY m.`timestamp` ASC";
            List<Map<String,Object>> list1 = jdbcTemplate.queryForList(sqlMessage);