111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/security/SecurityMonitoringOrderEndpoint.java

@@ -331,7 +331,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
                                @ApiParam(name = "topicItem", value = "专题code,关联security_topic_dict字典", required = false)
                                @RequestParam(value = "topicItem",required = false,defaultValue = "preventLost") String topicItem) {
        try {
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem,true));
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem,null,true));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/platForm/PatientInfoPlatFormEndpoint.java

@@ -225,7 +225,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
                                     @ApiParam(name = "topicItem", value = "专题code,关联security_topic_dict字典", required = false)
                                     @RequestParam(value = "topicItem",required = false) String topicItem){
        try {
            return baseController.write (200,"查询成功","data",securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem,true));
            return baseController.write (200,"查询成功","data",securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem,null,true));
        }catch (Exception e){
            return baseController.errorResult(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -1505,7 +1505,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        return result;
    }
    public JSONObject patientMonitoringInfo(String patient, String topicItem, boolean video) {
    public JSONObject patientMonitoringInfo(String patient, String topicItem,String deviceSn,boolean video) {
        JSONObject result = new JSONObject();
        result.put("location", null);
        result.put("fences", null);
@@ -1514,7 +1514,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        result.put("fall", null);
        result.put("sleep", null);
        result.put("sleepOrderInfo", null);//最近工单
        result.put("deviceSn", null);
        result.put("deviceSn", deviceSn);
        result.put("emeAssistance", false);
        result.put("monitorInfo", null);
        String sql = " select dict.code,count(ord.id) total from base_system_dict_entry dict LEFT JOIN base_security_monitoring_order ord " +
@@ -1568,7 +1568,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        if (counnt > 0) {
            result.put("emeAssistance", true);
        }
        result = patientSignTopicInfo(result, patient, topicItem, null, true);
        result = patientSignTopicInfo(result, patient, topicItem, deviceSn, true);
        return result;
    }
@@ -2259,7 +2259,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        }
                        break;
                    default:
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, false);
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem,deviceSn, false);
                        break;
                }
                object.put("patientInfo", patientTmp);
@@ -2277,7 +2277,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                }
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", false);
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", null,false);
                object.put("deviceSn", deviceSn);
                object.put("patientInfo", patientTmp);
                monitorInfos.add(object);
@@ -2448,7 +2448,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        object.put("info", tmp);
                        break;
                    default:
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, false);
                        object = patientMonitoringInfo(patientTmp.get("id").toString(), topicItem, deviceSn,false);
                        break;
                }
                object.put("patientInfo", patientTmp);
@@ -2466,7 +2466,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                if (deviceSns.size() > 0) {
                    deviceSn = deviceSns.get(0);
                }
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", false);
                JSONObject object = patientMonitoringInfo(patientTmp.get("id").toString(), "null", null,false);
                object.put("deviceSn", deviceSn);
                object.put("patientInfo", patientTmp);
                monitorInfos.add(object);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -283,7 +283,7 @@ public class PatientInfoPlatFormService {
     * @return
     */
    public JSONObject getPatientMonitoringInfo(String patient){
        return securityMonitoringOrderService.patientMonitoringInfo(patient,null,true);
        return securityMonitoringOrderService.patientMonitoringInfo(patient,null,null,true);
    }
    /**