家人免疫关闭BUG修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildFamilyImmuneService.java

@@ -45,11 +45,7 @@ public class ChildFamilyImmuneService extends BaseService {
	public void addFamilyMembers(ChildInfo childInfo, String uid, String idcard, String ssc,Integer relation) throws Exception {
		
		ChildFamilyImmune childFamilyImmune = new ChildFamilyImmune();
		if(childInfo.getId() == null
				|| StringUtils.isBlank(childInfo.getIdcard())
					|| StringUtils.isBlank(childInfo.getSsc())){
			childInfo.setIdcard(idcard);
			childInfo.setSsc(ssc);
		if(childInfo.getId() == null){
			childInfoDao.save(childInfo);
		}else{
			childFamilyImmune = childFamilyImmuneDao.findByfaAndChildCodeAndFamilyCode(childInfo.getCode(),uid);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -494,11 +494,11 @@ public class FamilyMemberController extends WeixinBaseController {
    
            ChildInfo childInfo  = childInfoService.getByBarCode(barCode);
            
            if(!idcard.equals(childInfo.getIdcard()) && StringUtils.isNotBlank(childInfo.getIdcard())){
            if(StringUtils.isNotBlank(idcard) && !idcard.equals(childInfo.getIdcard()) && StringUtils.isNotBlank(childInfo.getIdcard())){
                return error(-1, "输入的新生儿身份证信息不一致，无法绑定");
            }
    
            if(!ssc.equals(childInfo.getSsc()) && StringUtils.isNotBlank(childInfo.getSsc())){
            if(StringUtils.isNotBlank(ssc)&& !ssc.equals(childInfo.getSsc()) && StringUtils.isNotBlank(childInfo.getSsc())){
                return error(-1, "输入的新生儿社保卡不一致，无法绑定");
            }