111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -64,10 +64,10 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
    ){
        try {
            JSONObject param = new JSONObject();
            param.put("doctorId",doctor);
            if(permissionService.noPermission(1,param)){
                return ObjEnvelop.getError("该操作没有权限");
            }
//            param.put("doctorId",doctor);
//            if(permissionService.noPermission(1,param)){
//                return ObjEnvelop.getError("该操作没有权限");
//            }
            JSONObject result = assistanceService.doctorGetOrderDetail(orderId,doctor);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return ObjEnvelop.getError(result.getString(ResponseContant.resultMsg));

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

@@ -449,6 +449,13 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                emergencyOrderVO.setEmergencyWarnConclusionDO(conclusionDO);
            }
        }
        //复核
        List<BaseEmergencyWarnLogDO> review = logDao.findByOrderIdAndType(assistanceDO.getId(),7);
        if(review.size()>0){
            emergencyOrderVO.setReviewWarnLogDO(review.get(0));
        }
        //附加信息 紧急救助无
        //通知对象
        List<Map<String,Object>> noticePersons = new ArrayList<>();

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

@@ -443,6 +443,11 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                emergencyOrderVO.setEmergencyWarnConclusionDO(conclusionDO);
            }
        }
        //复核
        List<BaseEmergencyWarnLogDO> review = logDao.findByOrderIdAndType(orderDO.getId(),7);
        if(review.size()>0){
            emergencyOrderVO.setReviewWarnLogDO(review.get(0));
        }
        //附加信息 电子围栏状态
        if (2 == orderDO.getOrderSource() || 8 == orderDO.getOrderSource()) {//手表/拐杖
            Map<String, Object> map = new HashMap<>();