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

common/common-entity/sql记录

@@ -1823,7 +1823,7 @@ CREATE TABLE `base_visit_sign` (
) ENGINE=InnoDB AUTO_INCREMENT=257 DEFAULT CHARSET=utf8mb4 COMMENT='日常走访签到';
--2022-05-31
ALTER TABLE `base`.`base_device_repair`
ADD COLUMN `type` tinyint(2) NULL COMMENT '类型。空是保修，0是设备异常登记维护信息' AFTER `feedback`;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/DoctorMessageService.java

@@ -341,14 +341,15 @@ public class DoctorMessageService {
       // List<SystemMessageDO> systemMessageDOS = messageDao.getByReceiverAndType(doctor,"43");
        String sql =  "select DISTINCT sm.id as id,sm.type AS type,sm.title AS title,sm.sender AS sender,sm.sender_name AS senderName,\n" +
                "  sm.receiver AS receiver,sm.receiver_name AS receiver_name,sm.relation_code AS relationCode,\n" +
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,UNIX_TIMESTAMP(sm.create_time) AS createTimeNum,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name" +
                "  from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn where sm.receiver = '"+doctor+"' AND sm.type=43 and sm.del=1 ";
                "  sm.data AS data,sm.is_read AS isRead,DATE_FORMAT(sm.create_time,'%Y-%m-%d') AS createTime,UNIX_TIMESTAMP(sm.create_time) AS createTimeNum,sm.sender_photo AS sender_photo,pd.category_code,pd.device_name,p.photo " +
                "  from base_system_message sm LEFT JOIN wlyy_patient_device pd ON sm.relation_code = pd.device_sn left join base_patient p on sm.sender = p.id where sm.receiver = '"+doctor+"' AND sm.type=43 and sm.del=1 ";
        if (StringUtils.isNotBlank(deviceCode)&&!"''".equals(deviceCode)){
            sql +=" AND pd.category_code = '"+deviceCode+"'";
        }
        //模糊搜居民名字和身份证号
        if (StringUtils.isNotBlank(deviceName)){
            sql += " and pd.device_name LIKE '%"+deviceName+"%'";
            sql += " and ( p.name LIKE '%"+deviceName+"%' or p.idcard like '%"+deviceName+"%' )";
        }
        sql+= "  order by sm.create_time desc";