// 家庭

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

@@ -28,6 +28,15 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             basicInfoVC.child = child
         }
     }
+    
+    var mainApplicantInfo: YHMyMainApplicantInfoModel? {
+        didSet {
+            if let mainApplicantInfo = mainApplicantInfo {
+                primaryInfoVC.mainApplicantInfo = mainApplicantInfo
+            }
+        }
+    }
+    
     var stepVCs:[YHFaimilyStepItem] = []
     
     var _currentStep = 0

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

@@ -11,6 +11,8 @@ import UIKit
 class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
     var child:YHFamilyMember?
+    var mainApplicantInfo: YHMyMainApplicantInfoModel?
+
     weak var delegate:YHSpouseInfoVCProtocol?
     var isNeedShowError = false
     // 是否随行能编辑
@@ -113,10 +115,21 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             // 港澳通信证
             var isHiddenHK = true
             if child.nationality.contains("中国") { // 中国国籍
-                let isLiveInChina = child.address.country.contains("中国".local)
-                if isLiveInChina || (!isLiveInChina && !child.isOverSeasOver1Year()) {
-                    // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
-                    isHiddenHK = false
+                if child.isLiveTother() { // 与主申请人同住
+                    if let mainApplicantInfo = mainApplicantInfo {
+                        let isLiveInChina = mainApplicantInfo.applicant_address.country.contains("中国".local)
+                        if isLiveInChina || (!isLiveInChina && !mainApplicantInfo.isOverSeasOver1Year()) {
+                            // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
+                            isHiddenHK = false
+                        }
+                    }
+                    
+                } else { // 不与主申请人同住
+                    let isLiveInChina = child.address.country.contains("中国".local)
+                    if isLiveInChina || (!isLiveInChina && !child.isOverSeasOver1Year()) {
+                        // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
+                        isHiddenHK = false
+                    }
                 }
             }
             

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

@@ -49,6 +49,15 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             }
         }
     }
+    
+    var mainApplicantInfo: YHMyMainApplicantInfoModel? {
+        didSet {
+            if let mainApplicantInfo = mainApplicantInfo {
+                primaryInfoVC.mainApplicantInfo = mainApplicantInfo
+            }
+        }
+    }
+    
     var _currentStep = 0
     var currentStep:Int {
         

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

@@ -13,6 +13,8 @@ import SwifterSwift
 class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
     
     var spouse:YHFamilyMember?
+    var mainApplicantInfo: YHMyMainApplicantInfoModel?
+
     weak var delegate:YHSpouseInfoVCProtocol?
     // 是否显示未填写错误提示
     var isNeedShowError = false
@@ -117,10 +119,21 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             // 港澳通信证
             var isHiddenHK = true
             if spouse.nationality.contains("中国") { // 中国国籍
-                let isLiveInChina = spouse.address.country.contains("中国".local)
-                if isLiveInChina || (!isLiveInChina && !spouse.isOverSeasOver1Year()) {
-                    // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
-                    isHiddenHK = false
+                if spouse.isLiveTother() { // 与主申请人同住
+                    if let mainApplicantInfo = mainApplicantInfo {
+                        let isLiveInChina = mainApplicantInfo.applicant_address.country.contains("中国".local)
+                        if isLiveInChina || (!isLiveInChina && !mainApplicantInfo.isOverSeasOver1Year()) {
+                            // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
+                            isHiddenHK = false
+                        }
+                    }
+                    
+                } else { // 不与主申请人同住
+                    let isLiveInChina = spouse.address.country.contains("中国".local)
+                    if isLiveInChina || (!isLiveInChina && !spouse.isOverSeasOver1Year()) {
+                        // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
+                        isHiddenHK = false
+                    }
                 }
             }
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -592,38 +592,40 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
         
              // 配偶
              if detailItem.relationType == .spouse {
-             let vc = YHSpouseInfoContainerVC()
-             vc.spouse = detailItem
-             vc.orderId = orderId
-             self.navigationController?.pushViewController(vc)
-             return
+                 let vc = YHSpouseInfoContainerVC()
+                 vc.spouse = detailItem
+                 vc.mainApplicantInfo = self.familyMemberInfo?.applicant
+                 vc.orderId = orderId
+                 self.navigationController?.pushViewController(vc)
+                 return
              }
              
              // 父母
              if detailItem.relationType == .father || detailItem.relationType == .mother {
-             let vc = YHParentInfoVC()
-             vc.parentInfo = detailItem
-             vc.orderId = orderId
-             self.navigationController?.pushViewController(vc)
-             return
+                 let vc = YHParentInfoVC()
+                 vc.parentInfo = detailItem
+                 vc.orderId = orderId
+                 self.navigationController?.pushViewController(vc)
+                 return
              }
              
              // 子女
              if detailItem.relationType == .child {
-             let vc = YHChildInfoContainerVC()
-             vc.child = detailItem
-             vc.orderId = orderId
-             self.navigationController?.pushViewController(vc)
-             return
+                 let vc = YHChildInfoContainerVC()
+                 vc.child = detailItem
+                 vc.mainApplicantInfo = self.familyMemberInfo?.applicant
+                 vc.orderId = orderId
+                 self.navigationController?.pushViewController(vc)
+                 return
              }
              
              // 兄弟姐妹
              if detailItem.relationType == .brother {
-             let vc = YHBrotherInfoVC()
-             vc.orderId = orderId
-             vc.brotherInfo = detailItem
-             self.navigationController?.pushViewController(vc)
-             return
+                 let vc = YHBrotherInfoVC()
+                 vc.orderId = orderId
+                 vc.brotherInfo = detailItem
+                 self.navigationController?.pushViewController(vc)
+                 return
              }
             
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -539,6 +539,7 @@ class YHFormDetailItem : YHFormItemProtocol {
 
 /*  ***** ***** ***** ***** ***** ***** ***** ***** */
 
+
 // MARK: - 家庭成员 YHData
 class YHFamilyMemberGroupInfo: SmartCodable {
     
@@ -547,6 +548,7 @@ class YHFamilyMemberGroupInfo: SmartCodable {
     var spouse: YHFamilyMember?
     var child: [YHFamilyMember]?
     var brother: [YHFamilyMember]?
+    var applicant: YHMyMainApplicantInfoModel?
 
     enum CodingKeys: String, CodingKey {
         case father = "father"
@@ -554,6 +556,7 @@ class YHFamilyMemberGroupInfo: SmartCodable {
         case spouse = "spouse"
         case brother = "brother"
         case child = "child"
+        case applicant = "applicant"
     }
     
     func checkDefaultValue() -> Self {
@@ -589,7 +592,23 @@ enum YHFamilyMemberType: Int {
     case brother = 5
 }
 
-
+class YHMyMainApplicantInfoModel: SmartCodable {
+    
+    var applicant_address: YHAddress = YHAddress()
+    var address_aboard: Int = 0
+    
+    // 是否在海外居住满1年及以上 1:是 2：否
+    var is_live_oversea_year: Int = 2
+    
+    // 是否在海外居住满1年及以上
+    func isOverSeasOver1Year() -> Bool {
+        return self.is_live_oversea_year == 1
+    }
+    
+    required init() {
+        
+    }
+}
 
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {