Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -96,7 +96,7 @@ zy_execute_sick_settle_job=0 0/3 * * * ?
prescription_pay_query_job=0 0/3 * * * ?
#居民24小时未回复的咨询自动关闭 每小时59分开始执行一次
finish_consult_job=* 59 * * * ?
finish_consult_job=0 59 * * * ?
#提醒有监测方案的居民上传数据，每29分钟执行一次
doctor_feldsher_template_job=0 0/29 * * * ?

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -297,7 +297,7 @@ public class MessageService extends BaseService {
     */
    public List<Map<String, Object>> getHealthIndexMessage(String doctor) throws Exception {
        List<Map<String, Object>> re = new ArrayList<>();
        String sql = "select a.sender,a.tz_type,count(1) count,max(date_format(a.create_time,'%Y-%c-%d %H:%i:%s')) last_time,a.has_read from wlyy_Message a where a.receiver='" + doctor + "' and a.type='2' group by a.sender,a.tz_type,a.has_read order by last_time desc";
        String sql = "select a.sender,a.tz_type,count(1) count,max(date_format(a.create_time,'%Y-%m-%d %H:%i:%s')) last_time,a.has_read from wlyy_Message a where a.receiver='" + doctor + "' and a.type='2' group by a.sender,a.tz_type,a.has_read order by last_time desc";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        Map<String,Map<String, Object>> map = new HashMap<>();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/physicalExamination/PhysicalExamTeamRemindService.java

@@ -48,6 +48,7 @@ public class PhysicalExamTeamRemindService extends BaseService{
        Doctor d = doctorDao.findByCode(doctor);
        try {
            //在方法上加@Async注解 这个方法就成异步方法了            异步方法不能和调用方法放在一个类里面
            remindService.sendBatchNotice(teamCode, d.getName(), record.getId());
        } catch (Exception e) {
            e.printStackTrace();