// 高才

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

@@ -162,6 +162,18 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
         let showPassport = a.showPassport
         let isPassportMust = a.isPassportMust
         
+        if familyMember.nationality.contains("中国") {
+            var isChinaIdCardMust = true
+            let title1 = YHFormTitleItem(type: .chinaIdCardInfo)
+            let item10 = YHFormDetailItem(type: .chinaIdentityCardNumber, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.number, tips:"请输入证件号码".local)
+            let item11 = YHFormDetailItem(type: .certificateSignPlace, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueAt, tips:"请输入签发地".local)
+            let item12 = YHFormDetailItem(type: .certificateSignDate, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueDateStartAt, tips:"请选择签发日期".local)
+            let item13 = YHFormDetailItem(type: .certificateValidDate, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueDateEndAt, tips:"请选择届满日期".local)
+            let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13]
+            items.append(arr1)
+        }
+        
+        
         if showHK { // 显示港澳通行证
             let title1 = YHFormTitleItem(type: .hkAndMacaoPassport)
             let item10 = YHFormDetailItem(type: .traverlPassportNumber, isNeed:isHKMust, value: familyMember.certificates.hkMacaoPass.number, tips:"请输入证件号码".local)
@@ -542,6 +554,17 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
         let showPassport = a.showPassport
         let isPassportMust = a.isPassportMust
         
+        if familyMember.nationality.contains("中国") {
+            if familyMember.certificates.cnIdentityCard.number.count <= 0
+                || familyMember.certificates.cnIdentityCard.issueAt.count <= 0
+                || familyMember.certificates.cnIdentityCard.issueDateStartAt.count <= 0
+                || familyMember.certificates.cnIdentityCard.issueDateEndAt.count <= 0
+            {
+                return false
+            }
+        }
+        
+        
         if showHK, isHKMust {
             
             if familyMember.certificates.hkMacaoPass.number.count <= 0

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

@@ -69,24 +69,30 @@ class YHGCChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
         // 子女信息
         let title0 = YHFormTitleItem(type: .childInfo)
+        
         let item00 = YHFormDetailItem(type: .childName)
         item00.value = child.subsetName
         item00.tips = "请输入子女姓名".local
+        
         let item01 = YHFormDetailItem(type: .everName, isNeed: false)
         item01.value = child.usedName
+        
         let item02 = YHFormDetailItem(type: .befourMarryFirstName, isNeed: false)
         item02.value = child.surname
+        
         let item03 = YHFormDetailItem(type: .gender)
         item03.value = child.sexName()
         item03.tips = "请选择性别".local
+        
         let item04 = YHFormDetailItem(type: .marriageState)
         item04.value = child.married
         item04.tips = "请选择婚姻状况".local
+        
         let item06 = YHFormDetailItem(type: .birthNation)
         item06.value = String(child.isBirthOverSeas())
         item06.tips = "请选择出生国家/地区".local
-        let item07 = YHFormDetailItem(type: .birthCity)
         
+        let item07 = YHFormDetailItem(type: .birthCity)
         if child.isBirthOverSeas() {
             item07.value = child.birthPlace.foreign
             item07.tips = "请输入出生城市".local