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

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -993,9 +993,6 @@ public class ImService {
			jsonObject.put("sex",p.getSex());
			jsonObject.put("name",p.getName());
			
			
			String content = jsonObject.toString();
			
			//4、创建咨询
			JSONObject users = new JSONObject();//咨询参与者
			
@@ -1005,10 +1002,18 @@ public class ImService {
				users.put(wlyyOutpatientDO.getGeneralDoctor(),0);
				ct.setType(12);
				consultTitle = "申请协同门诊";
				
				JSONObject consultName = new JSONObject();
				consultName.put("patientName",p.getName());
				consultName.put("doctorName",doctor.getName());
				jsonObject.put("name",consultName.toJSONString());
			}else{
				users.put(patient, 0);
				consultTitle = "申请复诊";
			}
			
			String content = jsonObject.toString();
			
			users.put(doctorCode, 0);
			//关联业务code
			ct.setRelationCode(outpatientCode);
@@ -1778,7 +1783,11 @@ public class ImService {
		jsonObject.put("content",symptoms);
		jsonObject.put("age",DateUtil.getAgeForIdcard(p.getIdcard()));
		jsonObject.put("sex",p.getSex());
		jsonObject.put("name",p.getName());
		
		JSONObject consultName = new JSONObject();
		consultName.put("patientName",p.getName());
		consultName.put("doctorName",specialDoctor.getName());
		jsonObject.put("name",consultName.toJSONString());
		
		String content = jsonObject.toString();