// 方案

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift

@@ -178,7 +178,14 @@ class YHImproveSchemeViewController: YHBaseViewController {
     }
     
     override func backItemClick(_ sender: Any) {
-        self.navigationController?.popToRootViewController(animated: true)
+        if isPass {
+            // 进入上级我的方案界面
+            self.navigationController?.popViewController(animated: true)
+            
+        } else { // 进入服务tab页
+            self.navigationController?.popToRootViewController(animated: true)
+            goTabBarBy(tabType: .service)
+        }
     }
 
     func requestData() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift

@@ -181,26 +181,37 @@ class YHMyNewSchemeViewController: YHBaseViewController {
             orderId = orderID
         }
         YHHUD.show(.progress(message: "加载中..."))
-        viewModel.getImproveDetail(orderId: orderId) {
+        
+        viewModel.getMySchemeData(orderId: orderId) {
             [weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }
             
-            if self.viewModel.improveDetailModel.improvePlanItem.count > 0 { // 提交过方案
-                let vc1 = YHMyNewSchemeViewController()
-                let vc2 = YHImproveSchemeViewController()
-                vc2.isPass = false
-                vc2.orderId = orderId
-                
-                UIViewController.current?.navigationController?.pushViewController(vc1, animated: false)
-                UIViewController.current?.navigationController?.pushViewController(vc2, animated: false)
-
-            } else { // 未提交过方案
-                
+            passArr = self.viewModel.schemeModel.comprehensive_evaluation.filter {
+                $0.isPass == true
+            }
+            
+            if passArr.count >= passMinCount { // 满足至少6项
                 let vc = YHMyNewSchemeViewController()
                 UIViewController.current?.navigationController?.pushViewController(vc)
-            }
                 
+            } else { // 不满足条件
+                
+                if self.viewModel.schemeModel.comprehensive_evaluation_selected.count > 0 {
+                    // 进入提升方案界面
+                    let vc1 = YHMyNewSchemeViewController()
+                    let vc2 = YHImproveSchemeViewController()
+                    vc2.isPass = false
+                    vc2.orderId = orderId
+                    
+                    UIViewController.current?.navigationController?.pushViewController(vc1, animated: false)
+                    UIViewController.current?.navigationController?.pushViewController(vc2, animated: false)
+                    
+                } else {
+                    let vc = YHMyNewSchemeViewController()
+                    UIViewController.current?.navigationController?.pushViewController(vc)
+                }
+            }
         }
     }