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

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

@@ -298,7 +298,7 @@ public class BaseController {
        }
    }
    public String error(int code, String msg,Exception e) {
    public String errorResult(Exception e) {
        try {
            e.printStackTrace();
            Map<Object, Object> map = new HashMap<Object, Object>();

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

@@ -36,7 +36,7 @@ public class DeviceController extends BaseController {
            List<Device> list = deviceService.findDeviceByCategory(categoryCode);
            return write(200, "获取设备列表成功！", "data", list);
        } catch (Exception ex) {
            return error(-1, "获取设备列表失败！",ex);
            return errorResult(ex);
        }
    }
@@ -50,7 +50,7 @@ public class DeviceController extends BaseController {
            return write(200, "查询成功", "data", device);
        } catch (Exception ex) {
            return error(-1, "获取设备列表失败！",ex);
            return errorResult(ex);
        }
    }

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

@@ -71,7 +71,7 @@ public class DoctorDeviceController extends BaseController {
			return write(200, "查询成功", "data", list);
		} catch (Exception ex) {
			return error(-1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
@@ -85,7 +85,7 @@ public class DoctorDeviceController extends BaseController {
			return write(200, "查询成功", "data", device);
		} catch (Exception ex) {
			return error( -1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
@@ -103,7 +103,7 @@ public class DoctorDeviceController extends BaseController {
			List<Map<String,String>> list = patientDeviceService.getDeviceUser(patient,deviceSn,type);
			return write(200, "获取设备绑定信息成功！", "data",list);
		} catch (Exception ex) {
			return error(-1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
	@ApiOperation("通过sn码获取设备绑定情况(管理端)")

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

@@ -44,7 +44,7 @@ public class DoctorHealthController extends BaseController {
				return error(-1, "查询失败");
			}
		} catch (Exception e) {
			return error(-1, "查询失败",e);
			return errorResult(e);
		}
	}
@@ -73,7 +73,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "查询成功", "list", jsonArray);
		} catch (Exception ex) {
			return error( -1, "查询失败！",ex);
			return errorResult(ex);
		}
	}
@@ -110,7 +110,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "查询成功", "list", jsonObject);
		} catch (Exception ex) {
			return error(-1, "查询失败！",ex);
			return errorResult(ex);
		}
	}
@@ -140,7 +140,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "查询成功", "list", jsonObject);
		} catch (Exception ex) {
			return error( -1, "查询失败！",ex);
			return errorResult(ex);
		}
	}
@@ -171,7 +171,7 @@ public class DoctorHealthController extends BaseController {
			json.put("custom", userArray);
			return write(200, "查询成功", "data", json);
		} catch (Exception e) {
			return error( -1, "查询失败！",e);
			return errorResult(e);
		}
	}
@@ -208,7 +208,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "查询成功", "data", map);
		} catch (Exception ex) {
			return error(-1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
@@ -227,7 +227,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "获取患者健康指标历史记录成功", "data", list);
		} catch (Exception ex) {
			return error( -1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
@@ -260,7 +260,7 @@ public class DoctorHealthController extends BaseController {
			json.put("custom", userArray);
			return write(200, "查询成功", "data", json);
		} catch (Exception e) {
			return error( -1, e.getMessage(),e);
			return errorResult(e);
		}
	}
@@ -280,7 +280,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "获取健康指标记录日期成功", "data", list);
		}catch (Exception e){
			return error( -1, e.getMessage(),e);
			return errorResult(e);
		}
	}
@@ -295,7 +295,7 @@ public class DoctorHealthController extends BaseController {
			List<Map<String,String>> list = healthIndexService.getHealthIndexByPatientAndDate(patientCode,deviceSn,choseDay,type);
			return write(200, "获取健康指标历史记录成功", "data", list);
		} catch (Exception ex) {
			return error( -1, ex.getMessage(),ex);
			return errorResult(ex);
		}
	}
@@ -308,7 +308,7 @@ public class DoctorHealthController extends BaseController {
			DevicePatientHealthIndex patientHealthIndex = healthIndexService.getHealthIndexById(id);
			return write(200, "查询成功", "data", patientHealthIndex);
		} catch (Exception e) {
			return error( -1, e.getMessage(),e);
			return errorResult(e);
		}
	}
}

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

@@ -65,7 +65,7 @@ public class PadDeviceController extends BaseController {
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -76,7 +76,7 @@ public class PadDeviceController extends BaseController {
            List<Map<String , Object>> list = patientDeviceService.getDeviceType();
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -88,7 +88,7 @@ public class PadDeviceController extends BaseController {
            List<Map<String , Object>> list = patientDeviceService.getDeviceTypeSmall(category_code);
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -126,7 +126,7 @@ public class PadDeviceController extends BaseController {
            return success("设备保存成功！");
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -143,7 +143,7 @@ public class PadDeviceController extends BaseController {
                    return write(-1,"解绑失败，请确认设备sn码");
                }
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }

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

@@ -63,7 +63,7 @@ public class PatientDeviceController extends BaseController {
            JSONObject json = patientHealthIndexService.getealthStandard(type,getRepUID());
            return write(200,"获取成功","data",json);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -105,7 +105,7 @@ public class PatientDeviceController extends BaseController {
            return success("设备保存成功！");
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -125,7 +125,7 @@ public class PatientDeviceController extends BaseController {
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -140,7 +140,7 @@ public class PatientDeviceController extends BaseController {
            mapList.put("device", device);
            return write(200, "查询成功", "data", mapList);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -160,7 +160,7 @@ public class PatientDeviceController extends BaseController {
            List<Map<String, String>> list = patientDeviceService.getDeviceUser(getRepUID(), deviceSn, type);
            return write(200, "获取设备绑定信息成功！", "data", list);
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -173,7 +173,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"查询成功","detailModelList",  patientDeviceService.patientDeviceListByTopic(patient,topic));
        } catch (Exception ex) {
            return error(-1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -199,7 +199,7 @@ public class PatientDeviceController extends BaseController {
                return error(-1, "不存在该设备！");
            }
        } catch (Exception ex) {
            return error( -1, ex.getMessage(),ex);
            return errorResult(ex);
        }
    }
@@ -209,7 +209,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"执行成功","data",patientDeviceService.getPatientDeviceTaskInfo(patientCode));
        }catch (Exception e){
            return error( -1, e.getMessage(),e);
            return errorResult(e);
        }
    }
@@ -220,7 +220,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getAqgDeviceInfo(deviceSn));
        }catch (Exception e){
            return error( -1, e.getMessage(),e);
            return errorResult(e);
        }
    }
@@ -245,7 +245,7 @@ public class PatientDeviceController extends BaseController {
            }
            return error(-1,json.getString("error_desc"));
        }catch (Exception e){
            return error( -1, e.getMessage(),e);
            return errorResult(e);
        }
    }
@@ -258,7 +258,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getDeviceLastLocation(deviceSn,type));
        }catch (Exception e){
            return error( -1, e.getMessage(),e);
            return errorResult(e);
        }
    }
@@ -286,7 +286,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.updateDeviceFenceArea(deviceSn, fenceNO, enable, name, freq, time_begin, time_end, safe_area, clear));
        }catch (Exception e){
            return error( -1, e.getMessage(),e);
            return errorResult(e);
        }
    }
}

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

@@ -49,7 +49,7 @@ public class PatientHealthController extends BaseController {
            healthIndexService.modify(id,recordDate, value1, value2, value3, value4);
            return write(200, "更改成功！");
        } catch (Exception e) {
            return error( -1, "请求失败",e);
            return errorResult(e);
        }
    }
@@ -231,7 +231,7 @@ public class PatientHealthController extends BaseController {
            }
            return write(200, "查询成功", "data", list);
        } catch (Exception e) {
            return error( -1, "请求失败",e);
            return errorResult(e);
        }
    }
@@ -250,7 +250,7 @@ public class PatientHealthController extends BaseController {
                return error(-1, "查询失败");
            }
        } catch (Exception e) {
            return error( -1, "请求失败",e);
            return errorResult(e);
        }
    }
@@ -290,7 +290,7 @@ public class PatientHealthController extends BaseController {
            }
            return write(200, "查询成功", "data", map);
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -322,7 +322,7 @@ public class PatientHealthController extends BaseController {
            return success("新增患者指标成功！");
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -339,7 +339,7 @@ public class PatientHealthController extends BaseController {
            return success("校验患者指标成功！");
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -363,7 +363,7 @@ public class PatientHealthController extends BaseController {
            }
            return write(200, "查询成功", "list", jsonArray);
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -389,7 +389,7 @@ public class PatientHealthController extends BaseController {
            }
            return write(200, "查询成功", "list", jsonArray);
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -419,7 +419,7 @@ public class PatientHealthController extends BaseController {
            }
            return write(200, "查询成功", "list", jsonObject);
        } catch (Exception ex) {
            return error( -1, "请求失败",ex);
            return errorResult(ex);
        }
    }
@@ -447,7 +447,7 @@ public class PatientHealthController extends BaseController {
            json.put("custom", userArray);
            return write(200, "查询成功", "data", json);
        } catch (Exception e) {
            return error( -1, "请求失败",e);
            return errorResult(e);
        }
    }

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

@@ -51,7 +51,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        } catch (Exception e) {
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -66,7 +66,7 @@ public class YsDeviceController extends BaseController {
        try {
            return write(200,"查询成功","data",ysDeviceService.deviceFailConfig(deviceSerial,type,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -88,7 +88,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.deviceEncrypt(deviceSerial,isEncrypt,validateCode,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -104,7 +104,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.deviceCapture(deviceSerial,channelNo,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -127,7 +127,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -149,7 +149,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.ptzStart(deviceSerial,channelNo,direction,speed,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -167,7 +167,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.ptzStop(deviceSerial,channelNo,direction,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -182,7 +182,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.coverVideoSwitch(is_vod_cover,request));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -212,7 +212,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONArray(ResponseContant.resultMsg));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -242,7 +242,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -367,7 +367,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }
@@ -394,7 +394,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return error(-1,"error",e);
            return errorResult(e);
        }
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/DoctorDoorCoachOrderController.java

@@ -58,7 +58,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return baseController.write(200, "提交成功！","orderId",result.getString("orderId"));
        }catch (Exception e){
            return baseController.error(-1, e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -70,7 +70,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
        try {
            return  baseController.write(200, "获取成功", "data",doctorDoorCoachOrderService.getDoorOrderNum(doctor));
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -95,7 +95,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            object.put("pageSize",size);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            return baseController.error(-1,"查询失败",e);
            return baseController.errorResult(e);
        }
    }
@@ -117,7 +117,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return baseController.write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return baseController.error(-1,"查询失败",e);
            return baseController.errorResult(e);
        }
    }
@@ -138,7 +138,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return baseController.write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return baseController.error(-1, "派单失败!",e);
            return baseController.errorResult(e);
        }
    }
@@ -153,7 +153,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            doctorDoorCoachOrderService.acceptOrder(orderId,jobCode,jobCodeName,hospitalLevel);
            return baseController.write(200, "操作成功");
        } catch (Exception e) {
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -168,7 +168,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            doctorDoorCoachOrderService.refuseOrder(getUID(),orderId, reason);
            return baseController.write(200, "操作成功");
        } catch (Exception e) {
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -187,7 +187,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return baseController.write(200,"取消成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return baseController.error(-1,"取消失败",e);
            return baseController.errorResult(e);
        }
    }
@@ -215,7 +215,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
                return baseController.error(-1,"扫码签到失败");
            }
        } catch (Exception e) {
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -234,7 +234,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachConclusionDO doorConclusion = doctorDoorCoachOrderService.updateDoorConclusion(orderId,conclusion,conclusionImg,conclusionStatus);
            return baseController.write(200, "保存成功", "data", doorConclusion);
        } catch (Exception e) {
            return baseController.error(-1, "保存失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -258,7 +258,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachConclusionDO doorConclusion = doctorDoorCoachOrderService.getDoorConclusion(orderId);
            return baseController.write(200, "获取成功", "data", doorConclusion);
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -274,7 +274,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
        try {
            return baseController.write(200, "获取成功", "data", doctorDoorCoachOrderService.saveOrderFinishByDoctor(orderId, finishWay, finishImg));
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -289,7 +289,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.updateArrivingTime(orderId, arrivingTime);
            return baseController.write(200, "修改成功", "data", baseDoorCoachOrderDO);
        } catch (Exception e) {
            return baseController.error(-1, "修改失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -302,7 +302,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            Map<String, Integer> map = doctorDoorCoachOrderService.getNumGroupByStatus(doctor);
            return baseController.write(200, "获取成功", "data", map);
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -337,7 +337,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            org.json.JSONObject waitingMessages = doctorDoorCoachOrderService.getWaitingMessages(message1, types, Integer.valueOf(page), Integer.valueOf(pageSize));
            return baseController.write(200, "查询成功","data",waitingMessages);
        }catch (Exception e){
            return baseController.error( -1, "查询失败！",e);
            return baseController.errorResult(e);
        }
    }
@@ -411,7 +411,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
                    ss,createTimeStart,createTimeEnd,serverDoctorName,doctorCode,page,pageSize, type);
            return baseController.write(200, "获取成功","data",result);
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -440,7 +440,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            object.put("pageSize",size);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            return baseController.error(-1,"查询失败",e);
            return baseController.errorResult(e);
        }
    }
@@ -473,7 +473,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            object.put("pageSize",size);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            return baseController.error(-1,"查询失败",e);
            return baseController.errorResult(e);
        }
    }
@@ -498,7 +498,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return baseController.write(200, "获取成功", "data", baseDoorCoachOrderDO);
        } catch (Exception e) {
            return baseController.error(-1, "获取失败, 该医生暂无工单!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -532,7 +532,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            return baseController.write(200, "获取成功","dara",patientDoorCoachOrderService.selectItemsByHospital(hospital,serverItemName));
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -543,7 +543,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            doctorDoorCoachOrderService.initDoorStatus(null);
            return baseController.success("成功");
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -557,7 +557,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            String status = doctorDoorCoachOrderService.findDispatchStatusByDoctor(doctor);
            return baseController.write(200, "获取成功", "data", status);
        } catch (Exception e) {
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -573,7 +573,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            doctorDoorCoachOrderService.updateDispatchStatusByDoctor(doctor, value);
            return baseController.write(200, "修改成功");
        } catch (Exception e) {
            return baseController.error(-1, "修改失败!" + e.getMessage(),e);
            return baseController.errorResult(e);
        }
    }
@@ -606,7 +606,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
        }catch (Exception e){
            //日志文件中记录异常信息
            //返回接口异常信息处理结果
            return baseController.error(-1, "操作失败！",e);
            return baseController.errorResult(e);
        }
    }
@@ -648,7 +648,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return baseController.write(200,"保存成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return baseController.error(-1,"保存失败",e);
            return baseController.errorResult(e);
        }
    }

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

@@ -50,7 +50,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"执行成功","data",patientDeviceService.getPatientDeviceTaskInfo(patientCode));
        }catch (Exception e){
            return error(-1,"执行失败！",e);
            return errorResult(e);
        }
    }
@@ -61,7 +61,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getAqgDeviceInfo(deviceSn));
        }catch (Exception e){
            return error(-1,"执行失败！",e);
            return errorResult(e);
        }
    }
@@ -86,7 +86,7 @@ public class PDeviceController extends BaseController {
            }
            return error(-1,json.getString("error_desc"));
        }catch (Exception e){
            return error(-1,"执行失败！",e);
            return errorResult(e);
        }
    }
@@ -99,7 +99,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getDeviceLastLocation(deviceSn,type));
        }catch (Exception e){
            return error(-1,"执行失败！",e);
            return errorResult(e);
        }
    }
@@ -127,7 +127,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.updateDeviceFenceArea(deviceSn, fenceNO, enable, name, freq, time_begin, time_end, safe_area, clear));
        }catch (Exception e){
            return error(-1,"执行失败！",e);
            return errorResult(e);
        }
    }
}

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

@@ -161,7 +161,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return baseController.write (200,"查询成功","data",patientInfoPlatFormService.getHealthIndexInfo(patient,type,gi_type,begin,end));
        }catch (Exception e){
            return baseController.error(-1,"查询失败",e);
            return baseController.errorResult(e);
        }
    }