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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PatientDeviceController.java

@@ -438,11 +438,14 @@ public class PatientDeviceController extends BaseController {
                                         @RequestParam(value = "patient")String patient,
                                         @ApiParam(name="deviceSN")
                                         @RequestParam(value = "deviceSN")String deviceSn,
                                         @ApiParam(name = "orderId", required = false,value = "对应工单的id")
                                         @RequestParam(value = "orderId", required = false) String orderId,
                                         @ApiParam(name="day",value = "yyyy-mm-dd")
                                         @RequestParam(value = "day",required = false)String day){
        try {
            JSONObject result = patientDeviceService.getPatientDeviceDetail(patient,deviceSn,day,null,null);
            String uid = permissionService.getUID();
            JSONObject result = patientDeviceService.getPatientDeviceDetail(patient,deviceSn,day,uid,orderId);
            if (result.getInt(ResponseContant.resultFlag)==ResponseContant.success){
                return write(200,"获取成功","data", JSON.parseObject(result.getString(ResponseContant.resultMsg)));
            }else {

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 " +
@@ -1634,8 +1636,12 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        Map<String, Object> startMap = maps.get(0);
        String createTime = startMap.get("createTime")+"";
        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")+"";
@@ -1787,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);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -1017,7 +1017,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
            if ("4".equals(device.getCategoryCode()) || "7".equals(device.getCategoryCode())|| "16".equals(device.getCategoryCode())) {
                devInfo.put("sosContactsDOS", contactsService.getPatientSosContacts(patient));
            }
            String content = "调阅智能手表详情页";
            String content = "调阅";
            com.alibaba.fastjson.JSONObject devInfoObj = JSON.parseObject(JSON.toJSONString(devInfo, SerializerFeature.WriteMapNullValue));
            switch (device.getCategoryCode()) {
                case "1"://血压设备
@@ -1168,6 +1168,9 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
                    naturalGasRecord(patientDO.getIdcard(),devInfoObj);
                    content +="天然气使用监测";
                    break;
                default:
                    content +="智能设备";
                    break;
            }
            //记录日志