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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -506,4 +506,55 @@ public abstract class EnvelopRestEndpoint extends Exception {
            return null;
        }
    }
    protected Envelop failedException2(Exception e){
        e.printStackTrace();
        BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return failed(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return failed("系统繁忙，请稍后再试",-10000);
        }
    }
    protected MixEnvelop failedMixEnvelopException2(Exception e){
        e.printStackTrace();
        BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return MixEnvelop.getError(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return MixEnvelop.getError("系统繁忙，请稍后再试",-10000);
        }
    }
    protected ListEnvelop failedListEnvelopException2(Exception e){
        e.printStackTrace();
        BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return ListEnvelop.getCodeError(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return ListEnvelop.getCodeError("系统繁忙，请稍后再试",-10000);
        }
    }
    protected ObjEnvelop failedObjEnvelopException2(Exception e){
        e.printStackTrace();
        BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return ObjEnvelop.getError(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return ObjEnvelop.getError("系统繁忙，请稍后再试",-10000);
        }
    }
    public PageEnvelop failedPageEnvelopException2(Exception e){
        e.printStackTrace();
        BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
        if (baseExceptionDictDO!=null){
            e.printStackTrace();
            return PageEnvelop.getError(baseExceptionDictDO.getRemindContent(),Integer.parseInt(baseExceptionDictDO.getCode()));
        }else {
            return PageEnvelop.getError("系统繁忙，请稍后再试",-10000);
        }
    }
}

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

@@ -300,16 +300,16 @@ public class BaseController {
    public String error(int code, String msg,Exception e) {
        try {
            e.printStackTrace();
            Map<Object, Object> map = new HashMap<Object, Object>();
            ObjectMapper mapper = new ObjectMapper();
            BaseExceptionDictDO baseExceptionDictDO =baseExceptionDictDao.findByExceptionInfo(e.getClass().toString());
            if (baseExceptionDictDO!=null){
                e.printStackTrace();
                map.put("status", Integer.parseInt(baseExceptionDictDO.getCode()));
                map.put("msg", baseExceptionDictDO.getRemindContent());
            }else {
                map.put("status", -10000);
                map.put("msg", e.getMessage());
                map.put("msg", "系统繁忙，请稍后再试");
            }
            return mapper.writeValueAsString(map);
        } catch (Exception e1) {

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

@@ -36,7 +36,7 @@ public class PatientBedApplyEndPoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("操作成功", result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -47,7 +47,7 @@ public class PatientBedApplyEndPoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功", patientBedApplyService.getApplyList(doctor));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
}

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

@@ -43,7 +43,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发起成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -61,7 +61,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -79,7 +79,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -104,7 +104,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -119,7 +119,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -145,7 +145,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess( "查询成功",assistanceService.getOrderList(patientId,patientName,doctor,status,page,pageSize,"desc"));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -167,7 +167,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess( "查询成功",assistanceService.doctorGetOrderList(patientId,doctor,"1",page,pageSize,"asc"));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -184,7 +184,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("取消成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -208,7 +208,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("保存成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -232,7 +232,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -254,7 +254,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getString("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -275,7 +275,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发送成功","");
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -290,7 +290,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("发送成功",assistanceService.test(doctor, orderID));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -310,7 +310,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getString("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -327,7 +327,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("修改成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -337,7 +337,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
        try {
            return null;
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -48,7 +48,7 @@ public class DoctorConsultController extends EnvelopRestEndpoint {
                return Envelop.getError( "关闭失败！");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -60,7 +60,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
            }
            return success(jsonStr);
        }catch (Exception e){
           return failedException(e);
           return failedException2(e);
        }
    }
@@ -75,7 +75,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
        try {
            return success("请求成功",imService.getConsultInfoAndPatientInfo(consult,patientCode));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -113,7 +113,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
            result.put("list",data);
            return success(result);
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -124,7 +124,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			}
			return success("请求成功",consultService.findLastOnlineConsult(patient, orgCode,sessionId,type));
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -141,7 +141,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			String consultCode = consultService.getUnfinishedConsult(patient, doctor, type);
			return success("请求成功",consultCode);
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -211,7 +211,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			return success("操作成功", consult);
		}catch(Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -232,7 +232,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			List<Map<String,Object>>  data = consultService.findConsultDoctor(orgCode, patient,type,page,pagesize);
			return success(data);
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -266,7 +266,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			result.put("list",data);
			return success(result);
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -290,7 +290,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			return success(jsonStr);
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -302,7 +302,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		try {
			return success("请求成功",imService.getTopic(consult));
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
@@ -346,7 +346,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			failed = imService.append(consult,content,type,times,patientCode,wechat_appid);
			return success(failed);
		}catch (Exception e){
			return failedListEnvelopException(e);
			return failedListEnvelopException2(e);
		}
	}
@@ -359,7 +359,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			JSONArray participants = imService.getSessions(sessionId);
			return success(participants);
		}catch (Exception e){
			return failedListEnvelopException(e);
			return failedListEnvelopException2(e);
		}
	}
	
@@ -380,7 +380,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			JSONArray messageArray = imService.getSessionMessage(sessionId, startMsgId, endMsgId, page, pagesize, getUID());
			return success(messageArray);
		}catch (Exception e){
			return failedListEnvelopException(e);
			return failedListEnvelopException2(e);
		}
	}
@@ -414,7 +414,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			}
			return failed(PatientRequestMapping.Wechat.api_error);
		}catch (Exception e){
			return failedException(e);
			return failedException2(e);
		}
	}
	
@@ -456,7 +456,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			imService.updateParticipant(sessionid,userid,olduserid);
			return success("操作成功");
		} catch (Exception e) {
			return failedException(e);
			return failedException2(e);
		}
	}
	
@@ -522,7 +522,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			return success(result);
		} catch (Exception e) {
			return failedException(e);
			return failedException2(e);
		}
	}

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

@@ -52,7 +52,7 @@ public class WxPushEndpoint extends EnvelopRestEndpoint {
            wxPushService.sendWXTemplate(userName, idCard, phone, title, url, content, topidId, sessionId, contentString);
            return success("success");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -52,7 +52,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            Long count = result.getLongValue(ResponseContant.count);
            return PageEnvelop.getSuccessListWithPage("查询成功",(List<CourseDO>)result.get(ResponseContant.resultMsg),page,size,count);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -64,7 +64,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject result = courseService.courseDetail(id);
            return ObjEnvelop.getSuccess("查询成功",result);
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -80,7 +80,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("新增成功",result);
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -93,7 +93,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            courseService.startLiveCourse(id);
            return ObjEnvelop.getSuccess("开启成功");
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -106,7 +106,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            courseService.endLiveCourse(id);
            return ObjEnvelop.getSuccess("结束成功");
        }catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -119,7 +119,7 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            tencentVODUtil.setSecretKey(secretKey);
            return success(tencentVODUtil.getUploadSignature());
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -40,7 +40,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findNurseryLogByMonth(orgCode,patient,patientName,startDate,endDate));
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -53,7 +53,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findNurseryLogList(orgCode,recordDate));
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -66,7 +66,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.nuseryLogUnFilledIn(orgCode,recordDate));
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -83,7 +83,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return success("新增成功",nurseryLogService.addNurseryLog(patient, patientName, doctor, doctorName, orgCode, orgName, recordDate));
        } catch (Exception e) {
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -96,7 +96,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return success("新增成功",nurseryLogService.addCourseRecord(id, content, enclosure));
        } catch (Exception e) {
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -112,7 +112,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return success("新增成功",nurseryLogService.addDietRecord(id, eatFood, eatType, enclosure, intake, additionalNotes));
        } catch (Exception e) {
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -123,7 +123,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.nurseryDetail(id));
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -133,7 +133,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findDictDiet());
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -146,7 +146,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return nurseryLogService.findRecordByNurseryLogId(id,type);
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -157,7 +157,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return nurseryLogService.findDietRecord(id);
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -168,7 +168,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return nurseryLogService.findCourseRecord(id);
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -183,7 +183,7 @@ public class NurseryLogEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功！",nurseryLogService.findNurseryLogByPatient(patient,startDate,endDate));
        }catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
}

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

@@ -42,7 +42,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            Map<String, Integer> map = courseService.topStatusBarNum(patient);
            return ObjEnvelop.getSuccess("获取成功",map);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -61,7 +61,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            Long count = result.getLongValue(ResponseContant.count);
            return PageEnvelop.getSuccessListWithPage("查询成功",(List<Map<String,Object>>)result.get(ResponseContant.resultMsg),page,size,count);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -74,7 +74,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.orderInfo(id,type);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -90,7 +90,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getError(res, -1);
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -105,7 +105,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByCourse(longitude,latitude, pageSize, currentPage);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -121,7 +121,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByOrg(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -145,7 +145,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByteacher(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -158,7 +158,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseInfo(id);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -172,7 +172,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCatalogue(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -186,7 +186,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getOrgInfoById(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -202,7 +202,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getTecInfoById(doctor,orgCode,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -218,7 +218,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCoursrOrderStatusByPatient(patient,status,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -230,7 +230,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
        try {
            return success(courseService.getOrderInfo(orderId));
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -243,7 +243,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
        try {
            return success("查询成功",courseService.isEnrollment(patient,recruitStudentsId));
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -260,7 +260,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            }
            return success("报名成功",json.get("recordDO"));
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -276,7 +276,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
        try {
            return success(courseService.buyCourseOrder(patient,patientName,courseId,payType));
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -37,7 +37,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",recruitStudentService.onlineRegisterCount(doctorId));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -56,7 +56,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
            int count = result.getIntValue(ResponseContant.count);
            return success((List) result.get(ResponseContant.resultMsg), count, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -72,7 +72,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -89,7 +89,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
                return Envelop.getError(re,-1);
            }
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -103,7 +103,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
            recruitStudentService.refuse(id);
            return success("拒绝成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -34,7 +34,7 @@ import java.util.Map;
@RestController
@RequestMapping(value = "doctor/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "患者设备管理--医生端", description = "患者设备管理--医生端")
public class DoctorDeviceController extends EnvelopRestEndpoint {
public class DoctorDeviceController extends BaseController {
	private static Logger logger = LoggerFactory.getLogger(DoctorDeviceController.class);
	@Autowired
@@ -50,8 +50,6 @@ public class DoctorDeviceController extends EnvelopRestEndpoint {
	@Autowired
	private PatientDeviceDao patientDeviceDao;
	private BaseController baseController = new BaseController();
	@Autowired
	private JmsTemplate jmsTemplate;
@@ -71,7 +69,7 @@ public class DoctorDeviceController extends EnvelopRestEndpoint {
		try {
			List<Map<String,Object>> list = patientDeviceService.findByDoctor(patient, getUID(),page, pagesize);
			return baseController.write(200, "查询成功", "data", list);
			return write(200, "查询成功", "data", list);
		} catch (Exception ex) {
			return error(-1, ex.getMessage(),ex);
		}
@@ -85,7 +83,7 @@ public class DoctorDeviceController extends EnvelopRestEndpoint {
		try {
			DevicePatientDevice device = patientDeviceService.findById(id);
			return baseController.write(200, "查询成功", "data", device);
			return write(200, "查询成功", "data", device);
		} catch (Exception ex) {
			return error( -1, ex.getMessage(),ex);
		}
@@ -103,7 +101,7 @@ public class DoctorDeviceController extends EnvelopRestEndpoint {
			@RequestParam(value="device_sn",required = true) String deviceSn) {
		try {
			List<Map<String,String>> list = patientDeviceService.getDeviceUser(patient,deviceSn,type);
			return baseController.write(200, "获取设备绑定信息成功！", "data",list);
			return write(200, "获取设备绑定信息成功！", "data",list);
		} catch (Exception ex) {
			return error(-1, ex.getMessage(),ex);
		}
@@ -115,21 +113,7 @@ public class DoctorDeviceController extends EnvelopRestEndpoint {
									@ApiParam(name="deviceSn",value="设备SN码",defaultValue = "15L000002")
									@RequestParam(value="deviceSn",required = true) String deviceSn){
			JSONArray objects = patientDeviceService.getDeviceByDeviceSn(deviceSn,type);
			return baseController.write(200, "获取设备成功！", "data",objects);
	}
	public String error(int code, String msg,Exception e1) {
		try {
			Map<Object, Object> map = new HashMap<Object, Object>();
			ObjectMapper mapper = new ObjectMapper();
			ObjEnvelop objEnvelop = failedObjEnvelopException(e1);
			map.put("status", objEnvelop.getStatus());
			map.put("msg", objEnvelop.getMessage());
			return mapper.writeValueAsString(map);
		} catch (Exception e) {
			e.printStackTrace();
			return null;
		}
			return write(200, "获取设备成功！", "data",objects);
	}
}

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

@@ -32,7 +32,7 @@ public class PrivateDictEndpoint extends EnvelopRestEndpoint {
        try {
            return success(privateDictService.findByHospitalCodeAndDictCode(dictCode));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -57,7 +57,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return doctorService.doctorPage(name, orgCode, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -71,7 +71,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return ObjEnvelop.getSuccess("查询成功",doctorService.doctorInfo(doctorId,isRole));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -83,7 +83,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return ObjEnvelop.getSuccess("查询成功",capacityAssessmentRecordService.getPatientNum(doctorId));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -114,7 +114,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            return ListEnvelop.getSuccess("查询成功", doctorService.getOrgList(doctorId,orgType));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -133,7 +133,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功", doctorService.getOrgDoctor(orgCode,deptCode,page,size));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -152,7 +152,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getOrgDoctorByName(getUID(),orgType,name,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -174,7 +174,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getTeacherChildren(doctor,searchType,name,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -186,7 +186,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getTeacherChildrenCount(doctor));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -199,7 +199,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getNotificationCount(doctor));//,type
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -218,7 +218,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getArchiveList(type, signStatus,name,page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -228,7 +228,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getArchiveNum()) ;
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -239,7 +239,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            entranceUtil.initData();
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -250,7 +250,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            entranceUtil.deleteAll();
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -51,7 +51,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
        try {
            return baseDoctorService.queryList(city,hospital,status,name,type,typeCode,dept,page,pageSize);
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -71,7 +71,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            }
            return failed("查询失败");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -90,7 +90,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            }
            return success("保存成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -105,7 +105,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            Boolean update = baseDoctorService.updateList(jsonArray);
            return success("保存成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -134,7 +134,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
        try {
            return success(baseDoctorService.updateDoctorPw(id,pw,orgPw));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -37,7 +37,7 @@ public class DoctorToDoWorkEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.getPreventLost(doctor,id,serviceSype));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -511,7 +511,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("操作成功",doctorDoorCoachOrderService.payOrder(orderId, payWay));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -592,7 +592,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("转接成功",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -620,7 +620,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("请求成功", imService.getConsultInfoAndPatientInfo(consult, patientCode));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -633,7 +633,7 @@ public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
            JSONObject detail = consultTeamService.queryByConsultCode(code,type);
            return ObjEnvelop.getSuccess("查询成功", detail.get("data"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }

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

@@ -49,7 +49,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return success("发送成功");
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -65,7 +65,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return success(result);
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -77,7 +77,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            patientDoorCoachOrderService.delete(ids.split(","));
            return success("删除成功");
        }catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -92,7 +92,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -110,7 +110,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -126,7 +126,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            int count = result.getIntValue(ResponseContant.count);
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -140,7 +140,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            Map<String, Integer> map = patientDoorCoachOrderService.getNumGroupByStatus(patient);
            return ObjEnvelop.getSuccess( "获取成功", map);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -190,7 +190,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
                    ss,createTimeStart,createTimeEnd,serverDoctorName,patient,page,pageSize, type);
            return ObjEnvelop.getSuccess( "获取成功",result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -214,7 +214,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return ObjEnvelop.getSuccess( "获取成功",  baseDoorCoachOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -236,7 +236,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            return ListEnvelop.getSuccess( "获取成功",patientDoorCoachOrderService.selectItemsByHospital(hospital,serverItemName));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
}

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

@@ -37,7 +37,7 @@ public class ChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("新建成功",examinationService.newRecord(patient,examTime,monthAge,height,weight,headCircumference)) ;
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -48,7 +48,7 @@ public class ChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",examinationService.getRecordDetailById(recordId));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -72,7 +72,7 @@ public class ChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return examinationService.getRecordList(patient,type,orgCode,startTime,endTime,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
    

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

@@ -37,7 +37,7 @@ public class DoctorChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("新建成功",examinationService.newRecord(patient,examTime,monthAge,height,weight,headCircumference)) ;
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -48,7 +48,7 @@ public class DoctorChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",examinationService.getRecordDetailById(recordId));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -72,7 +72,7 @@ public class DoctorChildrenExaminationEndpoint extends EnvelopRestEndpoint {
        try {
            return examinationService.getRecordList(patient,type,orgCode,startTime,endTime,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
}

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

@@ -81,7 +81,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success("添加成功");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -119,7 +119,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "更新成功");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -146,7 +146,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "删除成功");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -164,7 +164,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            }
            return success( "授权成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -193,7 +193,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess( "查询成功", data);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -205,7 +205,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -234,7 +234,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("未授权", json,100);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -254,7 +254,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            JSONObject result = familyMemberService.isRegister(idcard, getUID());
            return ObjEnvelop.getSuccess( "查询成功",  result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -270,7 +270,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            JSONObject result = familyMemberService.checkFamilyMember(memberCode);
            return ObjEnvelop.getSuccess( "验证成功",  result);
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -308,7 +308,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "添加成功");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -359,7 +359,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "添加成功");
            }
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -36,7 +36,7 @@ public class PatientLabelEndpoint extends EnvelopRestEndpoint {
        try{
            return ListEnvelop.getSuccess("查询成功",patientLableService.findSignPatientLabelNumByTeamCode(teamCode));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -56,7 +56,7 @@ public class PatientLabelEndpoint extends EnvelopRestEndpoint {
        try{
            return patientLableService.findSignPatientLabelListByTeamCode(teamCode, labelCode, name, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }

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

@@ -46,7 +46,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            Long count = result.getLongValue(ResponseContant.count);
            return PageEnvelop.getSuccessListWithPage("查询成功",(List<Map<String,Object>>)result.get(ResponseContant.resultMsg),page,size,count);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -59,7 +59,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            Map<String, Integer> map = lifeCareOrderService.getNumGroupByStatus(doctor);
            return ObjEnvelop.getSuccess("获取成功",map);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -73,7 +73,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -99,7 +99,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getSuccess("记录成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -124,7 +124,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getSuccess("登记成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -138,7 +138,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
        try{
            return lifeCareOrderService.getPatientOrderList(patient, status, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -154,7 +154,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return success(result);
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -183,7 +183,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return success(result);
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -38,7 +38,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
        try{
            result = lifeCareOrderService.create(jsonData,getUID());
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
@@ -58,7 +58,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
                return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
            }
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
@@ -74,7 +74,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -93,7 +93,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
            int count = result.getIntValue(ResponseContant.count);
            return success((List) result.get(ResponseContant.resultMsg), count, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -103,7 +103,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict());
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -117,7 +117,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }

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

@@ -35,7 +35,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
        try{
            result = lifeCareOrderService.create(jsonData,getUID());
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
@@ -55,7 +55,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
                return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
            }
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
@@ -71,7 +71,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -90,7 +90,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
            int count = result.getIntValue(ResponseContant.count);
            return success((List) result.get(ResponseContant.resultMsg), count, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -100,7 +100,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict());
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -114,7 +114,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -31,7 +31,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.findDoctorAllMessage(doctor,type));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -48,7 +48,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -69,7 +69,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorMessageService.getOrgNoticeList(orgCode,createUser,beginTime,endTime,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -80,7 +80,7 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.orgNoticeDetail(noticeId));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }

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

@@ -40,7 +40,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return patientMessageService.getNoticeList(patient,beginTime,endTime,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -53,7 +53,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientMessageService.orgNoticeDetail(noticeId,patient));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -64,7 +64,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessage(patient));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -78,7 +78,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessageList(patient,type));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -90,7 +90,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
            patientMessageService.updateMessageRead(messageId);
            return Envelop.getSuccess("修改成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -32,7 +32,7 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("获取成功",orgService.findOrgList(type,name,orgCode));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -45,7 +45,7 @@ public class OrgEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("获取成功",orgService.findOrgByCode(orgCode));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }

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

@@ -44,7 +44,7 @@ public class PatientContactsEndpoint extends EnvelopRestEndpoint {
            JSONArray result = contactsService.getPatientContacts(patient,isContacts);
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -62,7 +62,7 @@ public class PatientContactsEndpoint extends EnvelopRestEndpoint {
            contactsService.setContacts(fid,patient);
            return ObjEnvelop.getSuccess("设置成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -78,7 +78,7 @@ public class PatientContactsEndpoint extends EnvelopRestEndpoint {
            BaseOrgDO result = contactsService.getContactsOrg(patient);
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -96,7 +96,7 @@ public class PatientContactsEndpoint extends EnvelopRestEndpoint {
            contactsService.setContactsOrg(patient,orgCode);
            return ObjEnvelop.getSuccess("设置成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -113,7 +113,7 @@ public class PatientContactsEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess( "查询成功", contactsService.findSignOrg(patient,lng,lat));
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }

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

@@ -43,7 +43,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "testException")
    @ApiOperation(value = "测试异常")
    public String testException(String type) throws Exception {
    public String testException2(String type) throws Exception {
        if("1".equals(type)){
            throw new NullPointerException();
@@ -67,7 +67,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            }
            return success(patientDO);
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -80,7 +80,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -93,7 +93,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -111,7 +111,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return patientService.myPatientPage(name, doctorId, page, size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -125,7 +125,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功",patientService.findPatientById(id,isCapacity));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -139,7 +139,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            patientService.updLatLon(latLon, patientId);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -161,7 +161,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
                    return failed("修改失败,"+e.getMessage(),-1);
                }
            }
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -172,7 +172,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("修改成功",patientLabelDao.findByPatient(patientId));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -187,7 +187,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            patientService.updPatientLabel(jsonData, patientId);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -217,7 +217,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return ListEnvelop.getSuccess("查询成功",patientService.getTeacherOrgList(patient));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -238,7 +238,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try {
            return patientService.getTeacherList(patient,orgCode,deptCode,page,size);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -249,7 +249,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientService.getFamilyAllArchiveType(patient));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -264,7 +264,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
}

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

@@ -45,7 +45,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -72,7 +72,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            page = page>1?page-1:0;
            return securityMonitoringOrderService.getSecurityOrderList(doctor,serverDoctor,patientName, patient, status, topicItem,page, pageSize);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }
@@ -84,7 +84,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityOrderUnCompleteList(doctor));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -103,7 +103,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -120,7 +120,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("修改成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -137,7 +137,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("接单成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -158,7 +158,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("工单已取消",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -186,7 +186,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("操作成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -212,7 +212,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("保存成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -228,7 +228,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("取消成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -253,7 +253,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            EmergencyWarnConclusionDO doorConclusion = securityMonitoringOrderService.getDoorConclusion(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorConclusion);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -273,7 +273,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -287,7 +287,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityServerDoctor(patient,topicItem));
        }catch (Exception e){
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException2(e);
        }
    }
@@ -301,7 +301,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -321,7 +321,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getString("resultMsg"));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -345,7 +345,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -367,7 +367,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -36,7 +36,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.statisticsTotalAmount(endDate);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -47,7 +47,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        try {
            return success(statisticsService.serviceRankingAnalysis(endDate,orgType));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -58,7 +58,7 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.realTimeData();
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

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

@@ -38,7 +38,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.statisticsTotalAmount(endDate, area, level, index, type);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -53,7 +53,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.consultAnalysis(endDate, area, level, type);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -68,7 +68,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.patientAnalysis(endDate, area, level, index);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -87,7 +87,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONArray result = statisticsService.addLine(startDate,endDate, area, level, index, timeLevel,interval,lowLevel);
            return success(result);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -101,7 +101,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONArray result = statisticsService.capacityAssessment(endDate, area, level);
            return success(result);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -115,7 +115,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONArray result = statisticsService.doorCoachItems(endDate, area, level);
            return success(result);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -129,7 +129,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONArray result = statisticsService.lifeCareItems(endDate, area, level);
            return success(result);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -143,7 +143,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.lifeCareAnalysis(endDate, area, level);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -157,7 +157,7 @@ public class StatisticsEndpoint extends EnvelopRestEndpoint {
            JSONObject result = statisticsService.doorCoachAnalysis(endDate, area, level);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }

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

@@ -43,7 +43,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            BaseTeamDO teamDO = teamService.createTeam(teamName, leaderCode, orgCode, orgName);
            return ObjEnvelop.getSuccess("创建成功",teamDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -55,7 +55,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            teamService.deleteTeam(teamCode);
            return success("删除成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -69,7 +69,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("更新成功",team);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -83,7 +83,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("更新成功",team);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -94,7 +94,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            BaseTeamDO team = teamDao.findOne(teamCode);
            return ObjEnvelop.getSuccess("获取成功",team);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -111,7 +111,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            }
            return success("添加成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -123,7 +123,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("获取成功",teamService.findMembers(teamCode,name));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -138,7 +138,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            return success("移除成功");
        } catch (Exception e) {
            return failedException(e);
            return failedException2(e);
        }
    }
@@ -152,7 +152,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess("获取成功",team);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -176,7 +176,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess("获取成功",teamList);
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -187,7 +187,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            JSONObject result =  teamService.getTeamInfo(teamCode);
            return ObjEnvelop.getSuccess("查询成功",result);
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -199,7 +199,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            List<BaseTeamDO> teams =  teamService.getHospitalTeams(hospital);
            return ListEnvelop.getSuccess("查询成功",teams);
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
    @RequestMapping(value = "/teams/{hospital}/noTranslateAdminTeamLeaderName", method = RequestMethod.GET)
@@ -209,7 +209,7 @@ public class TeamEndpoint extends EnvelopRestEndpoint {
            List<BaseTeamDO> teams =  teamDao.findByOrgCode(hospital);
            return ListEnvelop.getSuccess("查询成功",teams);
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
}

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

@@ -40,7 +40,7 @@ public class EmeAsEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发起成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/patient/PatientNoLoginEndPoint.java

@@ -90,7 +90,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            redisTemplate.expire(key,10, TimeUnit.SECONDS);
            return success(PatientRequestMapping.Wechat.api_success,openid);
        } catch (Exception e){
            return  failedException(e);
            return  failedException2(e);
        }
    }
@@ -106,7 +106,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByOrg(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -120,7 +120,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getOrgInfoById(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -136,7 +136,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getTecInfoById(doctor,orgCode,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -151,7 +151,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("获取成功",orgService.findOrgList(type,name,orgCode));
        } catch (Exception e) {
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -167,7 +167,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        try{
            return ListEnvelop.getSuccess("查询成功",patientNoLoginService.findSignOrg(patient,name,type));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }

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

@@ -63,7 +63,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findOrgLocations());
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -73,7 +73,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findPatinetLocations());
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -84,7 +84,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findPatinetByName(name));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -95,7 +95,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findNews(size));
        }catch (Exception e){
            return failedListEnvelopException(e);
            return failedListEnvelopException2(e);
        }
    }
@@ -108,7 +108,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientInfo(patient,patientType));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -125,7 +125,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientEvent(patient,patientType,page,pageSize));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -142,7 +142,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getServiceOrder(patient,patientType,page,pageSize));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -185,7 +185,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return ObjEnvelop.getSuccess( "获取成功",  baseDoorCoachOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -199,7 +199,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -217,7 +217,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -235,7 +235,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
@@ -249,7 +249,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return patientInfoPlatFormService.getEmergencyWarnOrderList(page,pageSize);
        }catch (Exception e){
            return failedPageEnvelopException(e);
            return failedPageEnvelopException2(e);
        }
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/securrity/SecuMonOrderEndpoint.java

@@ -41,7 +41,7 @@ public class SecuMonOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            return failedObjEnvelopException(e);
            return failedObjEnvelopException2(e);
        }
    }
}