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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -61,7 +61,13 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
     */
    public int familyRelationTrans(BasePatientDO patient, int relation) throws Exception {
        int relationTrans = 0;
        if(patient.getSex()==null&&StringUtils.isNoneBlank(patient.getIdcard())){
            try {
                patient.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard_new(patient.getIdcard())));
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        switch (relation) {
            case 1:
            case 2:

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/message/DoctorSendUnreadJob.java

@@ -40,9 +40,11 @@ public class DoctorSendUnreadJob implements Job {
            if (StringUtils.isNotBlank(mobile)){
                if (MobileUtils.checkCellphone(mobile)){
                    String doctorName = tmp.get("name").toString();
                    String unReadCount = imUtil.SessionsUnreadMessageCountByUserId(doctorId)+"";
                    Integer unReadCount = imUtil.SessionsUnreadMessageCountByUserId(doctorId);
                    try {
                        messageUtil.sendTXYSJson("974597",mobile,doctorName,unReadCount);
                        if (unReadCount>0){
                            messageUtil.sendTXYSJson("974597",mobile,doctorName,unReadCount+"");
                        }
                    }catch (Exception e){
                        e.printStackTrace();
                    }