// 家庭成员bug

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -613,7 +613,9 @@ extension YHChildBasicInfoVC {
             YHHUD.flash(message: "资料还未填完")
             return false
         }
-        if let hkIdentityCard = child?.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
+        guard let child = child else { return false}
+
+        if child.isHaveHKIdentityCard(), let hkIdentityCard = child.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
             isNeedShowError = true
             loadInfo()
             YHHUD.flash(message: "请输入正确的香港身份证号码")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -565,7 +565,6 @@ extension YHBrotherInfoVC {
         }
         
         if brotherInfo.isHaveHKIdentityCard() { // 办理过香港身份证才显示证号
-            
             if isEmptyString(brotherInfo.hkIdentityCard) {
                 return false
             }
@@ -587,7 +586,8 @@ extension YHBrotherInfoVC {
                 YHHUD.flash(message: "资料还未填完")
                 return
             }
-            if let hkIdentityCard = brotherInfo?.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
+            guard let brotherInfo = brotherInfo else { return  }
+            if  brotherInfo.isHaveHKIdentityCard(), let hkIdentityCard = brotherInfo.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
                 isNeedShowError = true
                 loadInfo()
                 YHHUD.flash(message: "请输入正确的香港身份证号码")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -628,8 +628,9 @@ extension YHParentInfoVC {
                 YHHUD.flash(message: "资料还未填完")
                 return
             }
-            
-            if let parent = parentInfo, !parent.isDead(), let hkIdentityCard = parentInfo?.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
+            guard let parentInfo = parentInfo else { return  }
+
+            if  parentInfo.isHaveHKIdentityCard(), !parentInfo.isDead(), let hkIdentityCard = parentInfo.hkIdentityCard, !hkIdentityCard.isHKIdentityCardNumber() {
                 isNeedShowError = true
                 loadInfo()
                 YHHUD.flash(message: "请输入正确的香港身份证号码")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -278,7 +278,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             YHHUD.flash(message: "资料还未填完")
             return false
         }
-        if let hkIdentityCard = spouse.hkIdentityCard,  !hkIdentityCard.isHKIdentityCardNumber() {
+        if spouse.isHaveHKIdentityCard(), let hkIdentityCard = spouse.hkIdentityCard,  !hkIdentityCard.isHKIdentityCardNumber() {
             isNeedShowError = true
             loadInfo()
             YHHUD.flash(message: "请输入正确的香港身份证号码")