// 高才

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -111,7 +111,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
             is_live_oversea_year = mainApplicant.isOverSeasOver1Year()
         }
         
-        if nationality.contains("中国") { // 中国国籍
+        if nationality == "中国-China" { // 中国国籍
             let isLiveInChina = liveCountry.contains("中国".local)
             if isLiveInChina { // 居住国内
                 if familyMember.isHandled == 0 { // 没办理过港澳通行证

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Certificates(证书上传和证书信息)/YHGCCertificateInfoController.swift

@@ -111,7 +111,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
             is_live_oversea_year = mainApplicant.isOverSeasOver1Year()
         }
         
-        if nationality.contains("中国") { // 中国国籍
+        if nationality == "中国-China" { // 中国国籍
             let isLiveInChina = liveCountry.contains("中国".local)
             if isLiveInChina { // 居住国内
                 if familyMember.isHandled == 0 { // 没办理过港澳通行证
@@ -162,7 +162,8 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
         let showPassport = a.showPassport
         let isPassportMust = a.isPassportMust
         
-        if familyMember.nationality.contains("中国") {
+//
+        if familyMember.nationality == "中国-China" {
             var isChinaIdCardMust = true
             let title1 = YHFormTitleItem(type: .chinaIdCardInfo)
             let item10 = YHFormDetailItem(type: .chinaIdentityCardNumber, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.number, tips:"请输入证件号码".local)
@@ -554,7 +555,7 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
         let showPassport = a.showPassport
         let isPassportMust = a.isPassportMust
         
-        if familyMember.nationality.contains("中国") {
+        if familyMember.nationality == "中国-China" {
             if familyMember.certificates.cnIdentityCard.number.count <= 0
                 || familyMember.certificates.cnIdentityCard.issueAt.count <= 0
                 || familyMember.certificates.cnIdentityCard.issueDateStartAt.count <= 0