111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -1613,6 +1613,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<Map<String, Object>> maps = new ArrayList<>();
        if ("20".equals(orderType)){
            eaSql   = "SELECT o.`status`,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') AS createTime,o.patient,o.team_code,'紧急呼叫' AS serveDesc,dd.photo " +
                    ",o.serve_lat serveLat,o.serve_lon serveLon,o.order_source orderSource,o.patient " +
                    "from base_emergency_assistance_order o " +
                    "LEFT JOIN wlyy_devices wd on wd.device_code=o.device_sn " +
                    "LEFT JOIN dm_device dd on dd.category_code = wd.category_code " +
@@ -1620,6 +1621,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        }
        if ("22".equals(orderType)){
            eaSql   = "SELECT o.`status`,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') AS createTime,o.patient,o.team_code,o.serve_desc serveDesc,dd.photo " +
                    ",o.serve_lat serveLat,o.serve_lon serveLon,o.order_source orderSource,o.patient " +
                    "from base_security_monitoring_order o  " +
                    "LEFT JOIN wlyy_devices wd on wd.device_code=o.device_sn " +
                    "LEFT JOIN dm_device dd on dd.category_code = wd.category_code " +
@@ -1636,7 +1638,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        start.put("createTime",createTime);
        start.put("status",startMap.get("status"));
        start.put("photo",startMap.get("photo"));
        start.put("serveLat",startMap.get("serveLat"));
        start.put("serveLon",startMap.get("serveLon"));
        start.put("serveDesc",startMap.get("serveDesc"));
        jsonObject.put("start",start);
        String patient = startMap.get("patient")+"";
        String teamCode = startMap.get("team_code")+"";
@@ -1788,6 +1793,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            noticeObj.put("name",doctorDO.getName());
            noticeObj.put("photo",doctorDO.getPhoto());
            noticeObj.put("mobile",doctorDO.getMobile());
            noticeObj.put("doctorLat",doctorDO.getDoctorLat());
            noticeObj.put("doctorLon",doctorDO.getDoctorLon());
            noticeObj.put("status",0);
            noticeObj.put("statusName","未响应");
            noticeObj.put("createTime",createTime);