处理一处 bug

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -246,7 +246,7 @@ private extension YHPreviewViewModel {
                     let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
                     let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover).defaultStringIfEmpty())
                     
-                    let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .level)
+                    let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.professional_level), type: .level)
                     let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
                     arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
                 }
@@ -466,7 +466,7 @@ private extension YHPreviewViewModel {
                     str = ""
                 } else {
                     if str == "8888-01-01" {
-                        str = "至今"
+                        str = "长期"
                     }
                 }
                 let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -490,7 +490,7 @@ private extension YHPreviewViewModel {
                         str = ""
                     } else {
                         if str == "8888-01-01" {
-                            str = "至今"
+                            str = "长期"
                         }
                     }
                     let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -518,7 +518,7 @@ private extension YHPreviewViewModel {
                         str = ""
                     } else {
                         if str == "8888-01-01" {
-                            str = "至今"
+                            str = "长期"
                         }
                     }
                     let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -562,7 +562,7 @@ private extension YHPreviewViewModel {
                 
                 
                 let answer1 = model.has_departure?.has == "Y" ? "是" : "否"
-                let remark1 = answer1 == "是" ? (model.has_conviction?.info ?? "") : nil
+                let remark1 = answer1 == "是" ? (model.has_departure?.info ?? "") : nil
                 let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾在香港或其他地方被拒入境/递解/遣送或要求离境？", answer: answer1,remark: remark1)
                 
                 
@@ -937,7 +937,7 @@ private extension YHPreviewViewModel {
         
         var arrTemp : [YHPreviewInfoSessionModel] = []
         do {
-            if model.follow == 0 {
+            if model.follow != 1 {
                 do {
                     //随行信息 - 否
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "否")
@@ -1119,7 +1119,7 @@ private extension YHPreviewViewModel {
                     str = ""
                 } else {
                     if str == "8888-01-01" {
-                        str = "至今"
+                        str = "长期"
                     }
                 }
                 let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -1143,7 +1143,7 @@ private extension YHPreviewViewModel {
                         str = ""
                     } else {
                         if str == "8888-01-01" {
-                            str = "至今"
+                            str = "长期"
                         }
                     }
                     let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -1171,7 +1171,7 @@ private extension YHPreviewViewModel {
                         str = ""
                     } else {
                         if str == "8888-01-01" {
-                            str = "至今"
+                            str = "长期"
                         }
                     }
                     let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -1438,7 +1438,7 @@ private extension YHPreviewViewModel {
                     str = ""
                 } else {
                     if str == "8888-01-01" {
-                        str = "至今"
+                        str = "长期"
                     }
                 }
                 let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
@@ -1473,7 +1473,7 @@ private extension YHPreviewViewModel {
                 
                 if model.nationality != "中国-China" {
                     //护照及其他旅行证件
-                    var str = String(model.certificates.passport.passPortType)//for test hjl todo
+                    var str = YHConstantArrayData.getShowNameBy(indexStr: String(model.certificates.passport.passPortType), type: .idType)
                     let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str)
                     
                     str = model.certificates.passport.number
@@ -1490,7 +1490,7 @@ private extension YHPreviewViewModel {
                         str = ""
                     } else {
                         if str == "8888-01-01" {
-                            str = "至今"
+                            str = "长期"
                         }
                     }
                     let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())