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

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -293,7 +293,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			) throws Exception {
		int resutl = imService.finish(consult,patientCode,1);
		BasePatientDO basePatientDO = basePatientService.findByIdAndDel(patientCode);
		String jsonStr = "{\"id\":\""+UUID.randomUUID().toString()+"\",\"sender_id\":\""+patientCode+"\",\"sender_name\":\"系统\",\"timestamp\":1564047386016,\"content_type\":7,\"content\":\"{\"msg\":\""+basePatientDO.getName()+"结束了咨询\",\"consultcode\":\""+consult+"\"}\",\"business_type\":1}";
		
		JSONObject msgObj = new JSONObject();
		msgObj.put("msg",basePatientDO.getName()+"结束了咨询");
		msgObj.put("consult",consult);
		
		
		String jsonStr = "{\"id\":\""+UUID.randomUUID().toString()+"\",\"sender_id\":\""+patientCode+"\",\"sender_name\":\"系统\",\"timestamp\":1564047386016,\"content_type\":7,\"content\":"+msgObj.toString()+",\"business_type\":1}";
		return success(jsonStr);
	}