Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/consult/ConsultDao.java

@@ -31,6 +31,6 @@ public interface ConsultDao extends PagingAndSortingRepository<Consult, Long>, J
	@Query("select count(a) from Consult a,ConsultTeamDoctor b  where a.code = b.consult and a.patient=?1 and b.to=?2 and b.from is null")
	Integer findByPatient(String patientCode,String doctorCode);
	@Query("select a.id,a.type,a.code,a.title,a.symptoms,a.czrq,b.status,b.adminTeamId from Consult a,ConsultTeam b where a.code = b.consult and a.patient = ?1 and b.adminTeamId = ?2 and a.del = '1' order by a.czrq desc")
	@Query("select a.id,a.type,a.code,a.title,a.symptoms,a.czrq,b.status,b.adminTeamId,b.team from Consult a,ConsultTeam b where a.code = b.consult and a.patient = ?1 and b.adminTeamId = ?2 and a.del = '1' order by a.czrq desc")
	Page<Object> findByPatientAndTeam(String patient,Long team, Pageable pageRequest);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultService.java

@@ -1,3 +1,4 @@
package com.yihu.wlyy.service.app.consult;
import java.util.Date;
@@ -114,22 +115,14 @@ public class ConsultService extends BaseService {
	public void sendMucMessageBySingnType(String doctor,String doctorName,String patient,String  content,String contentType,String title){
		//add by linz 增加签约关系查询，
		List<SignFamily> sfList = signFamilyDao.findSSandFamilyByDoctorPatient(doctor, patient);
		int type = 2;
		if(sfList!=null&&sfList.size()==1){
			//只存在一种签约关系
			type = sfList.get(0).getType();
		}else if(sfList!=null&&sfList.size()==2){
			//两种签约关系直接取家庭签约
			type = 2;
		}else{
			//没找到签约关系
			type=0;
		SignFamily signFamily = signFamilyDao.findByDoctorPatient(doctor, patient);
		if(signFamily==null){
			signFamily = signFamilyDao.findSsSignByDoctorPatient(doctor, patient);
		}
		if(type!=0){
			new SendPatientUtil(doctor,doctorName,patient, contentType, content,title,type+"",sfList.get(0).getTeamCode()).start();
		}else{
			new SendPatientUtil(doctor,doctorName,patient, contentType, content,title,"2",sfList.get(0).getTeamCode()).start();
		if(signFamily==null){
			throw new RuntimeException("无有效签约关系！");
		}
		new SendPatientUtil(doctor,doctorName,patient, contentType, content,title,signFamily.getType()+"",signFamily.getTeamCode()).start();
	}
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -589,6 +589,7 @@ public class ConsultTeamService extends ConsultService {
            consult.put("czrq", objArr[5]);
            consult.put("status", objArr[6]);
            consult.put("adminTeamCode", objArr[7]);
            consult.put("team", objArr[8]);
            consult.put("patient", patient);
            consult.put("patientName", p.getName());
            consult.put("patientPhoto", p.getPhoto());

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1026,6 +1026,8 @@ public class FamilyContractService extends BaseService {
            if(sessionObj.getInt("status")==-1){
                throw  new RuntimeException(sessionObj.getString("message"));
            }
            ImUtill.updateSessionStatus(patient.getCode()+"_"+sf.getTeamCode()+"_"+2,ImUtill.SESSION_STATUS_END);
            ImUtill.sendImMsg(doc.getCode(),doc.getName(),patient.getCode()+"_"+sf.getTeamCode()+"_"+2,"0","家庭医生代理签约成功！","1");
        }
        BusinessLogs.info(BusinessLogs.BusinessType.sign, signDoctorCode, sf.getPatient(), new JSONObject(sf));

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ImUtill.java

@@ -27,6 +27,19 @@ public class ImUtill {
        return response;
    }
    /**
     * 更新会话状态
     *
     * @param sessionId       会话ID
     * @param status 状态
     */
    public static String updateSessionStatus(String sessionId,String status) {
        String imAddr = SystemConf.getInstance().getImListGet() + "/api/v2/sessions/"+sessionId+"/status?status="+status+"&sessionId="+sessionId;
        JSONObject params = new JSONObject();
        String response = HttpClientUtil.postBody(imAddr, params);
        return response;
    }
    /**
     * 发送消息给IM
@@ -269,4 +282,6 @@ public class ImUtill {
    public  static final String SESSION_TYPE_P2P = "2";
    public  static final String SESSION_TYPE_GROUP = "3";
    public  static final String SESSION_TYPE_SYSTEM = "0";
    public  static final String SESSION_STATUS_PROCEEDINGS= "0";
    public  static final String SESSION_STATUS_END= "1";
}