// 家庭成员

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

@@ -440,41 +440,39 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
             } else if detailItem.type == .roleInHK { // 在港身份
                 
                 let identity = self.child?.hkIdentity ?? ""
-                YHFormPickerView.show(type: .identity, selectTitle:identity ) {
-                    [weak self] selectType in
+                
+                YHSheetPickerView.show(type:.identity, selectTitle: identity) {
+                    [weak self] selectItem in
                     guard let self = self else { return }
-                    self.child?.hkIdentity = selectType.title
+                    self.child?.hkIdentity = selectItem.title
                     self.loadInfo()
                     save()
                 }
+                
             } else if detailItem.type == .occupation { // 职业
                 let occupation = self.child?.occupation ?? ""
-                YHFormPickerView.show(type: .occupation, selectTitle:occupation ) {
-                    [weak self] selectType in
+                YHSheetPickerView.show(type:.occupation, selectTitle: occupation) {
+                    [weak self] selectItem in
                     guard let self = self else { return }
-                    self.child?.occupation = selectType.title
+                    self.child?.occupation = selectItem.title
                     self.loadInfo()
                     save()
                 }
                 
             } else if detailItem.type == .gender { // 性别
-                guard let child = child else { return }
-                let isMale = child.isMale()
-                let selectType:YHFormPickerViewSubType = isMale ? .gender(.male) : .gender(.female)
-                YHFormPickerView.show(type: .gender, selectType:selectType) {
-                    [weak self] selectType in
+                YHSheetPickerView.show(type: .gender, selectTitle:child?.sexName()) {
+                    [weak self] selectItem in
                     guard let self = self else { return }
-                    let selectMale = (selectType.index == YHFormPickerViewSubType.gender(.male).index)
-                    self.child?.setMale(selectMale)
+                    self.child?.setSexName(selectItem.title)
                     self.loadInfo()
                     save()
                 }
+                
             } else if detailItem.type == .marriageState { // 婚姻
-                let marriage = self.child?.married
-                YHFormPickerView.show(type: .marriage, selectTitle:marriage) {
-                    [weak self] selectType in
+                YHSheetPickerView.show(type: .marriage, selectTitle:self.child?.married) {
+                    [weak self] selectItem in
                     guard let self = self else { return }
-                    self.child?.married = selectType.title
+                    self.child?.married = selectItem.title
                     self.loadInfo()
                     save()
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHParentInfoVC.swift

@@ -461,8 +461,7 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 
             } else if detailItem.type == .marriageState { // 婚姻
-                let marriage = self.parentInfo?.married ?? ""
-                YHSheetPickerView.show(type: .marriage, selectTitle:marriage) {
+                YHSheetPickerView.show(type: .marriage, selectTitle:self.parentInfo?.married) {
                     [weak self] selectItem in
                     guard let self = self else { return }
                     self.parentInfo?.married = selectItem.title