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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -7963,6 +7963,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
                        patient.setSalt(salt);
                        patient.setMobile(mobile);
                        String sexString =IdCardUtil.getSexForIdcard_new(idcard);
                        if (StringUtils.isNoneBlank(sexString)){
                            patient.setSex(Integer.parseInt(sexString));
                        }else {
                            patient.setSex(3);
                        }
                        patient.setDel("1");
                        patient.setEnabled(1);
                        patient.setLocked(0);
@@ -8460,6 +8466,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            String pw = mobile.substring(mobile.length() - 6);
            patient.setIdcard(archiveVO.getSfzhao());
            String sexString =IdCardUtil.getSexForIdcard_new(archiveVO.getSfzhao());
            if (StringUtils.isNoneBlank(sexString)){
                patient.setSex(Integer.parseInt(sexString));
            }else {
                patient.setSex(3);
            }
            patient.setName(archiveVO.getXming0());
            patient.setPassword(MD5.md5Hex(pw + "{" + salt + "}"));
            patient.setSalt(salt);

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

@@ -1,7 +1,10 @@
package com.yihu.jw.care.endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.base.dict.BaseExceptionDictDO;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import com.yihu.jw.restmodel.exception.dao.BaseExceptionDictDao;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
@@ -36,6 +39,9 @@ public class BaseController {
    @Autowired
    protected HttpServletRequest request;
    @Autowired
    protected BaseExceptionDictDao baseExceptionDictDao;
    /**
     * 獲取髮送請求用戶的uid
@@ -292,6 +298,26 @@ public class BaseController {
        }
    }
    public String error(int code, String msg,Exception e) {
        try {
            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());
            }
            return mapper.writeValueAsString(map);
        } catch (Exception e1) {
            e.printStackTrace();
            return null;
        }
    }
    /**
     * 接口处理成功
     *

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

@@ -36,8 +36,7 @@ public class PatientBedApplyEndPoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("操作成功", result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("申请失败" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -48,8 +47,7 @@ public class PatientBedApplyEndPoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功", patientBedApplyService.getApplyList(doctor));
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
}

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

@@ -43,8 +43,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发起成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("发起失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -62,8 +61,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -81,8 +79,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -107,8 +104,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -123,8 +119,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -150,8 +145,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess( "查询成功",assistanceService.getOrderList(patientId,patientName,doctor,status,page,pageSize,"desc"));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败"+e.getMessage());
            return failedListEnvelopException(e);
        }
    }
@@ -173,8 +167,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ListEnvelop.getSuccess( "查询成功",assistanceService.doctorGetOrderList(patientId,doctor,"1",page,pageSize,"asc"));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败"+e.getMessage());
            return failedListEnvelopException(e);
        }
    }
@@ -191,8 +184,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("取消成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("取消失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -216,8 +208,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("保存成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("保存失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -241,8 +232,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("定位更新失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -264,8 +254,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getString("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("定位更新失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -286,8 +275,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发送成功","");
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("发送失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -302,8 +290,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("发送成功",assistanceService.test(doctor, orderID));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("发送失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -323,8 +310,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getString("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -341,8 +327,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("修改成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("修改失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -352,8 +337,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
        try {
            return null;
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return failedObjEnvelopException(e);
        }
    }
}

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

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

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

@@ -46,18 +46,23 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "consult", value = "咨询CODE")
            @RequestParam(value = "consult",required = true) String consult,
            @ApiParam(name = "doctorCode", value = "医生COEE")
            @RequestParam(value = "doctorCode",required = true) String doctorCode) throws Exception {
        int resutl = consultService.finish(consult,doctorCode,2);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorCode);
        JSONObject msgObj = new JSONObject();
        msgObj.put("msg",baseDoctorDO.getName()+"结束了咨询");
        msgObj.put("consultcode",consult);
        String jsonStr = "";
            @RequestParam(value = "doctorCode",required = true) String doctorCode) {
        try {
            int resutl = consultService.finish(consult,doctorCode,2);
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorCode);
            JSONObject msgObj = new JSONObject();
            msgObj.put("msg",baseDoctorDO.getName()+"结束了咨询");
            msgObj.put("consultcode",consult);
            String jsonStr = "";
        if(1 == resutl){
            jsonStr = "{\"id\":\""+ UUID.randomUUID().toString()+"\",\"sender_id\":\""+doctorCode+"\",\"sender_name\":\"系统\",\"timestamp\":"+System.currentTimeMillis()+",\"content_type\":7,\"content\":"+msgObj.toString()+",\"business_type\":1}";
            if(1 == resutl){
                jsonStr = "{\"id\":\""+ UUID.randomUUID().toString()+"\",\"sender_id\":\""+doctorCode+"\",\"sender_name\":\"系统\",\"timestamp\":"+System.currentTimeMillis()+",\"content_type\":7,\"content\":"+msgObj.toString()+",\"business_type\":1}";
            }
            return success(jsonStr);
        }catch (Exception e){
           return failedException(e);
        }
        return success(jsonStr);
    }
    @GetMapping(value = "getConsultInfoAndPatientInfo")
@@ -66,7 +71,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "consult", value = "咨询CODE")
            @RequestParam(value = "consult",required = false) String consult,
            @ApiParam(name = "patientCode", value = "居民COEE")
            @RequestParam(value = "patientCode",required = false) String patientCode)throws Exception {
            @RequestParam(value = "patientCode",required = false) String patientCode){
        try {
            return success("请求成功",imService.getConsultInfoAndPatientInfo(consult,patientCode));
        }catch (Exception e){
@@ -97,7 +102,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page",required = false) int page,
            @ApiParam(name = "pagesize", value = "分页大小")
            @RequestParam(value = "pagesize",required = false) int pagesize
    )throws Exception{
    ){
        try {
            List<Map<String,Object>>  data = consultService.findConsultRecordByDoctor(doctor, id,type,status, page,pagesize, symptoms,start_time,end_time,name);

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

@@ -117,7 +117,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "patient", value = "居民CODE")
			@RequestParam(value = "patient",required = true) String patient,
			@ApiParam(name="type",value = "咨询类型 23新生儿在线咨询 24老人在线咨询")
			@RequestParam(value = "type",required = false,defaultValue = "23") Integer type)throws Exception {
			@RequestParam(value = "type",required = false,defaultValue = "23") Integer type){
		try {
			if (StringUtils.isBlank(orgCode)&&StringUtils.isBlank(sessionId)){
				return Envelop.getError("参数错误请求失败");
@@ -136,7 +136,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "patient", value = "居民CODE")
			@RequestParam(value = "patient",required = true) String patient,
			@ApiParam(name="type",value = "咨询类型 23新生儿在线咨询 24老人在线咨询")
			@RequestParam(value = "type",required = false,defaultValue = "23") Integer type)throws Exception {
			@RequestParam(value = "type",required = false,defaultValue = "23") Integer type){
		try {
			String consultCode = consultService.getUnfinishedConsult(patient, doctor, type);
			return success("请求成功",consultCode);
@@ -161,55 +161,58 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "type", value = "咨询类型:23在线咨询,24老人在线咨询")
			@RequestParam(value = "type",required = false) Integer type,
			@ApiParam(name = "source", value = "咨询类型来源")
			@RequestParam(value = "source",required = false) String source)throws Exception{
			@RequestParam(value = "source",required = false) String source){
		try{
			System.out.println("symptoms="+symptoms);
		System.out.println("symptoms="+symptoms);
		if (type == null) {
			type = 23;
		}
		ConsultTeamDo consult = new ConsultTeamDo();
		// 设置咨询类型：23 在线咨询 24老人在线咨询
		consult.setType(type);
		// 设置主要症状
		consult.setSymptoms(symptoms);
		// 设置咨询图片URL
		consult.setImages(images);
		// 设置咨询语音URL
		consult.setVoice(voice);
		consult.setDoctor(doctor);
		consult.setPatient(patient);
		// 保存到数据库
		synchronized (patient.intern()){//新增同步方法
			JSONObject re = null;
			re = consultService.addTeamConsult(consult, patient,doctor,source);
			//发送系统消息
			SystemMessageDO systemMessageDO = new SystemMessageDO();
			systemMessageDO.setTitle("新增在线咨询");
			systemMessageDO.setType("850");
			if (type==24){
				systemMessageDO.setType("851");
			if (type == null) {
				type = 23;
			}
			ConsultTeamDo consult = new ConsultTeamDo();
			// 设置咨询类型：23 在线咨询 24老人在线咨询
			consult.setType(type);
			// 设置主要症状
			consult.setSymptoms(symptoms);
			// 设置咨询图片URL
			consult.setImages(images);
			// 设置咨询语音URL
			consult.setVoice(voice);
			consult.setDoctor(doctor);
			consult.setPatient(patient);
			// 保存到数据库
			synchronized (patient.intern()){//新增同步方法
				JSONObject re = null;
				re = consultService.addTeamConsult(consult, patient,doctor,source);
				//发送系统消息
				SystemMessageDO systemMessageDO = new SystemMessageDO();
				systemMessageDO.setTitle("新增在线咨询");
				systemMessageDO.setType("850");
				if (type==24){
					systemMessageDO.setType("851");
				}
				systemMessageDO.setReceiver(re.getString("doctor"));
				systemMessageDO.setReceiverName(re.getString("doctorName"));
				systemMessageDO.setRelationCode(re.getString("sessiond_id"));
				systemMessageDO.setSender(re.getString("patient"));
				systemMessageDO.setSenderName(re.getString("patientName"));
				net.sf.json.JSONObject data = new net.sf.json.JSONObject();
				data.put("name",re.getString("patientName"));
				data.put("age", IdCardUtil.getAgeForIdcard(re.getString("patient_idcard")));
				data.put("gender",IdCardUtil.getSexForIdcard_new(re.getString("patient_idcard")));
				data.put("question",symptoms);
				data.put("type",1);
				systemMessageDO.setData(data.toString());
				consultService.saveMessage(systemMessageDO);
				serviceNewsService.addServiceNews(re.getString("patientName"),patient,"2",null);
			}
			systemMessageDO.setReceiver(re.getString("doctor"));
			systemMessageDO.setReceiverName(re.getString("doctorName"));
			systemMessageDO.setRelationCode(re.getString("sessiond_id"));
			systemMessageDO.setSender(re.getString("patient"));
			systemMessageDO.setSenderName(re.getString("patientName"));
			net.sf.json.JSONObject data = new net.sf.json.JSONObject();
			data.put("name",re.getString("patientName"));
			data.put("age", IdCardUtil.getAgeForIdcard(re.getString("patient_idcard")));
			data.put("gender",IdCardUtil.getSexForIdcard_new(re.getString("patient_idcard")));
			data.put("question",symptoms);
			data.put("type",1);
			systemMessageDO.setData(data.toString());
			consultService.saveMessage(systemMessageDO);
			serviceNewsService.addServiceNews(re.getString("patientName"),patient,"2",null);
		}
		return success("操作成功", consult);
			return success("操作成功", consult);
		}catch(Exception e){
			return failedException(e);
		}
	}
	@GetMapping(value = "findConsultDoctor")
@@ -224,7 +227,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "page", value = "第几页")
			@RequestParam(value = "page",required = false) int page,
			@ApiParam(name = "pagesize", value = "分页大小")
			@RequestParam(value = "pagesize",required = false) int pagesize)throws Exception{
			@RequestParam(value = "pagesize",required = false) int pagesize){
		try {
			List<Map<String,Object>>  data = consultService.findConsultDoctor(orgCode, patient,type,page,pagesize);
			return success(data);
@@ -253,7 +256,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "pagesize", value = "分页大小")
			@RequestParam(value = "pagesize",required = false) int pagesize,
			@ApiParam(name = "doctorName", value = "医生名字")
			@RequestParam(value = "doctorName",required = false) String doctorName)throws Exception{
			@RequestParam(value = "doctorName",required = false) String doctorName){
		try {
			List<Map<String,Object>>  data = consultService.findConsultRecordByPatient(patient, id,type, page,pagesize, title,symptoms,status,doctorName);
			Long total = consultService.countConsultRecordByPatient(patient, id,type,title,symptoms,doctorName,status);
@@ -273,25 +276,29 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "consult", value = "咨询CODE")
			@RequestParam(value = "consult",required = false) String consult,
			@ApiParam(name = "patientCode", value = "居民COEE")
			@RequestParam(value = "patientCode",required = false) String patientCode) throws Exception {
		int resutl = consultService.finish(consult,patientCode,1);
		BasePatientDO basePatientDO = basePatientService.findByIdAndDel(patientCode);
		JSONObject msgObj = new JSONObject();
		msgObj.put("msg",basePatientDO.getName()+"结束了咨询");
		msgObj.put("consultcode",consult);
		String jsonStr = "";
		if(1 == resutl){
			jsonStr = "{\"id\":\""+UUID.randomUUID().toString()+"\",\"sender_id\":\""+patientCode+"\",\"sender_name\":\"系统\",\"timestamp\":"+System.currentTimeMillis()+",\"content_type\":7,\"content\":"+msgObj.toString()+",\"business_type\":1}";
		}
			@RequestParam(value = "patientCode",required = false) String patientCode) {
		try {
			int resutl = consultService.finish(consult,patientCode,1);
			BasePatientDO basePatientDO = basePatientService.findByIdAndDel(patientCode);
			JSONObject msgObj = new JSONObject();
			msgObj.put("msg",basePatientDO.getName()+"结束了咨询");
			msgObj.put("consultcode",consult);
			String jsonStr = "";
			if(1 == resutl){
				jsonStr = "{\"id\":\""+UUID.randomUUID().toString()+"\",\"sender_id\":\""+patientCode+"\",\"sender_name\":\"系统\",\"timestamp\":"+System.currentTimeMillis()+",\"content_type\":7,\"content\":"+msgObj.toString()+",\"business_type\":1}";
			}
		return success(jsonStr);
			return success(jsonStr);
		}catch (Exception e){
			return failedException(e);
		}
	}
	@GetMapping(value = "getTopic")
	@ApiOperation(value = "根据咨询CODE获取session_id", notes = "根据咨询CODE获取session_id")
	public Envelop getTopic(
			@ApiParam(name = "consult", value = "咨询CODE")
			@RequestParam(value = "consult",required = false) String consult)throws Exception {
			@RequestParam(value = "consult",required = false) String consult) {
		try {
			return success("请求成功",imService.getTopic(consult));
		}catch (Exception e){
@@ -311,8 +318,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "times", value = "")
			@RequestParam(value = "times",required = false) Integer times,
			@ApiParam(name = "patientCode", value = "居民CODE")
			@RequestParam(value = "patientCode",required = false) String patientCode) throws Exception {
			@RequestParam(value = "patientCode",required = false) String patientCode){
		try {
			List<String> failed = new ArrayList<>();
			//处理语音文件
@@ -348,10 +354,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@ApiOperation(value = "获取会话成员")
	public ListEnvelop participants(
			@ApiParam(name = "sessionId", value = "会话ID")
			@RequestParam(value = "sessionId",required = true) String sessionId)throws Exception{
		
		JSONArray participants = imService.getSessions(sessionId);
		return success(participants);
			@RequestParam(value = "sessionId",required = true) String sessionId){
		try{
			JSONArray participants = imService.getSessions(sessionId);
			return success(participants);
		}catch (Exception e){
			return failedListEnvelopException(e);
		}
	}
	
	@GetMapping(value = BaseHospitalRequestMapping.PatientIM.getSessionMessage)
@@ -366,9 +375,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "page", value = "第几页")
			@RequestParam(value = "page",required = true) int page,
			@ApiParam(name = "pagesize", value = "分页数")
			@RequestParam(value = "pagesize",required = true) int pagesize)throws Exception{
		JSONArray messageArray = imService.getSessionMessage(sessionId, startMsgId, endMsgId, page, pagesize, getUID());
		return success(messageArray);
			@RequestParam(value = "pagesize",required = true) int pagesize){
		try{
			JSONArray messageArray = imService.getSessionMessage(sessionId, startMsgId, endMsgId, page, pagesize, getUID());
			return success(messageArray);
		}catch (Exception e){
			return failedListEnvelopException(e);
		}
	}
	
@@ -377,28 +390,32 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	public Envelop getSign(@ApiParam(name = "pageUrl", value = "授权页面")
	                       @RequestParam(value = "pageUrl", required = true)String pageUrl,
	                       @ApiParam(name = "wxId", value = "微信id")
	                       @RequestParam(value = "wxId", required = true)String wxId) throws Exception {
		logger.info("pageUrl="+pageUrl);
		logger.info("wxId="+wxId);
		String ticket = wechatInfoService.getJsapi_ticketByToken(wxId);
		WxWechatDO wxWechatDO = wechatDao.findById(wxId);
		Map<Object, Object> map = new HashMap<Object, Object>();
		if (ticket != null) {
			String noncestr = UUID.randomUUID().toString();
			long timestamp = System.currentTimeMillis() / 1000;
			String url = pageUrl;
			logger.info("getSign.url="+url);
			String str = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
			logger.info("getSign.str="+str);
			// sha1加密
			String signature = SHA1(str);
			map.put("noncestr", noncestr);
			map.put("timestamp", timestamp);
			map.put("signature", signature);
			map.put("appid", wxWechatDO.getAppId());
			return success(PatientRequestMapping.Wechat.api_success,map);
	                       @RequestParam(value = "wxId", required = true)String wxId){
		try{
			logger.info("pageUrl="+pageUrl);
			logger.info("wxId="+wxId);
			String ticket = wechatInfoService.getJsapi_ticketByToken(wxId);
			WxWechatDO wxWechatDO = wechatDao.findById(wxId);
			Map<Object, Object> map = new HashMap<Object, Object>();
			if (ticket != null) {
				String noncestr = UUID.randomUUID().toString();
				long timestamp = System.currentTimeMillis() / 1000;
				String url = pageUrl;
				logger.info("getSign.url="+url);
				String str = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
				logger.info("getSign.str="+str);
				// sha1加密
				String signature = SHA1(str);
				map.put("noncestr", noncestr);
				map.put("timestamp", timestamp);
				map.put("signature", signature);
				map.put("appid", wxWechatDO.getAppId());
				return success(PatientRequestMapping.Wechat.api_success,map);
			}
			return failed(PatientRequestMapping.Wechat.api_error);
		}catch (Exception e){
			return failedException(e);
		}
		return failed(PatientRequestMapping.Wechat.api_error);
	}
	
	/**
@@ -434,9 +451,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	                                       @ApiParam(name = "userid", value = "新增成员ID，多个以英文逗号隔开", defaultValue = "1")
	                                       @RequestParam(value = "userid", required = true) String userid,
	                                       @ApiParam(name = "olduserid", value = "删除的成员id")
	                                       @RequestParam(value = "olduserid", required = false) String olduserid)throws Exception{
		imService.updateParticipant(sessionid,userid,olduserid);
		return success("操作成功");
	                                       @RequestParam(value = "olduserid", required = false) String olduserid){
		try {
			imService.updateParticipant(sessionid,userid,olduserid);
			return success("操作成功");
		} catch (Exception e) {
			return failedException(e);
		}
	}
	
	@PostMapping(value = "messageAppend")
@@ -458,47 +479,51 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "type", required = false) String type,
			@ApiParam(name = "times", value = "times", defaultValue = "")
			@RequestParam(value = "times", required = false) Integer times
	)throws Exception{
		List<String> failed = new ArrayList<>();
		//处理语音文件
		if(!org.springframework.util.StringUtils.isEmpty(wechat_appid)){
			if("3".equalsIgnoreCase(content_type)){//语音文件
				String voicepath = imService.fetchWxVoices(wechat_appid);
				logger.info("voice_path:"+voicepath);
				JSONObject obj = new JSONObject();
				String voiceurl = "";
				// 将临时语音拷贝到正式存储路径下
				if (org.apache.commons.lang3.StringUtils.isNotEmpty(voicepath)) {
					voiceurl = fileUtil.copyTempVoice(voicepath,fastdfs_file_url);
					obj.put("path", voiceurl);
					obj.put("times", times);
					content = obj.toString();
				}
			}else if("2".equalsIgnoreCase(content_type)){//图片文件
				String imagepath = imService.fetchWxImages(wechat_appid);
				logger.info("image_path:"+imagepath);
				String imgeUrl = "";
				// 将临时语音拷贝到正式存储路径下
				if (org.apache.commons.lang3.StringUtils.isNotEmpty(imagepath)) {
					imgeUrl = fileUtil.copyTempVoice(imagepath,fastdfs_file_url);
					content = imgeUrl;
				}
			}else{
	){
		try {
			List<String> failed = new ArrayList<>();
			//处理语音文件
			if(!org.springframework.util.StringUtils.isEmpty(wechat_appid)){
				if("3".equalsIgnoreCase(content_type)){//语音文件
					String voicepath = imService.fetchWxVoices(wechat_appid);
					logger.info("voice_path:"+voicepath);
					JSONObject obj = new JSONObject();
					String voiceurl = "";
					// 将临时语音拷贝到正式存储路径下
					if (org.apache.commons.lang3.StringUtils.isNotEmpty(voicepath)) {
						voiceurl = fileUtil.copyTempVoice(voicepath,fastdfs_file_url);
						obj.put("path", voiceurl);
						obj.put("times", times);
						content = obj.toString();
					}
				}else if("2".equalsIgnoreCase(content_type)){//图片文件
					String imagepath = imService.fetchWxImages(wechat_appid);
					logger.info("image_path:"+imagepath);
					String imgeUrl = "";
					// 将临时语音拷贝到正式存储路径下
					if (org.apache.commons.lang3.StringUtils.isNotEmpty(imagepath)) {
						imgeUrl = fileUtil.copyTempVoice(imagepath,fastdfs_file_url);
						content = imgeUrl;
					}
				}else{
				}
			}
			session_id = imService.getPatientGuaidenceConsult(sender_id,session_id,type);
			String result = imService.patientGuaidenceAppend(sender_id,sender_name,session_id,content_type,content,"1",extend);
			List<BaseDoctorRoleDO> doctorRoleDOS = doctorRoleDao.findByRoleCode("guidance");
			for (BaseDoctorRoleDO doctorRoleDO:doctorRoleDOS){
				System.out.println("发送外层SOCKET消息：通知医生导诊");
				JSONObject object = new JSONObject();
				object.put("socket_sms_type",13);
				object.put("relation_code",session_id);
				imService.sendWaiSocketMessage(sender_id,doctorRoleDO.getDoctorCode(),object.toString(),"1");
			}
		}
		session_id = imService.getPatientGuaidenceConsult(sender_id,session_id,type);
		String result = imService.patientGuaidenceAppend(sender_id,sender_name,session_id,content_type,content,"1",extend);
		List<BaseDoctorRoleDO> doctorRoleDOS = doctorRoleDao.findByRoleCode("guidance");
		for (BaseDoctorRoleDO doctorRoleDO:doctorRoleDOS){
			System.out.println("发送外层SOCKET消息：通知医生导诊");
			JSONObject object = new JSONObject();
			object.put("socket_sms_type",13);
			object.put("relation_code",session_id);
			imService.sendWaiSocketMessage(sender_id,doctorRoleDO.getDoctorCode(),object.toString(),"1");
		}
		return success(result);
			return success(result);
		} catch (Exception e) {
			return failedException(e);
		}
	}
}

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

@@ -47,9 +47,13 @@ public class WxPushEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "sessionId", value = "会话id")
            @RequestParam(value = "sessionId", required = true) String sessionId,
            @ApiParam(name = "contentString", value = "内容明细串")
            @RequestParam(value = "contentString", required = false) String contentString) throws Exception {
        wxPushService.sendWXTemplate(userName, idCard, phone, title, url, content, topidId, sessionId, contentString);
        return success("success");
            @RequestParam(value = "contentString", required = false) String contentString) {
        try {
            wxPushService.sendWXTemplate(userName, idCard, phone, title, url, content, topidId, sessionId, contentString);
            return success("success");
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

@@ -52,9 +52,8 @@ 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){
            e.printStackTrace();
            return failedPageEnvelopException(e);
        }
        return PageEnvelop.getError("查询失败");
    }
    @GetMapping(value = "courseDetail")
@@ -65,9 +64,8 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject result = courseService.courseDetail(id);
            return ObjEnvelop.getSuccess("查询成功",result);
        }catch (Exception e){
            e.printStackTrace();
            return failedObjEnvelopException(e);
        }
        return ObjEnvelop.getError("查询失败");
    }
    @PostMapping(value = "addCourse")
@@ -82,9 +80,8 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("新增成功",result);
        }catch (Exception e){
            e.printStackTrace();
            return failedObjEnvelopException(e);
        }
        return ObjEnvelop.getError("新增失败");
    }
    @PostMapping(value = "startLiveCourse")
@@ -96,9 +93,8 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
            courseService.startLiveCourse(id);
            return ObjEnvelop.getSuccess("开启成功");
        }catch (Exception e){
            e.printStackTrace();
            return failedObjEnvelopException(e);
        }
        return ObjEnvelop.getError("开启失败");
    }
    @PostMapping(value = "endLiveCourse")
@@ -109,18 +105,21 @@ public class DoctorCourseEndpoint extends EnvelopRestEndpoint {
        try{
            courseService.endLiveCourse(id);
            return ObjEnvelop.getSuccess("结束成功");
        }catch (Exception e){
            e.printStackTrace();
        }catch (Exception e) {
            return failedObjEnvelopException(e);
        }
        return ObjEnvelop.getError("结束失败");
    }
    @GetMapping(value = "getTXUploadSignature")
    @ApiOperation(value = "获取腾讯视频上传签名")
    public Envelop getTXUploadSignature() throws Exception {
        TencentVODUtil tencentVODUtil = new TencentVODUtil();
        tencentVODUtil.setSecretId(secretId);
        tencentVODUtil.setSecretKey(secretKey);
        return success(tencentVODUtil.getUploadSignature());
    public Envelop getTXUploadSignature() {
        try {
            TencentVODUtil tencentVODUtil = new TencentVODUtil();
            tencentVODUtil.setSecretId(secretId);
            tencentVODUtil.setSecretKey(secretKey);
            return success(tencentVODUtil.getUploadSignature());
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

@@ -42,8 +42,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            Map<String, Integer> map = courseService.topStatusBarNum(patient);
            return ObjEnvelop.getSuccess("获取成功",map);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -62,9 +61,8 @@ 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){
            e.printStackTrace();
            return failedPageEnvelopException(e);
        }
        return PageEnvelop.getError("查询失败");
    }
    @GetMapping("orderInfo")
@@ -76,8 +74,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.orderInfo(id,type);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -93,8 +90,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getError(res, -1);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError( "获取失败!" ,-1);
            return failedException(e);
        }
    }
@@ -109,8 +105,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByCourse(longitude,latitude, pageSize, currentPage);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -126,8 +121,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByOrg(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -151,8 +145,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseByteacher(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -165,8 +158,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCourseInfo(id);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -180,8 +172,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCatalogue(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -195,8 +186,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getOrgInfoById(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -212,8 +202,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getTecInfoById(doctor,orgCode,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -229,8 +218,7 @@ public class PatientCourseEndpoint extends EnvelopRestEndpoint {
            JSONObject json = courseService.getCoursrOrderStatusByPatient(patient,status,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }

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

@@ -1,9 +1,12 @@
package com.yihu.jw.care.endpoint.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.DeviceService;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -11,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = "/common/device", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -31,8 +36,7 @@ public class DeviceController extends BaseController {
            List<Device> list = deviceService.findDeviceByCategory(categoryCode);
            return write(200, "获取设备列表成功！", "data", list);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, "获取设备列表失败！");
            return error(-1, "获取设备列表失败！",ex);
        }
    }
@@ -46,8 +50,8 @@ public class DeviceController extends BaseController {
            return write(200, "查询成功", "data", device);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error(-1, "获取设备列表失败！",ex);
        }
    }
}

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

@@ -9,6 +9,8 @@ import com.yihu.jw.care.util.CommonUtil;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.care.device.DevicePatientDevice;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -20,6 +22,7 @@ import org.springframework.http.MediaType;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,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 BaseController {
public class DoctorDeviceController extends EnvelopRestEndpoint {
	private static Logger logger = LoggerFactory.getLogger(DoctorDeviceController.class);
	@Autowired
@@ -47,6 +50,7 @@ public class DoctorDeviceController extends BaseController {
	@Autowired
	private PatientDeviceDao patientDeviceDao;
	private BaseController baseController = new BaseController();
	@Autowired
	private JmsTemplate jmsTemplate;
@@ -67,10 +71,9 @@ public class DoctorDeviceController extends BaseController {
		try {
			List<Map<String,Object>> list = patientDeviceService.findByDoctor(patient, getUID(),page, pagesize);
			return write(200, "查询成功", "data", list);
			return baseController.write(200, "查询成功", "data", list);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, ex.getMessage());
			return error(-1, ex.getMessage(),ex);
		}
	}
@@ -82,10 +85,9 @@ public class DoctorDeviceController extends BaseController {
		try {
			DevicePatientDevice device = patientDeviceService.findById(id);
			return write(200, "查询成功", "data", device);
			return baseController.write(200, "查询成功", "data", device);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, ex.getMessage());
			return error( -1, ex.getMessage(),ex);
		}
	}
@@ -101,10 +103,9 @@ public class DoctorDeviceController extends BaseController {
			@RequestParam(value="device_sn",required = true) String deviceSn) {
		try {
			List<Map<String,String>> list = patientDeviceService.getDeviceUser(patient,deviceSn,type);
			return write(200, "获取设备绑定信息成功！", "data",list);
			return baseController.write(200, "获取设备绑定信息成功！", "data",list);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, ex.getMessage());
			return error(-1, ex.getMessage(),ex);
		}
	}
	@ApiOperation("通过sn码获取设备绑定情况(管理端)")
@@ -114,7 +115,21 @@ public class DoctorDeviceController extends BaseController {
									@ApiParam(name="deviceSn",value="设备SN码",defaultValue = "15L000002")
									@RequestParam(value="deviceSn",required = true) String deviceSn){
			JSONArray objects = patientDeviceService.getDeviceByDeviceSn(deviceSn,type);
			return write(200, "获取设备成功！", "data",objects);
			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;
		}
	}
}

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

@@ -44,8 +44,7 @@ public class DoctorHealthController extends BaseController {
				return error(-1, "查询失败");
			}
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败");
			return error(-1, "查询失败",e);
		}
	}
@@ -74,8 +73,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "查询成功", "list", jsonArray);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, "查询失败！");
			return error( -1, "查询失败！",ex);
		}
	}
@@ -112,8 +110,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "查询成功", "list", jsonObject);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, "查询失败！");
			return error(-1, "查询失败！",ex);
		}
	}
@@ -143,8 +140,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "查询成功", "list", jsonObject);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, "查询失败！");
			return error( -1, "查询失败！",ex);
		}
	}
@@ -175,8 +171,7 @@ public class DoctorHealthController extends BaseController {
			json.put("custom", userArray);
			return write(200, "查询成功", "data", json);
		} catch (Exception e) {
			error(e);
			return invalidUserException(e, -1, "查询失败！");
			return error( -1, "查询失败！",e);
		}
	}
@@ -213,8 +208,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "查询成功", "data", map);
		} catch (Exception ex) {
			error(ex);
			return invalidUserException(ex, -1, ex.getMessage());
			return error(-1, ex.getMessage(),ex);
		}
	}
@@ -233,7 +227,7 @@ public class DoctorHealthController extends BaseController {
			return write(200, "获取患者健康指标历史记录成功", "data", list);
		} catch (Exception ex) {
			return invalidUserException(ex, -1, ex.getMessage());
			return error( -1, ex.getMessage(),ex);
		}
	}
@@ -266,8 +260,7 @@ public class DoctorHealthController extends BaseController {
			json.put("custom", userArray);
			return write(200, "查询成功", "data", json);
		} catch (Exception e) {
			error(e);
			return invalidUserException(e, -1, "查询失败！");
			return error( -1, e.getMessage(),e);
		}
	}
@@ -287,7 +280,7 @@ public class DoctorHealthController extends BaseController {
			}
			return write(200, "获取健康指标记录日期成功", "data", list);
		}catch (Exception e){
			return invalidUserException(e, -1, e.getMessage());
			return error( -1, e.getMessage(),e);
		}
	}
@@ -302,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 invalidUserException(ex, -1, ex.getMessage());
			return error( -1, ex.getMessage(),ex);
		}
	}
@@ -315,8 +308,7 @@ public class DoctorHealthController extends BaseController {
			DevicePatientHealthIndex patientHealthIndex = healthIndexService.getHealthIndexById(id);
			return write(200, "查询成功", "data", patientHealthIndex);
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败");
			return error( -1, e.getMessage(),e);
		}
	}
}

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

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

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

@@ -63,8 +63,7 @@ public class PatientDeviceController extends BaseController {
            JSONObject json = patientHealthIndexService.getealthStandard(type,getRepUID());
            return write(200,"获取成功","data",json);
        } catch (Exception ex) {
            error(ex);
            return error(-1,"获取失败");
            return error( -1, ex.getMessage(),ex);
        }
    }
@@ -106,8 +105,7 @@ public class PatientDeviceController extends BaseController {
            return success("设备保存成功！");
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error( -1, ex.getMessage(),ex);
        }
    }
@@ -127,8 +125,7 @@ public class PatientDeviceController extends BaseController {
            return write(200, "查询成功", "data", list);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error( -1, ex.getMessage(),ex);
        }
    }
@@ -143,8 +140,7 @@ public class PatientDeviceController extends BaseController {
            mapList.put("device", device);
            return write(200, "查询成功", "data", mapList);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error( -1, ex.getMessage(),ex);
        }
    }
@@ -164,22 +160,20 @@ public class PatientDeviceController extends BaseController {
            List<Map<String, String>> list = patientDeviceService.getDeviceUser(getRepUID(), deviceSn, type);
            return write(200, "获取设备绑定信息成功！", "data", list);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error( -1, ex.getMessage(),ex);
        }
    }
    @ApiOperation("获取患者设备信息")
    @RequestMapping(value = "patientDeviceListByTopic", method = RequestMethod.GET)
    public ListEnvelop patientDeviceListByTopic(@ApiParam(name = "patient", value = "patient", defaultValue = "patient")
    public String patientDeviceListByTopic(@ApiParam(name = "patient", value = "patient", defaultValue = "patient")
                                                @RequestParam(value = "patient", required = true) String patient,
                                                @ApiParam(name = "topic", value = "专题CODE;preventLost防走失,preventFall防跌倒", defaultValue = "preventLost")
                                                @RequestParam(value = "topic", required = false) String topic) {
        try {
            return ListEnvelop.getSuccess("查询成功",  patientDeviceService.patientDeviceListByTopic(patient,topic));
            return write(200,"查询成功","detailModelList",  patientDeviceService.patientDeviceListByTopic(patient,topic));
        } catch (Exception ex) {
            error(ex);
            return ListEnvelop.getError("查询失败");
            return error(-1, ex.getMessage(),ex);
        }
    }
@@ -205,8 +199,7 @@ public class PatientDeviceController extends BaseController {
                return error(-1, "不存在该设备！");
            }
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, ex.getMessage());
            return error( -1, ex.getMessage(),ex);
        }
    }
@@ -216,7 +209,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"执行成功","data",patientDeviceService.getPatientDeviceTaskInfo(patientCode));
        }catch (Exception e){
            return write(-1,"执行失败！");
            return error( -1, e.getMessage(),e);
        }
    }
@@ -227,8 +220,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getAqgDeviceInfo(deviceSn));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error( -1, e.getMessage(),e);
        }
    }
@@ -253,8 +245,7 @@ public class PatientDeviceController extends BaseController {
            }
            return error(-1,json.getString("error_desc"));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败！");
            return error( -1, e.getMessage(),e);
        }
    }
@@ -267,8 +258,7 @@ public class PatientDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getDeviceLastLocation(deviceSn,type));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error( -1, e.getMessage(),e);
        }
    }
@@ -296,8 +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){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error( -1, e.getMessage(),e);
        }
    }
}

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

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

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

@@ -1,26 +1,25 @@
package com.yihu.jw.care.endpoint.device;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.sun.corba.se.spi.orb.StringPair;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.YsDeviceService;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import netscape.javascript.JSObject;
import org.apache.commons.lang.StringUtils;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by Bing on 2021/6/1.
@@ -52,8 +51,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -68,8 +66,7 @@ public class YsDeviceController extends BaseController {
        try {
            return write(200,"查询成功","data",ysDeviceService.deviceFailConfig(deviceSerial,type,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -91,8 +88,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.deviceEncrypt(deviceSerial,isEncrypt,validateCode,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -108,8 +104,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.deviceCapture(deviceSerial,channelNo,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -132,8 +127,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -154,8 +148,8 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.ptzStart(deviceSerial,channelNo,direction,speed,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -173,8 +167,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.ptzStop(deviceSerial,channelNo,direction,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -189,8 +182,7 @@ public class YsDeviceController extends BaseController {
            return write(200,"查询成功","data",ysDeviceService.coverVideoSwitch(is_vod_cover,request));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -220,8 +212,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONArray(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -250,8 +241,8 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -265,8 +256,7 @@ public class YsDeviceController extends BaseController {
//
//            return write(200,"查询成功","data",ysDeviceService.getVideoKey(request));
//        }catch (Exception e){
//            e.printStackTrace();
//            return error(-1,"error");
//            return error(-1,"error",e);
//        }
//    }
//
@@ -287,8 +277,7 @@ public class YsDeviceController extends BaseController {
//
//            return write(200,"查询成功","data",ysDeviceService.videoList(name,type,page,count));
//        }catch (Exception e){
//            e.printStackTrace();
//            return error(-1,"error");
//            return error(-1,"error",e);
//        }
//    }
//
@@ -303,8 +292,7 @@ public class YsDeviceController extends BaseController {
//
//            return write(200,"查询成功","data",ysDeviceService.videoDetailList(vod_ids));
//        }catch (Exception e){
//            e.printStackTrace();
//            return error(-1,"error");
//            return error(-1,"error",e);
//        }
//    }
//
@@ -319,8 +307,7 @@ public class YsDeviceController extends BaseController {
//
//            return write(200,"查询成功","data",ysDeviceService.videoDetail(vod_id));
//        }catch (Exception e){
//            e.printStackTrace();
//            return error(-1,"error");
//            return error(-1,"error",e);
//        }
//    }
//
@@ -337,8 +324,7 @@ public class YsDeviceController extends BaseController {
//
//            return write(200,"查询成功","data",ysDeviceService.videoUpload(request));
//        }catch (Exception e){
//            e.printStackTrace();
//            return error(-1,"error");
//            return error(-1,"error",e);
//        }
//    }
//
@@ -381,8 +367,7 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
@@ -409,9 +394,9 @@ public class YsDeviceController extends BaseController {
            }
            return write(200,"查询成功","data",result.getJSONObject(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"error");
            return error(-1,"error",e);
        }
    }
}

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

@@ -57,8 +57,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return doctorService.doctorPage(name, orgCode, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -72,8 +71,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return ObjEnvelop.getSuccess("查询成功",doctorService.doctorInfo(doctorId,isRole));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -85,8 +83,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try{
            return ObjEnvelop.getSuccess("查询成功",capacityAssessmentRecordService.getPatientNum(doctorId));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -117,8 +114,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            return ListEnvelop.getSuccess("查询成功", doctorService.getOrgList(doctorId,orgType));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
@@ -137,8 +133,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功", doctorService.getOrgDoctor(orgCode,deptCode,page,size));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -157,8 +152,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getOrgDoctorByName(getUID(),orgType,name,page,size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -180,8 +174,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getTeacherChildren(doctor,searchType,name,page,size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -193,8 +186,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getTeacherChildrenCount(doctor));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -207,8 +199,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getNotificationCount(doctor));//,type
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -227,8 +218,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return doctorService.getArchiveList(type, signStatus,name,page, size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -238,8 +228,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",doctorService.getArchiveNum()) ;
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -250,8 +239,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            entranceUtil.initData();
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败");
            return failedException(e);
        }
    }
@@ -262,8 +250,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            entranceUtil.deleteAll();
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败");
            return failedException(e);
        }
    }
}

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

@@ -48,8 +48,11 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "pageSize", value = "页码", required = true, defaultValue = "10")
            @RequestParam(value = "pageSize") int pageSize) throws Exception {
        return baseDoctorService.queryList(city,hospital,status,name,type,typeCode,dept,page,pageSize);
        try {
            return baseDoctorService.queryList(city,hospital,status,name,type,typeCode,dept,page,pageSize);
        }catch (Exception e){
            return failedException(e);
        }
    }
@@ -61,11 +64,16 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "typeCode", value = "分部，无不传")
            @RequestParam(value = "typeCode", required = false)String typeCode)throws Exception{
        Object object = baseDoctorService.queryById(doctorId,typeCode);
        if (null != object){
            return success("查询成功",object);
        try {
            Object object = baseDoctorService.queryById(doctorId,typeCode);
            if (null != object){
                return success("查询成功",object);
            }
            return failed("查询失败");
        }catch (Exception e){
            return failedException(e);
        }
        return failed("查询失败");
    }
@@ -74,12 +82,17 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    public Envelop update(
            @ApiParam(name = "baseDoctorVo", value = "JSON数据", required = true)
            @RequestParam(value = "baseDoctorVo") String baseDoctorVo)throws Exception{
        JSONObject jsonObject = JSONObject.fromObject(baseDoctorVo);
        Boolean update = baseDoctorService.update(jsonObject);
        if (!update){
            return failed("保存失败，参数不可为空");
        try {
            JSONObject jsonObject = JSONObject.fromObject(baseDoctorVo);
            Boolean update = baseDoctorService.update(jsonObject);
            if (!update){
                return failed("保存失败，参数不可为空");
            }
            return success("保存成功");
        }catch (Exception e){
            return failedException(e);
        }
        return success("保存成功");
    }
    @PostMapping(value = BaseHospitalRequestMapping.DoctorSetting.updateList)
@@ -87,9 +100,14 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
    public Envelop updateList(
            @ApiParam(name = "baseDoctorVos", value = "JSON数据", required = true)
            @RequestParam(value = "baseDoctorVos") String baseDoctorVos)throws Exception{
        JSONArray jsonArray = JSONArray.fromObject(baseDoctorVos);
        Boolean update = baseDoctorService.updateList(jsonArray);
        return success("保存成功");
        try {
            JSONArray jsonArray = JSONArray.fromObject(baseDoctorVos);
            Boolean update = baseDoctorService.updateList(jsonArray);
            return success("保存成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
@@ -113,6 +131,11 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "pw", required = true)String pw,
                                  @ApiParam(name = "orgPw", value = "原密码")
                                  @RequestParam(value = "orgPw", required = true)String orgPw)throws Exception{
        return success(baseDoctorService.updateDoctorPw(id,pw,orgPw));
        try {
            return success(baseDoctorService.updateDoctorPw(id,pw,orgPw));
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

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

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

@@ -2,19 +2,19 @@ package com.yihu.jw.care.endpoint.doorCoach;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.consult.ConsultTeamService;
import com.yihu.jw.care.service.doorCoach.DoctorDoorCoachOrderService;
import com.yihu.jw.care.service.doorCoach.PatientDoorCoachOrderService;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachConclusionDO;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
@@ -26,10 +26,7 @@ import org.springframework.http.MediaType;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
@@ -39,7 +36,7 @@ import java.util.Map;
@RestController
@RequestMapping(value = "/doctor/doorCoach/serviceOrder", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "医生端-上门辅导")
public class DoctorDoorCoachOrderController extends BaseController {
public class DoctorDoorCoachOrderController extends EnvelopRestEndpoint {
    @Autowired
    private PatientDoorCoachOrderService patientDoorCoachOrderService;
@@ -49,6 +46,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
    private ImService imService;
    @Autowired
    private ConsultTeamService consultTeamService;
    private BaseController baseController = new BaseController();
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建上门预约咨询--医生代预约")
@@ -56,12 +54,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = patientDoorCoachOrderService.proxyCreate(jsonData,getUID());
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1, result.getString(ResponseContant.resultMsg));
                return baseController.error(-1, result.getString(ResponseContant.resultMsg));
            }
            return write(200, "提交成功！","orderId",result.getString("orderId"));
            return baseController.write(200, "提交成功！","orderId",result.getString("orderId"));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1, e.getMessage());
            return baseController.error(-1, e.getMessage(),e);
        }
    }
@@ -71,10 +68,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @ApiParam(name = "doctor", value = "医生codedoctor")
            @RequestParam(value = "doctor", required = true) String doctor) {
        try {
            return write(200, "获取成功", "data",doctorDoorCoachOrderService.getDoorOrderNum(doctor));
            return  baseController.write(200, "获取成功", "data",doctorDoorCoachOrderService.getDoorOrderNum(doctor));
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -89,7 +85,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
            doctorDoorCoachOrderService.initDoorStatus(hospital);
            JSONObject result = patientDoorCoachOrderService.queryDoctorListWithNotStopped(hospital,page, size);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));
                return baseController.error(-1,result.getString(ResponseContant.resultMsg));
            }
            int count = result.getIntValue(ResponseContant.count);
            JSONObject object = new JSONObject();
@@ -97,11 +93,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
            object.put("detailModelList",result.get(ResponseContant.resultMsg));
            object.put("currPage",page);
            object.put("pageSize",size);
            return write(200,"查询成功","data",object);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"查询失败",e);
        }
        return error(-1,"查询失败");
    }
    @PostMapping(value = "sendOrderToDoctor")
@@ -117,13 +113,12 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = patientDoorCoachOrderService.sendOrderToDoctor(orderId, remark,dispatcher,dispathcherName, doctor, doctorName ,doctorJobName);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error( -1,result.getString(ResponseContant.resultMsg));
                return baseController.error( -1,result.getString(ResponseContant.resultMsg));
            }
            return write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
            return baseController.write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"查询失败",e);
        }
        return error(-1,"派单失败");
    }
    @PostMapping(value = "transferOrder")
@@ -139,12 +134,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = patientDoorCoachOrderService.transferOrder(orderId, remark,dispatcher,dispathcherName, doctor, doctorName ,doctorJobName);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error( -1,result.getString(ResponseContant.resultMsg));
                return baseController.error( -1,result.getString(ResponseContant.resultMsg));
            }
            return write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
            return baseController.write(200,"派单成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1, "派单失败!");
            return baseController.error(-1, "派单失败!",e);
        }
    }
@@ -157,10 +151,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @ApiParam(value = "医院级别", name = "hospitalLevel", required = false) @RequestParam(value = "hospitalLevel",defaultValue = "4",required = false) int hospitalLevel) {
        try {
            doctorDoorCoachOrderService.acceptOrder(orderId,jobCode,jobCodeName,hospitalLevel);
            return write(200, "操作成功");
            return baseController.write(200, "操作成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "操作失败!" + e.getMessage());
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
        }
    }
@@ -173,10 +166,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "reason", required = false) String reason) {
        try {
            doctorDoorCoachOrderService.refuseOrder(getUID(),orderId, reason);
            return write(200, "操作成功");
            return baseController.write(200, "操作成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "操作失败!" + e.getMessage());
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
        }
    }
@@ -191,13 +183,13 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = patientDoorCoachOrderService.cancelOrder(orderId, type, reason,dispatcher,dispatcherName);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));
                return baseController.error(-1,result.getString(ResponseContant.resultMsg));
            }
            return write(200,"取消成功","data",result.get(ResponseContant.resultMsg));
            return baseController.write(200,"取消成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"取消失败",e);
        }
        return error(-1,"取消失败");
    }
    @PostMapping("signIn")
@@ -218,13 +210,12 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.signIn(orderId, signTime, signWay, signLocation, signImg,twoDimensionalCode,getUID());
            if (baseDoorCoachOrderDO != null){
                return write(200, "操作成功", "data", baseDoorCoachOrderDO);
                return baseController.write(200, "操作成功", "data", baseDoorCoachOrderDO);
            }else {
                return error(-1,"扫码签到失败");
                return baseController.error(-1,"扫码签到失败");
            }
        } catch (Exception e) {
            error(e);
            return error(-1, "操作失败!" + e.getMessage());
            return baseController.error(-1, "操作失败!" + e.getMessage(),e);
        }
    }
@@ -241,10 +232,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "conclusionStatus", required = false,defaultValue = "2") Integer conclusionStatus) {
        try {
            BaseDoorCoachConclusionDO doorConclusion = doctorDoorCoachOrderService.updateDoorConclusion(orderId,conclusion,conclusionImg,conclusionStatus);
            return write(200, "保存成功", "data", doorConclusion);
            return baseController.write(200, "保存成功", "data", doorConclusion);
        } catch (Exception e) {
            error(e);
            return error(-1, "保存失败!" + e.getMessage());
            return baseController.error(-1, "保存失败!" + e.getMessage(),e);
        }
    }
@@ -261,15 +251,14 @@ public class DoctorDoorCoachOrderController extends BaseController {
            if (StringUtils.isEmpty(orderId)) {
                orderId = doctorDoorCoachOrderService.getOrderIdByDoctor(doctor);
                if (StringUtils.isBlank(orderId)) {
                    return error(-1, "获取失败，该医生暂无工单" );
                    return baseController.error(-1, "获取失败，该医生暂无工单" );
                }
            }
            // 根据orderId查询工单小结表
            BaseDoorCoachConclusionDO doorConclusion = doctorDoorCoachOrderService.getDoorConclusion(orderId);
            return write(200, "获取成功", "data", doorConclusion);
            return baseController.write(200, "获取成功", "data", doorConclusion);
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -283,10 +272,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @ApiParam(value = "确认结束服务照片", name = "finishImg")
            @RequestParam(value = "finishImg", required = false) String finishImg) {
        try {
            return write(200, "获取成功", "data", doctorDoorCoachOrderService.saveOrderFinishByDoctor(orderId, finishWay, finishImg));
            return baseController.write(200, "获取成功", "data", doctorDoorCoachOrderService.saveOrderFinishByDoctor(orderId, finishWay, finishImg));
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -299,10 +287,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "arrivingTime", required = true) String arrivingTime) {
        try {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.updateArrivingTime(orderId, arrivingTime);
            return write(200, "修改成功", "data", baseDoorCoachOrderDO);
            return baseController.write(200, "修改成功", "data", baseDoorCoachOrderDO);
        } catch (Exception e) {
            error(e);
            return error(-1, "修改失败!" + e.getMessage());
            return baseController.error(-1, "修改失败!" + e.getMessage(),e);
        }
    }
@@ -313,10 +300,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "doctor", required = true) String doctor) {
        try {
            Map<String, Integer> map = doctorDoorCoachOrderService.getNumGroupByStatus(doctor);
            return write(200, "获取成功", "data", map);
            return baseController.write(200, "获取成功", "data", map);
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -349,10 +335,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
        message1.setReceiver(getUID());
        try {
            org.json.JSONObject waitingMessages = doctorDoorCoachOrderService.getWaitingMessages(message1, types, Integer.valueOf(page), Integer.valueOf(pageSize));
            return write(200, "查询成功","data",waitingMessages);
            return baseController.write(200, "查询成功","data",waitingMessages);
        }catch (Exception e){
            error(e);
            return error( -1, "查询失败！");
            return baseController.error( -1, "查询失败！",e);
        }
    }
@@ -387,7 +372,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "pageSize", required = true) Integer pageSize) {
        try {
            if(StringUtils.isEmpty(isManage)){
                isManage = getCurrentRoleIsManange();
                isManage = baseController.getCurrentRoleIsManange();
            }
            if("0".equals(isManage)){
                if(StringUtils.isEmpty(doctorCode)){
@@ -395,8 +380,8 @@ public class DoctorDoorCoachOrderController extends BaseController {
                }
            }else if ("1".equals(isManage) && StringUtils.isBlank(hospitalCode)){
                //如果是管理员并且未筛选机构，就默认展示其管理下所有机构
                String level = getCurrentRoleLevel();
                String currentRoleCode = getCurrentRoleCode();
                String level = baseController.getCurrentRoleLevel();
                String currentRoleCode = baseController.getCurrentRoleCode();
                if(level.equals("2")) {
                    //市管理员
                    hospitalCode = currentRoleCode.substring(0, currentRoleCode.length() - 2) + "%";
@@ -424,10 +409,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            }
            JSONObject result = doctorDoorCoachOrderService.getDoorOrderList(orderId,patientName,patientPhone,hospitalCode,
                    ss,createTimeStart,createTimeEnd,serverDoctorName,doctorCode,page,pageSize, type);
            return write(200, "获取成功","data",result);
            return baseController.write(200, "获取成功","data",result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -446,7 +430,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = doctorDoorCoachOrderService.queryBriefList(dispatcher,hospital, orderNumber, patientName, phone, status,patientType, page, size);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));
                return baseController.error(-1,result.getString(ResponseContant.resultMsg));
            }
            int count = result.getIntValue(ResponseContant.count);
            JSONObject object = new JSONObject();
@@ -454,11 +438,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
            object.put("detailModelList",result.get(ResponseContant.resultMsg));
            object.put("currPage",page);
            object.put("pageSize",size);
            return write(200,"查询成功","data",object);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"查询失败",e);
        }
        return error(-1,"查询失败");
    }
    @GetMapping(value = "queryDoctorList")
@@ -474,7 +458,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
            doctorDoorCoachOrderService.initDoorStatus(hospital);
            JSONObject result = doctorDoorCoachOrderService.queryDoctorList(patient,hospital, doctorName, status, page, size);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));
                return baseController.error(-1,result.getString(ResponseContant.resultMsg));
            }
            int count = result.getIntValue(ResponseContant.count);
            JSONObject object = new JSONObject();
@@ -487,11 +471,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
            }
            object.put("currPage",page);
            object.put("pageSize",size);
            return write(200,"查询成功","data",object);
            return baseController.write(200,"查询成功","data",object);
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"查询失败",e);
        }
        return error(-1,"查询失败");
    }
    @GetMapping("getByOrderId")
@@ -507,15 +491,14 @@ public class DoctorDoorCoachOrderController extends BaseController {
                // 根据接单医生code获取最近一次服务orderId
                orderId = doctorDoorCoachOrderService.getOrderIdByDoctor(doctor);
                if (StringUtils.isBlank(orderId)) {
                    return error(-1, "获取失败, 该医生暂无工单" );
                    return baseController.error(-1, "获取失败, 该医生暂无工单" );
                }
            }
            // 根据orderId获取工单信息
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return write(200, "获取成功", "data", baseDoorCoachOrderDO);
            return baseController.write(200, "获取成功", "data", baseDoorCoachOrderDO);
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败, 该医生暂无工单!" + e.getMessage());
            return baseController.error(-1, "获取失败, 该医生暂无工单!" + e.getMessage(),e);
        }
    }
@@ -528,8 +511,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try {
            return ObjEnvelop.getSuccess("操作成功",doctorDoorCoachOrderService.payOrder(orderId, payWay));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询成功");
            return failedObjEnvelopException(e);
        }
    }
@@ -548,10 +530,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "serverItemName", required = false) String serverItemName) {
        try {
            return write(200, "获取成功","dara",patientDoorCoachOrderService.selectItemsByHospital(hospital,serverItemName));
            return baseController.write(200, "获取成功","dara",patientDoorCoachOrderService.selectItemsByHospital(hospital,serverItemName));
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -560,10 +541,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
    public String initDoorStatus() {
        try {
            doctorDoorCoachOrderService.initDoorStatus(null);
            return success("成功");
            return baseController.success("成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -575,10 +555,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "doctor", required = true) String doctor) {
        try {
            String status = doctorDoorCoachOrderService.findDispatchStatusByDoctor(doctor);
            return write(200, "获取成功", "data", status);
            return baseController.write(200, "获取成功", "data", status);
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
            return baseController.error(-1, "获取失败!" + e.getMessage(),e);
        }
    }
@@ -592,10 +571,9 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @RequestParam(value = "value", required = true) Integer value) {
        try {
            doctorDoorCoachOrderService.updateDispatchStatusByDoctor(doctor, value);
            return write(200, "修改成功");
            return baseController.write(200, "修改成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "修改失败!" + e.getMessage());
            return baseController.error(-1, "修改失败!" + e.getMessage(),e);
        }
    }
@@ -614,9 +592,8 @@ public class DoctorDoorCoachOrderController extends BaseController {
            }
            return ObjEnvelop.getSuccess("转接成功",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return failedObjEnvelopException(e);
        }
        return ObjEnvelop.getError("转接失败");
    }
    @RequestMapping(value = "/urlAnalysis",produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@@ -625,12 +602,11 @@ public class DoctorDoorCoachOrderController extends BaseController {
    public String urlAnalysis(@ApiParam(name = "url", value = "地址解析", defaultValue = "")
                              @RequestParam(value = "url", required = true)String url)throws Exception {
        try {
            return write(200, "操作成功！","data",doctorDoorCoachOrderService.urlAnalysis(url));
            return baseController.write(200, "操作成功！","data",doctorDoorCoachOrderService.urlAnalysis(url));
        }catch (Exception e){
            //日志文件中记录异常信息
            error(e);
            //返回接口异常信息处理结果
            return error(-1, "操作失败！");
            return baseController.error(-1, "操作失败！",e);
        }
    }
@@ -640,8 +616,13 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @ApiParam(name = "consult", value = "咨询CODE")
            @RequestParam(value = "consult",required = false) String consult,
            @ApiParam(name = "patientCode", value = "居民COEE")
            @RequestParam(value = "patientCode",required = false) String patientCode)throws Exception {
        return ObjEnvelop.getSuccess("请求成功", imService.getConsultInfoAndPatientInfo(consult, patientCode));
            @RequestParam(value = "patientCode",required = false) String patientCode){
        try {
            return ObjEnvelop.getSuccess("请求成功", imService.getConsultInfoAndPatientInfo(consult, patientCode));
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
    }
    @RequestMapping(value = "queryByConsultCode",method = RequestMethod.GET)
@@ -652,8 +633,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
            JSONObject detail = consultTeamService.queryByConsultCode(code,type);
            return ObjEnvelop.getSuccess("查询成功", detail.get("data"));
        }catch (Exception e){
            error(e);
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -664,12 +644,13 @@ public class DoctorDoorCoachOrderController extends BaseController {
        try{
            JSONObject result = patientDoorCoachOrderService.updateOrderCardInfo(jsonData);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));
                return baseController.error(-1,result.getString(ResponseContant.resultMsg));
            }
            return write(200,"保存成功","data",result.get(ResponseContant.resultMsg));
            return baseController.write(200,"保存成功","data",result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return baseController.error(-1,"保存失败",e);
        }
        return error(-1,"保存失败");
    }
}

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

@@ -42,12 +42,16 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            @ApiParam(name = "contentType", value = "消息内容类型：1-文本信息，19-服务工单格式化消息", required = true) @RequestParam String contentType,
            @ApiParam(name = "content", value = "消息内容json", required = true) @RequestParam String content
    ) {
        int result = patientDoorCoachOrderService.qucikSendIM(orderId, sendId, sendName, contentType, content);
        if (result == -1) {
            return failed("发送失败！");
        try {
            int result = patientDoorCoachOrderService.qucikSendIM(orderId, sendId, sendName, contentType, content);
            if (result == -1) {
                return failed("发送失败！");
            }
            return success("发送成功");
        }catch (Exception e){
            return failedObjEnvelopException(e);
        }
        return success("发送成功");
    }
    @PostMapping(value = "create")
@@ -56,31 +60,41 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
        JSONObject result = new JSONObject();
        try{
            result = patientDoorCoachOrderService.create(jsonData);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return failed(result.getString(ResponseContant.resultMsg));
            }
            return success(result);
        }catch (Exception e){
            return failedException(e);
        }
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return failed(result.getString(ResponseContant.resultMsg));
        }
        return success(result);
    }
    @PostMapping(value = "delete")
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true) @RequestParam(value = "ids") String ids) {
        patientDoorCoachOrderService.delete(ids.split(","));
        return success("删除成功");
        try {
            patientDoorCoachOrderService.delete(ids.split(","));
            return success("删除成功");
        }catch (Exception e) {
            return failedException(e);
        }
    }
    @PostMapping(value = "update")
    @ApiOperation(value = "更新")
    public Envelop update(@ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {
        JSONObject result = patientDoorCoachOrderService.update(jsonData);
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return failed(result.getString(ResponseContant.resultMsg));
        try {
            JSONObject result = patientDoorCoachOrderService.update(jsonData);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return failed(result.getString(ResponseContant.resultMsg));
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
    @PostMapping(value = "cancelOrder")
@@ -94,24 +108,27 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return failed(result.getString(ResponseContant.resultMsg));
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
    @GetMapping(value = "queryDispatcherInfoByPatient")
    @ApiOperation(value = "获取居民所签约的机构的调度员信息")
    public Envelop queryDispatcherInfoByPatient(
            @ApiParam(name = "orgCode", value = "机构Code") @RequestParam(value = "orgCode", required = true) String orgCode) {
        JSONObject result = patientDoorCoachOrderService.queryDispatcherInfoByPatient(orgCode);
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return failed(result.getString(ResponseContant.resultMsg));
        try {
            JSONObject result = patientDoorCoachOrderService.queryDispatcherInfoByPatient(orgCode);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return failed(result.getString(ResponseContant.resultMsg));
            }
            int count = result.getIntValue(ResponseContant.count);
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            return failedException(e);
        }
        int count = result.getIntValue(ResponseContant.count);
        return success(result.get(ResponseContant.resultMsg));
    }
    @GetMapping("/topStatusBarNum")
@@ -123,8 +140,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            Map<String, Integer> map = patientDoorCoachOrderService.getNumGroupByStatus(patient);
            return ObjEnvelop.getSuccess( "获取成功", map);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" );
            return failedObjEnvelopException(e);
        }
    }
@@ -174,8 +190,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
                    ss,createTimeStart,createTimeEnd,serverDoctorName,patient,page,pageSize, type);
            return ObjEnvelop.getSuccess( "获取成功",result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -199,8 +214,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return ObjEnvelop.getSuccess( "获取成功",  baseDoorCoachOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败, 该医生暂无工单!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -222,8 +236,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
            return ListEnvelop.getSuccess( "获取成功",patientDoorCoachOrderService.selectItemsByHospital(hospital,serverItemName));
        } catch (Exception e) {
            e.printStackTrace();
            return ListEnvelop.getError( "获取失败!");
            return failedListEnvelopException(e);
        }
    }
}

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

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

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

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

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

@@ -81,8 +81,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success("添加成功");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed( "添加失败",-1);
            return failedException(e);
        }
    }
@@ -120,8 +119,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "更新成功");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed( "更新失败",-1);
            return failedException(e);
        }
    }
@@ -148,8 +146,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "删除成功");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed( "删除失败",-1);
            return failedException(e);
        }
    }
@@ -167,8 +164,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            }
            return success( "授权成功");
        }catch (Exception e){
            e.printStackTrace();
            return failed("授权失败",-1);
            return failedException(e);
        }
    }
@@ -197,8 +193,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess( "查询成功", data);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -210,8 +205,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess( "查询成功", result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -240,8 +234,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("未授权", json,100);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -261,8 +254,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            JSONObject result = familyMemberService.isRegister(idcard, getUID());
            return ObjEnvelop.getSuccess( "查询成功",  result);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -278,8 +270,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            JSONObject result = familyMemberService.checkFamilyMember(memberCode);
            return ObjEnvelop.getSuccess( "验证成功",  result);
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError( "验证失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -317,8 +308,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "添加成功");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed( "添加失败",-1);
            return failedException(e);
        }
    }
@@ -369,8 +359,7 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
                return success( "添加成功");
            }
        } catch (Exception e) {
            e.printStackTrace();
            return failed( "添加失败",-1);
            return failedException(e);
        }
    }

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

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

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

@@ -46,9 +46,8 @@ 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){
            e.printStackTrace();
            return failedPageEnvelopException(e);
        }
        return PageEnvelop.getError("查询失败");
    }
    @GetMapping("/topStatusBarNum")
@@ -60,8 +59,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            Map<String, Integer> map = lifeCareOrderService.getNumGroupByStatus(doctor);
            return ObjEnvelop.getSuccess("获取成功",map);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败!" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -75,8 +73,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -102,8 +99,7 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getSuccess("记录成功");
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError( "记录失败" ,-1);
            return failedException(e);
        }
    }
@@ -142,9 +138,8 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
        try{
            return lifeCareOrderService.getPatientOrderList(patient, status, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return failedPageEnvelopException(e);
        }
        return PageEnvelop.getError("查询失败");
    }
    @PostMapping(value = "proxyCreate")
@@ -159,7 +154,6 @@ public class DoctorLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return success(result);
        }catch (Exception e){
            e.printStackTrace();
            return failedException(e);
        }
    }

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

@@ -38,8 +38,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
        try{
            result = lifeCareOrderService.create(jsonData,getUID());
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败",-1);
            return failedException(e);
        }
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
@@ -59,8 +58,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
                return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
            }
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败",-1);
            return failedException(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
@@ -76,8 +74,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败",-1);
            return failedException(e);
        }
    }
@@ -96,8 +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){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败", -1);
            return failedPageEnvelopException(e);
        }
    }
@@ -107,8 +103,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict());
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
@@ -122,8 +117,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败" ,-1);
            return failedObjEnvelopException(e);
        }
    }

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

@@ -35,8 +35,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
        try{
            result = lifeCareOrderService.create(jsonData,getUID());
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败",-1);
            return failedException(e);
        }
        if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
            return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
@@ -56,8 +55,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
                return Envelop.getError(result.getString(ResponseContant.resultMsg),-1);
            }
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败",-1);
            return failedException(e);
        }
        return success(result.get(ResponseContant.resultMsg));
    }
@@ -73,8 +71,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
            }
            return success(result.get(ResponseContant.resultMsg));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败",-1);
            return failedException(e);
        }
    }
@@ -93,8 +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){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败", -1);
            return failedPageEnvelopException(e);
        }
    }
@@ -104,8 +100,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict());
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
@@ -119,8 +114,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败" ,-1);
            return failedObjEnvelopException(e);
        }
    }
}

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

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

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

@@ -40,8 +40,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return patientMessageService.getNoticeList(patient,beginTime,endTime,page,size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败"+e.getMessage());
            return failedPageEnvelopException(e);
        }
    }
@@ -54,8 +53,7 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientMessageService.orgNoticeDetail(noticeId,patient));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -63,7 +61,11 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
    @ApiOperation("居民获取系统消息父级列表")
    public ListEnvelop getSystemMessage(@ApiParam(name = "patient",required = true)
                                        @RequestParam(value = "patient")String patient){
        return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessage(patient));
        try {
            return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessage(patient));
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "getSystemMessageList")
@@ -73,14 +75,23 @@ public class PatientMessageEndpoint extends EnvelopRestEndpoint {
                                            @ApiParam(name = "type",required = true)
                                            @RequestParam(value = "type")String type
                                            ){
        return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessageList(patient,type));
        try {
            return ListEnvelop.getSuccess("查询成功",patientMessageService.getSystemMessageList(patient,type));
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @PostMapping(value = "/updateMessageRead")
    @ApiOperation("已读消息")
    public Envelop updateMessageRead(@ApiParam(name = "messageId",required = true)
                                         @RequestParam(value = "messageId")String messageId){
        patientMessageService.updateMessageRead(messageId);
        return Envelop.getSuccess("修改成功");
        try {
            patientMessageService.updateMessageRead(messageId);
            return Envelop.getSuccess("修改成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

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

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

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

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

@@ -67,8 +67,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            }
            return success(patientDO);
        } catch (Exception e) {
            e.printStackTrace();
            return failed("获取失败",-1);
            return failedException(e);
        }
    }
@@ -81,8 +80,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功");
        }catch (Exception e){
            e.printStackTrace();
            return failed("获取失败",-1);
            return failedException(e);
        }
    }
@@ -95,8 +93,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功");
        }catch (Exception e){
            e.printStackTrace();
            return failed("获取失败",-1);
            return failedException(e);
        }
    }
@@ -114,8 +111,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return patientService.myPatientPage(name, doctorId, page, size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -129,8 +125,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("获取成功",patientService.findPatientById(id,isCapacity));
        }catch (Exception e){
            e.printStackTrace();
            return failed("获取失败",-1);
            return failedException(e);
        }
    }
@@ -166,8 +161,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
                    return failed("修改失败,"+e.getMessage(),-1);
                }
            }
            e.printStackTrace();
            return failed("修改失败",-1);
            return failedException(e);
        }
    }
@@ -178,8 +172,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return success("修改成功",patientLabelDao.findByPatient(patientId));
        }catch (Exception e){
            e.printStackTrace();
            return failed("修改失败",-1);
            return failedException(e);
        }
    }
@@ -194,8 +187,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            patientService.updPatientLabel(jsonData, patientId);
            return success("修改成功");
        }catch (Exception e){
            e.printStackTrace();
            return failed("修改失败",-1);
            return failedException(e);
        }
    }
@@ -225,8 +217,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try{
            return ListEnvelop.getSuccess("查询成功",patientService.getTeacherOrgList(patient));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
@@ -247,8 +238,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try {
            return patientService.getTeacherList(patient,orgCode,deptCode,page,size);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -259,8 +249,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientService.getFamilyAllArchiveType(patient));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -275,8 +264,7 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
            }
            return Envelop.getSuccess("操作成功");
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("操作失败");
            return failedException(e);
        }
    }
}

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

@@ -45,8 +45,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("创建失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -73,8 +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){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败");
            return failedPageEnvelopException(e);
        }
    }
@@ -86,8 +84,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityOrderUnCompleteList(doctor));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
            return failedListEnvelopException(e);
        }
    }
@@ -106,8 +103,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -124,8 +120,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("修改成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("修改失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -142,8 +137,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("接单成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -164,8 +158,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("工单已取消",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("工单取消失败"+e.getMessage());
            return failedException(e);
        }
    }
@@ -193,8 +186,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("操作成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -220,8 +212,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("保存成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "保存失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -237,8 +228,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("取消成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("取消失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -263,8 +253,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            EmergencyWarnConclusionDO doorConclusion = securityMonitoringOrderService.getDoorConclusion(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorConclusion);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -284,8 +273,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getJSONObject("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -299,7 +287,6 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            return ListEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityServerDoctor(patient,topicItem));
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("查询失败");
        }
    }
@@ -311,9 +298,8 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
                                @RequestParam(value = "patient") String patient) {
        try {
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient));
        } catch (Exception ex) {
            ex.printStackTrace();
            return ObjEnvelop.getError("查询失败");
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
@@ -333,8 +319,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            return ObjEnvelop.getSuccess("操作成功",result.getString("resultMsg"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "操作失败!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -358,8 +343,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("定位更新失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -381,8 +365,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("定位更新失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
}

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

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

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

@@ -40,8 +40,7 @@ public class EmeAsEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("发起成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("发起失败"+e.getMessage());
            return failedObjEnvelopException(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 write(-1,"执行失败！");
            return error(-1,"执行失败！",e);
        }
    }
@@ -61,8 +61,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getAqgDeviceInfo(deviceSn));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error(-1,"执行失败！",e);
        }
    }
@@ -87,8 +86,7 @@ public class PDeviceController extends BaseController {
            }
            return error(-1,json.getString("error_desc"));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"操作失败！");
            return error(-1,"执行失败！",e);
        }
    }
@@ -101,8 +99,7 @@ public class PDeviceController extends BaseController {
        try {
            return write(200,"获取成功","data",patientDeviceService.getDeviceLastLocation(deviceSn,type));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error(-1,"执行失败！",e);
        }
    }
@@ -130,8 +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){
            e.printStackTrace();
            return write(-1,"获取失败！");
            return error(-1,"执行失败！",e);
        }
    }
}

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

@@ -1,12 +1,21 @@
package com.yihu.jw.care.endpoint.third.patient;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.service.course.CourseService;
import com.yihu.jw.care.service.org.BaseOrgService;
import com.yihu.jw.care.service.sign.ServicePackageService;
import com.yihu.jw.care.service.third.patient.PatientNoLoginService;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.service.WechatInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.axis.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -33,6 +42,15 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    private WechatInfoService wechatInfoService;
    @Autowired
    private BasePatientWechatDao basePatientWechatDao;
    @Autowired
    private CourseService courseService;
    @Autowired
    private BaseOrgService orgService;
    @Autowired
    private ServicePackageService servicePackageService;
    @Autowired
    private PatientNoLoginService patientNoLoginService;
    /**
     * 获取微信openid
     *
@@ -75,4 +93,82 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            return  failedException(e);
        }
    }
    @GetMapping("getCourseByOrg")
    @ApiOperation(value = "在线报名-根据机构展示")
    public ObjEnvelop getCourseByOrg(
            @ApiParam(name = "longitude", value = "所在位置经度", defaultValue = "118.10388605") @RequestParam(value = "longitude", required = true) String longitude,
            @ApiParam(name = "latitude", value = "所在位置纬度", defaultValue = "24.48923061") @RequestParam(value = "latitude", required = true) String latitude
//            @ApiParam(name = "pageSize", value = "页面大小", defaultValue = "2") @RequestParam(value = "pageSize", required = true) int pageSize,
//            @ApiParam(name = "currentPage", value = "当前页面", defaultValue = "1") @RequestParam(value = "currentPage", required = true) int currentPage
    ) {
        try {
            JSONObject json = courseService.getCourseByOrg(longitude,latitude);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping("getOrgInfoById")
    @ApiOperation(value = "在线报名-获取机构详情")
    public ObjEnvelop getOrgInfoById(
            @ApiParam(name = "id", value = "机构id", defaultValue = "808080eb7861c327017861d18d070011") @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient",required = false) String patient
    ) {
        try {
            JSONObject json = courseService.getOrgInfoById(id,patient);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @GetMapping("getTecInfoById")
    @ApiOperation(value = "在线报名-获取教师详情（根据教师id）")
    public ObjEnvelop getTecInfoById(
            @ApiParam(name = "doctor", value = "教师id", defaultValue = "402803816babc778016babca89ea0032") @RequestParam(value = "doctor", required = true) String doctor,
            @ApiParam(name = "orgCode", value = "机构code", defaultValue = "xm10086") @RequestParam(value = "orgCode", required = true) String orgCode,
            @ApiParam(name = "page", value = "page", defaultValue = "1") @RequestParam(value = "page", required = true) int page,
            @ApiParam(name = "size", value = "size", defaultValue = "10") @RequestParam(value = "size", required = true) int size
    ) {
        try {
            JSONObject json = courseService.getTecInfoById(doctor,orgCode,page,size);
            return ObjEnvelop.getSuccess("获取成功",json);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @RequestMapping(value = "/findOrgList", method = RequestMethod.GET)
    @ApiOperation(value = "获取机构成员")
    public ListEnvelop findOrgList(@ApiParam(name = "type", value = "机构类型1. 等级医院2. 社区医院3.  养老机构")
                                   @RequestParam(value = "type", required = false) String type,
                                   @ApiParam(name = "name", value = "机构名称")
                                   @RequestParam(value = "name", required = false) String name,
                                   @ApiParam(name = "orgCode", value = "orgCode")
                                   @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return ListEnvelop.getSuccess("获取成功",orgService.findOrgList(type,name,orgCode));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "findSignOrg")
    @ApiOperation(value = "查找签约机构")
    public ListEnvelop findSignOrg (
            @ApiParam(name = "patient", value = "医生code", required = false)
            @RequestParam(value = "patient",required = false) String patient,
            @ApiParam(name = "name", value = "机构名称", required = false)
            @RequestParam(value = "name",required = false) String name,
            @ApiParam(name = "type", value = "类型 3 养老 4 教育，1 医疗", required = false)
            @RequestParam(value = "type",required = false) String type) throws Exception {
        try{
            return ListEnvelop.getSuccess("查询成功",patientNoLoginService.findSignOrg(patient,name,type));
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.third.platForm;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.assistance.EmergencyAssistanceService;
import com.yihu.jw.care.service.doorCoach.DoctorDoorCoachOrderService;
import com.yihu.jw.care.service.doorCoach.PatientDoorCoachOrderService;
@@ -54,6 +55,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseServiceNewsService baseServiceNewsService;
    private BaseController baseController = new BaseController();
    @GetMapping(value = "findOrgLocations")
    @ApiParam("查找机构坐标")
@@ -106,8 +108,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientInfo(patient,patientType));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -124,8 +125,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientEvent(patient,patientType,page,pageSize));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -142,8 +142,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getServiceOrder(patient,patientType,page,pageSize));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -160,10 +159,9 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
                                      @ApiParam(name="end",value="结束时间",defaultValue = "2017-06-02 00:00:00")
                                             @RequestParam(value="end",required = true) String end){
        try {
            return write (200,"查询成功","data",patientInfoPlatFormService.getHealthIndexInfo(patient,type,gi_type,begin,end));
            return baseController.write (200,"查询成功","data",patientInfoPlatFormService.getHealthIndexInfo(patient,type,gi_type,begin,end));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
            return baseController.error(-1,"查询失败",e);
        }
    }
@@ -187,8 +185,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            BaseDoorCoachOrderDO baseDoorCoachOrderDO = doctorDoorCoachOrderService.getDoorServiceOrderById(orderId);
            return ObjEnvelop.getSuccess( "获取成功",  baseDoorCoachOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败, 该医生暂无工单!" + e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -202,8 +199,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            LifeCareOrderDO doorServiceOrderDO = lifeCareOrderService.getServiceOrderById(orderId);
            return ObjEnvelop.getSuccess("获取成功", doorServiceOrderDO);
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError( "获取失败" ,-1);
            return failedObjEnvelopException(e);
        }
    }
@@ -221,8 +217,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("创建成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
            return failedObjEnvelopException(e);
        }
    }
@@ -240,8 +235,7 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
            }
            return ObjEnvelop.getSuccess("查询成功",result.getJSONObject("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
            return failedObjEnvelopException(e);
        }
    }
@@ -255,35 +249,9 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
        try {
            return patientInfoPlatFormService.getEmergencyWarnOrderList(page,pageSize);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("查询失败"+e.getMessage());
            return failedPageEnvelopException(e);
        }
    }
    public String write(int code, String msg, String key, JSONArray value) {
        try {
            org.json.JSONObject json = new org.json.JSONObject();
            json.put("status", code);
            json.put("msg", msg);
            json.put(key, value);
            return json.toString();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "服务器异常，请稍候再试！");
        }
    }
    public String error(int code, String msg) {
        try {
            Map<Object, Object> map = new HashMap<Object, Object>();
            ObjectMapper mapper = new ObjectMapper();
            map.put("status", code);
            map.put("msg", msg);
            return mapper.writeValueAsString(map);
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }
}

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

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

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

@@ -360,7 +360,7 @@ public class YsDeviceService {
        HttpEntity<JSONObject> response = httpClientUtil.assesTokenPostHttp(YsConfig.coverVideoSwitch,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        return responseBody;
        //https://open.ys7.com/doc/zh/book/index/device_ptz.html#device_ptz-api2
        //https://www.yuque.com/u1400669/kb/nu22ks
    }
    /**
@@ -404,25 +404,74 @@ public class YsDeviceService {
        }
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.deviceVideoTimeList,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        JSONArray timeTmp = new JSONArray();
        if (responseBody.getInteger("code")==200){
            JSONArray tmp = responseBody.getJSONArray("data");
            if (tmp==null){
            if (null==tmp||0==tmp.size()){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"未获取到当天录像信息");
                return result;
            }
            tmp.sort(Comparator.comparing(obj -> Long.parseLong(((LinkedHashMap) obj).get("startTime").toString())));
            for (int i=0;i<tmp.size();i++){
                LinkedHashMap mapTmp = tmp.getObject(i,LinkedHashMap.class);
            LinkedHashMap tmpFirst = tmp.getObject(0,LinkedHashMap.class);
            Long startTimeStr1 =  Long.parseLong(tmpFirst.get("startTime").toString()) ;
            long current = System.currentTimeMillis();
            long toDayZero = current/(1000*3600*24)*(1000*3600*24) - TimeZone.getDefault().getRawOffset();
            if (toDayZero-startTimeStr1>0){//去除开始时间不为当天是时间段
                tmp.remove(0);
            }
            if (null==tmp||0==tmp.size()){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"未获取到当天录像信息");
                return result;
            }
            LinkedHashMap mergeTmp = null;
            Iterator<Object> arrIterator = tmp.iterator();
            while (arrIterator.hasNext()) {
                LinkedHashMap mapTmp = (LinkedHashMap) arrIterator.next();
                Long startTimeStr =  Long.parseLong(mapTmp.get("startTime").toString()) ;
                Long endTimeStr = Long.parseLong(mapTmp.get("endTime").toString()) ;
                Date date = new Date(startTimeStr);
                mapTmp.put("startTimeDate",DateUtil.dateToStrLong(date));
                date = new Date(endTimeStr);
                mapTmp.put("endTimeDate",DateUtil.dateToStrLong(date));
                String startTimeDate = DateUtil.dateToStrLong(new Date(startTimeStr));
                String endTimeDate = DateUtil.dateToStrLong(new Date(endTimeStr));
                Long videoLong = (endTimeStr-startTimeStr)/1000;
                if (null==mergeTmp){
                    mergeTmp = new LinkedHashMap();
                    mergeTmp.put("recType",mapTmp.get("recType"));
                    mergeTmp.put("startTime",mapTmp.get("startTime"));
                    mergeTmp.put("endTime",mapTmp.get("endTime"));
                    mergeTmp.put("startTimeDate",startTimeDate);
                    mergeTmp.put("endTimeDate",endTimeDate);
                    mergeTmp.put("createTime",mapTmp.get("createTime"));
                    mergeTmp.put("deviceSerial",mapTmp.get("deviceSerial"));
                    mergeTmp.put("channelNo",mapTmp.get("channelNo"));
                    mergeTmp.put("videoLong",videoLong);
                    continue;
                }
                if (startTimeStr==Long.parseLong(mergeTmp.get("endTime").toString())){//时间区间相连
                    startTimeStr =  Long.parseLong(mergeTmp.get("startTime").toString()) ;
                    videoLong = (endTimeStr-startTimeStr)/1000;
                    mergeTmp.put("endTime",mapTmp.get("endTime"));
                    mergeTmp.put("endTimeDate",endTimeDate);
                    mergeTmp.put("videoLong",videoLong);
                }else{
                    timeTmp.add(mergeTmp);
                    mergeTmp = new LinkedHashMap();
                    mergeTmp.put("recType",mapTmp.get("recType"));
                    mergeTmp.put("startTime",mapTmp.get("startTime"));
                    mergeTmp.put("endTime",mapTmp.get("endTime"));
                    mergeTmp.put("startTimeDate",startTimeDate);
                    mergeTmp.put("endTimeDate",endTimeDate);
                    mergeTmp.put("createTime",mapTmp.get("createTime"));
                    mergeTmp.put("deviceSerial",mapTmp.get("deviceSerial"));
                    mergeTmp.put("channelNo",mapTmp.get("channelNo"));
                    mergeTmp.put("videoLong",videoLong);
                }
                if (!arrIterator.hasNext()){
                    timeTmp.add(mergeTmp);
                }
            }
            result.put(ResponseContant.resultFlag,ResponseContant.success);
            result.put(ResponseContant.resultMsg,tmp);
            result.put(ResponseContant.resultMsg,timeTmp);
        }else {
            result.put(ResponseContant.resultFlag,ResponseContant.fail);
            result.put(ResponseContant.resultMsg,responseBody.getString("msg"));
@@ -634,7 +683,7 @@ public class YsDeviceService {
        if (enable!=null){
            param.add("enable",enable+"");
        }
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.videoList2,param,HttpMethod.POST);
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.fullDayVideo,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        if (responseBody.getInteger("code")==200){
            result.put(ResponseContant.resultFlag,ResponseContant.success);

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

@@ -314,8 +314,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            try {
                JSONObject monitorUrl = ysDeviceServicel.getDeviceLiveAddress(orderDO.getPatient(),devicePatientDeviceDos.get(0).getDeviceSn(),1,null);
                Map<String,Object> map = new HashMap<>();
//                map.put("monitorInfoStatus",result.getIntValue(ResponseContant.resultFlag));
                if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                map.put("monitorInfoStatus",monitorUrl.getIntValue(ResponseContant.resultFlag));
                if (monitorUrl.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                    map.put("monitorInfo",monitorUrl.getString(ResponseContant.resultMsg));
                }
                else {
@@ -1161,8 +1161,8 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        else{
            try {
                JSONObject monitorUrl = ysDeviceServicel.getDeviceLiveAddress(patient,devicePatientDeviceDos.get(0).getDeviceSn(),1,null);
                result.put("monitorInfoStatus",result.getIntValue(ResponseContant.resultFlag));
                if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                result.put("monitorInfoStatus",monitorUrl.getIntValue(ResponseContant.resultFlag));
                if (monitorUrl.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                    result.put("monitorInfo",monitorUrl.getString(ResponseContant.resultMsg));
                }
                else {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/CapacityAssessmentRecordService.java

@@ -142,7 +142,7 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
        return res;
    }
    public PageEnvelop<List<Map<String,Object>>> assessmentPage(String doctorId,String name,int type, int page, int size,
    public PageEnvelop<List<Map<String,Object>>> assessmentPage(String doctorId,String patientId,String name,int type, int page, int size,
                    Integer status,Integer levelConclusion,Integer servicePackageStatus){
        String sql = "SELECT c.id,c.patient,c.assessment_time,c.service_package_status servicePackageStatus, " +
                "c.`status`,c.level_conclusion levelConclusion,c.org_code orgCode,c.org_name orgName,p.name,p.photo,p.mobile,p.sex,p.idcard  ";
@@ -154,6 +154,10 @@ public class CapacityAssessmentRecordService extends BaseJpaService<CapacityAsse
            filters += " and c.assessment_time>='" + DateUtil.getNowYear() + "-01-01' ";
        }
        if(StringUtils.isNoneBlank(patientId)){
            filters += " and c.patient = '"+patientId+"' ";
        }
        if(StringUtils.isNoneBlank(doctorId)){
            filters += " and (c.doctor = '"+doctorId+"' or d.doctor_id = '"+doctorId+"')";
        }

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

@@ -0,0 +1,51 @@
package com.yihu.jw.care.service.third.patient;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by Bing on 2021/6/22.
 */
@Service
public class PatientNoLoginService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 查找签约机构
     * @param patient
     *  type 3 养老 4 教育，1 医疗
     * @return
     */
    public List<BaseOrgDO> findSignOrg(String patient, String name, String type){
        String sql = "SELECT " +
                " DISTINCT o.* " +
                "FROM " +
                " base_service_package_record r, " +
                " base_service_package_item i, " +
                " base_org o " +
                "WHERE " +
                " r.service_package_id = i.service_package_id " +
                "AND i.del = 1 " +
                "and i.org_code = o.code " ;
        if("1".equals(type)){
            sql += " and (o.type =1 or o.type = 2) ";
        }else if("3".equals(type)){
            sql += " and o.type =3 ";
        }
        if (StringUtils.isNotBlank(name)){
            sql += " and o.name like '%"+name+"%' ";
        }
        //type =4 新生儿
        List<BaseOrgDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(BaseOrgDO.class));
        return list;
    }
}

svr/svr-cloud-device/pom.xml

@@ -145,6 +145,12 @@
            <artifactId>bcprov-ext-jdk16</artifactId>
            <version>1.46</version>
        </dependency>
        <dependency>
            <groupId>org.apache.hadoop</groupId>
            <artifactId>hadoop-yarn-api</artifactId>
            <version>2.7.3</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>