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

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

@@ -142,9 +142,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@PostMapping(value = "sendGetuiMessage")
	@ApiOperation(value = "im推送个推消息")
	public Envelop sendGetuiMessage(String sessionId,String type,String contentType,String senderName,String senderId,String targetId){
	public Envelop sendGetuiMessage(String sessionId,String type,String contentType,String senderName,String senderId,String targetId,String content){
		try {
			logger.info("im推送1个推消息"+sessionId+","+senderName+","+targetId);
			String body = "收到来自"+senderName+"的一条消息，请关注并及时处理。";
			String peerName = null;
			String sql = "SELECT name from im_internet_hospital.sessions WHERE id = '"+sessionId+"'";
@@ -152,10 +151,11 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			if(list!=null&&list.size()>0){
				peerName = URLEncoder.encode(list.get(0).get("name").toString(), "UTF-8");
			}
			String url = "/chatroom/index?type="+type+"&peerId="+senderId+"&action=callVideo&peerName="+peerName+"&sessionId="+sessionId;
			String url = "/chatroom/index?type="+type+"&peerId="+senderId+"&action=callVideo&peerName="+peerName+"&sessionId="+sessionId+"&content="+URLEncoder.encode(content, "UTF-8");
			logger.info("url="+url);
			messageUtil.sendDoctorGetuiMessage(targetId,"4",url,"im消息",body);
			messageUtil.sendDoctorDingdingMessage(null,targetId,"text","4",body,null,null);
//			messageUtil.sendDoctorDingdingMessage(null,targetId,"text","4",body,null,null);
			return Envelop.getSuccess("请求成功");
		}catch (Exception e){
			e.printStackTrace();

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

@@ -125,13 +125,19 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
            patientDO.setSsc(null);
            patientDO.setMobile(mobile);
            patientDO.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard_new(idcard)));
            try {
                patientDO.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
            }catch (Exception e){
                e.printStackTrace();
            }
            patientDO.setName(name);
            patientDO.setArchiveType(1);
            patientDO.setArchiveStatus(1);
            if(patientDO.getSex()==2){
                patientDO.setPhoto("group1/M00/00/7C/rBoAbmIu8g6ANMrpAAAiSDNDGrM907.png");
                patientDO.setPhoto("group1/M00/00/04/ChIrKGIxtGOAeZ1HAAAiSDNDGrM335.png");
            }else{
                patientDO.setPhoto("group1/M00/00/5A/rBoAb2Iu8gOAQ9WYAAAgcmCLvjQ782.png");
                patientDO.setPhoto("group1/M00/00/04/ChIrKGIxtDmAaIxuAAAgcmCLvjQ862.png");
            }
            patientDO.setDel("1");
            patientDO.setLocked(0);
@@ -201,9 +207,9 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
                patientDO.setArchiveType(1);
                patientDO.setArchiveStatus(1);
                if(patientDO.getSex()==2){
                    patientDO.setPhoto("group1/M00/00/7C/rBoAbmIu8g6ANMrpAAAiSDNDGrM907.png");
                    patientDO.setPhoto("group1/M00/00/04/ChIrKGIxtGOAeZ1HAAAiSDNDGrM335.png");
                }else{
                    patientDO.setPhoto("group1/M00/00/5A/rBoAb2Iu8gOAQ9WYAAAgcmCLvjQ782.png");
                    patientDO.setPhoto("group1/M00/00/04/ChIrKGIxtDmAaIxuAAAgcmCLvjQ862.png");
                }
                patientDO.setDel("1");
                patientDO.setLocked(0);