Merge branch 'feature/zl2' into 'develop'

add all entrance for insurance

See merge request !35

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

@@ -217,23 +217,29 @@ export default {
         name: '',
         sex: '',
         date: '',
-        checkName: ''
+        checkName: '',
+        projectId: '',
+        patientId:'',
+        hospitalId: ''
       },
       insuranceInfo: {},
-      pprotocolType: ''
+      pprotocolType: '',
     };
   },
   computed: {
     ...mapGetters(['orderInfo']),
   },
   created() {
-    console.log('--window._picaWechat', window._picaWechat);
     const { pprotocolType, detectionRecordId, yunOrderNo } = this.$route.query;
-    this.pprotocolType = pprotocolType || 31;
-    this.detectionRecordId = detectionRecordId;
-    this.getProtocolName();
-    this.getRecordInfo(detectionRecordId || 11077);
-    this.getDetectionName(yunOrderNo);
+    if(pprotocolType && detectionRecordId && yunOrderNo) {
+      this.pprotocolType = pprotocolType;
+      this.detectionRecordId = detectionRecordId;
+      this.getProtocolName();
+      this.getRecordInfo(detectionRecordId);
+      this.getDetectionName(yunOrderNo);
+    }else {
+      this.$toast('传递有误:', pprotocolType, detectionRecordId, yunOrderNo);
+    }
   },
   methods: {
     clearCode() {
@@ -261,9 +267,9 @@ export default {
       }else{
         if(this.isCheck && this.barCode) {
           const o = {
-            projectId: this.insuranceInfo.projectId,
+            projectId: this.recordInfo.projectId,
             sampleCode: this.barCode,
-            hospitalId:this.insuranceInfo.hospitalId
+            hospitalId:this.recordInfo.hospitalId
           };
           this.$loading.show();
           sampleCodeValidate(o).then(res => {
@@ -277,6 +283,9 @@ export default {
           }).finally(() => {
             this.$loading.hide();
           });
+        }else{
+          this.$toast('请输入条形码');
+          return false;
         }
       }
     },
@@ -284,7 +293,7 @@ export default {
       // const {beneficiaryPatientId } = this.orderInfo;
       const obj = {
         protocolType: this.pprotocolType,
-        patientId: 212773027
+        patientId: this.recordInfo.patientId
       };
       signDetection(obj).then(res => {
           if (res.code !== '000000') {
@@ -352,6 +361,11 @@ export default {
           this.recordInfo.sex = res.data.sex === 1 ? '男' : '女';
           this.recordInfo.date = res.data.birthday;
           this.recordInfo.checkName = res.data.checkName;
+          this.recordInfo.projectId = res.data.projectId;
+          this.recordInfo.patientId = res.data.patientId;
+          this.recordInfo.hospitalId = res.data.hospitalId;
+          // patientId
+
         }
       });
 
@@ -360,10 +374,11 @@ export default {
     bindingCode() {
       const obj = {
         barCode: this.barCode,
-        id: this.recordID,
-        prototypeId: this.pprotocolType ? this.pprotocolType : 0,
-        prototypeLogId: this.prototypeLogId ? this.prototypeLogId : 0,
+        id: this.detectionRecordId,
+        prototypeId: this.pprotocolType,
+        prototypeLogId: this.prototypeLogId,
       };
+      console.log('--obj--', obj);
       bindingSampleCode(obj).then(res => {
         if (res.code !== '000000') {
           return this.$toast(res.message);
@@ -377,7 +392,7 @@ export default {
         {
           path:  '/insuranceBindCodeSuccess',
           query: {
-            projectId: this.projectId || 9,
+            projectId: this.projectId,
             detectionRecordId: this.detectionRecordId
           },
         }