Kaynağa Gözat

Merge branch 'dev' of liubing/wlyy2.0 into dev

liubing 2 yıl önce
ebeveyn
işleme
8114d9094f

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

@ -372,13 +372,13 @@ public class DoctorMessageService {
    public PageEnvelop<Map<String,Object>> getToDoWorkReminder(String doctor,Integer page,Integer pageSize){
        page = page>0?page-1:0;
        String sql = " select mess.id,p.id patientCode,p.name,p.idcard,p.birthday,p.sex,p.photo,residential_area,p.mobile, " +
        String sql = " select mess.id,p.id patientCode,p.name,p.idcard,p.birthday,p.sex,p.photo,residential_area,p.mobile,mess.relation_code relationCode, " +
                " '紧急呼叫' as serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time,ord.`status`,mess.`code` orderType " +
                "  from base_system_message mess INNER JOIN base_emergency_assistance_order ord on mess.relation_code = ord.id " +
                " INNER JOIN base_patient p on p.id = ord.patient " +
                " where mess.del=1 and mess.type=45 and mess.code=20 and mess.receiver='"+doctor+"'  " +
                "union ALL " +
                "select mess.id,p.id patientCode,p.name,p.idcard,p.birthday,p.sex,p.photo,residential_area,p.mobile, " +
                "select mess.id,p.id patientCode,p.name,p.idcard,p.birthday,p.sex,p.photo,residential_area,p.mobile,mess.relation_code relationCode, " +
                "ord.serve_desc as serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time,ord.`status`, " +
                " mess.`code` orderType  " +
                " from base_system_message mess INNER JOIN base_security_monitoring_order ord on mess.relation_code = ord.id " +