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

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

@@ -1589,7 +1589,7 @@ public class ImService {
		imUtil.sendMessage(sender,reciver,"1","111");
	}
	
	public void sendWaiSocketMessage(String sender,String reciver,String content){
		imUtil.sendMessage(sender,reciver,"1",content);
	public void sendWaiSocketMessage(String sender,String reciver,String content,String contentType){
		imUtil.sendMessage(sender,reciver,contentType,content);
	}
}

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

@@ -4,8 +4,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.restmodel.im.ConsultVO;
@@ -13,7 +14,6 @@ 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.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
@@ -47,6 +47,9 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
	@Autowired
	private BaseDoctorDao baseDoctorDao;
	
	@Autowired
	private OutpatientDao outpatientDao;
	
	
	@GetMapping (value = BaseHospitalRequestMapping.DodtorIM.findWaitingRoomOutpatientByDoctor)
	@ApiOperation(value = "医生可接单列表(图文复诊、视频复诊、协同门诊)", notes = "医生可接单列表(图文复诊、视频复诊、协同门诊)")
@@ -236,6 +239,16 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "doctor", value = "医生CODE")
			@RequestParam(value = "doctor",required = true) String doctor)throws Exception{
		prescriptionService.pickVideoPrescripitonWaitingPeople(outpatientCode,doctor);
		WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outpatientCode);
		//发送外层SOCKET消息 在线复诊
		if("2".equals(wlyyOutpatientDO.getOutpatientType())){
			System.out.println("发送外层SOCKET消息：协同门诊医生抢单之后，通知全科医生修改状态");
			JSONObject object = new JSONObject();
			object.put("socket_sms_type",6);
			object.put("relation_code",wlyyOutpatientDO.getId());
			imService.sendWaiSocketMessage(wlyyOutpatientDO.getDoctor(),wlyyOutpatientDO.getGeneralDoctor(),object.toString(),"1");
		}
		return success("请求成功");
	}