Merge branch 'develop' of...

Merge branch 'develop' of http://192.168.110.53/com.pica.cloud.frontend/pica-insurance into feature/zjx

src/views/appoint-demo/index.vue

@@ -172,7 +172,6 @@ export default {
         timeBucket: '',
         hospitalName:'人民医院和平社区健康服务中心',
         location: '深圳市坪山区',
-        goodsId: '',
       },
       showAreaLabel:'',
       showArea:false,
@@ -202,7 +201,6 @@ export default {
   },
   computed: {
     canSubmit() {
-      // this.dectionForm.goodsId &&
       return (
         this.dectionForm.appointmentTime &&
         this.dectionForm.hospitalName &&
@@ -268,20 +266,22 @@ export default {
         if(order) {
           const data = {
             appointmentTime: this.dectionForm.appointmentTime,
-            goodsId: this.dectionForm.goodsId,
             hospitalId: this.hospitalId,
             hospitalName: this.dectionForm.hospitalName,
             yunOrderNo:order.yunOrderNo,
+            patientIdNo: '42032119900105595x',
+            patientMobile: '15717156505',
+            patientName: '1'
           };
           appointment(data).then(res => {
             if (res.code === '000000') {
-              // this.$router.push({
-              //   path: '/appoint-details',
-              //   query: {
-              //     yunOrderNo: order.yunOrderNo,
-              //     projectEquityNo:this.projectEquityNo
-              //   }
-              // });
+              this.$router.push({
+                path: '/appoint-details',
+                query: {
+                  yunOrderNo: order.yunOrderNo,
+                  projectEquityNo:this.projectEquityNo
+                }
+              });
             } else {
               res.message && this.$toast(res.message);
             }
@@ -300,7 +300,11 @@ export default {
         const data = {
           projectEquityNo: projectEquityNo,
           externalOrderNo: externalOrderNo || '123123',
-          insuranceMerchantProjectDetectionId: this.currentProject
+          insuranceMerchantProjectDetectionId: this.currentProject,
+          idCard: '42032119900105595x',
+          mobilePhone: '15717156505',
+          patientName: '1',
+          idType: 1
         };
         createOrder(data).then(res => {
           if (res.code == '000000') {

src/views/insurance-bind-code/insurance-bind-code.vue

@@ -428,21 +428,33 @@ export default {
         if (res.code !== '000000') {
           return this.$toast(res.message);
         } else {
-          this.$router.push(
-            {
-              path:  '/insuranceBindCodeSuccess',
-              query: {
-                yunOrderNo: this.yunOrderNo,
-                detectionRecordId: this.detectionRecordId
-              },
-            }
-          );
+          const { projectEquityNo } = this.insuranceInfo;
+          if(projectEquityNo == 'SZ202305031000597601') {
+            this.$router.push(
+              {
+                path:  '/insuranceDetectionDetailDemo',
+                query: {
+                  yunOrderNo: this.yunOrderNo,
+                  detectionRecordId: this.detectionRecordId
+                },
+              }
+            );
+          }else {
+            this.$router.push(
+              {
+                path:  '/insuranceBindCodeSuccess',
+                query: {
+                  yunOrderNo: this.yunOrderNo,
+                  detectionRecordId: this.detectionRecordId
+                },
+              }
+            );
+          }
           this.$toast('提交成功');
         }
       });
     },
     earlyBindingCode(obj) {
-      // quickBindingCode userId
       const o = {...obj, detectionKind: 0};
       bindingSampleCode(o).then(res => {
         if (res.code !== '000000') {