Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyService.java

@@ -17,6 +17,7 @@ import com.yihu.wlyy.repository.patient.PatientInvitationLogDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.patient.SocialSecurityInfoDao;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.util.MD5;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.wechat.util.WeiXinTempMsgSendUtils;
import org.json.JSONArray;
@@ -187,6 +188,10 @@ public class FamilyService {
                    if (!StringUtils.isEmpty(jo.get("name"))) {
                        patientTemp.setName(jo.get("name").toString());
                    }
                    String password=idcard.substring(idcard.length()-6);
                    String salt= UUID.randomUUID().toString().replace("-","");
                    patientTemp.setSalt(salt);
                    patientTemp.setPassword(MD5.GetMD5Code(password+salt));
                    patientTemp.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard(jo.get("idcard").toString())));
                    patientTemp.setBirthday(IdCardUtil.getBirthdayForIdcard(jo.get("idcard").toString()));
                    SocialSecurityInfo socialSecurityInfo = socialSecurityInfoDao.findBySfzh18Max(jo.get("idcard").toString());