// 子女信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseBasicInfoVC.swift

@@ -118,14 +118,16 @@ class YHSpouseBasicInfoVC: YHBaseViewController {
         let item10 = YHFormDetailItem(type: .occupation)
         item10.value = spouse.occupation
         item10.placeHolder = "请输入".local
-
-        let item11 = YHFormDetailItem(type: .occupationName)
-        item11.value = spouse.occupationName
-        item11.placeHolder = "请输入".local
-
-        let arr1:[YHFormItemProtocol] = [title1, item10, item11]
+        var arr1:[YHFormItemProtocol] = [title1, item10]
         
-        // 职业信息
+        if spouse.isNowHaveJob()  {
+            let item11 = YHFormDetailItem(type: .occupationName)
+            item11.value = spouse.occupationName
+            item11.placeHolder = "请输入".local
+            arr1.append(item11)
+        }
+        
+        // 学位信息
         let title2 = YHFormTitleItem(type: .degreeInfo)
         let item20 = YHFormDetailItem(type: .ownDegree)
         item20.placeHolder = "请选择".local

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -523,7 +523,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var operatorAme: SmartAny?
     // 香港身份证号
     var hkIdentityCard: String?
-    // 性别
+    // 性别 男：1 女：2
     var sex: Int = 0
     // 婚姻状况
     var married: String?
@@ -534,6 +534,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     // 香港身份证信息
     var childHasHkId: YHChildStepchildClass?
+    // 是否前次婚姻子女
     var childStepchild: YHChildStepchildClass?
     // 在港信息
     var childInHk: YHChildStepchildClass?
@@ -721,6 +722,34 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.custody = val ? 1 : 0
     }
     
+    // 是否是男性
+    func isMale() -> Bool {
+      return  self.sex == 1
+    }
+    
+    func setMale(_ val: Bool) {
+        self.sex = (val ? 1 : 2)
+    }
+    
+    func sexName() -> String? {
+        if self.sex == 1 {
+            return "男".local
+        } else if self.sex == 2 {
+            return "女".local
+        }
+        return ""
+    }
+    
+    // 是否前一次婚姻子女
+    func isPreviousMarriageChild() -> Bool {
+       return self.childStepchild?.has == "Y"
+    }
+    
+    func setPreviousMarriageChild(_ val: Bool) {
+        self.childStepchild?.has = (val ? "Y" : "N")
+    }
+    
+    
     var relationType:YHFamilyMemberType {
         
         if relation == "1" {