Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -639,6 +639,36 @@
                                       </span>
                                   </div>
                               </td>
+                              <td width='40'>首剂</td>
+                              <td width='50'>
+                                  <div class="under-line">
+                                      &nbsp;<span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6 && prescription.anticoagulant != 7">{{ prescription.anticoagulant_shouji }}</span>
+                                  </div>
+                              </td>
+                              <td width='10'>
+                                <span v-if="prescription.anticoagulant == 5">mg</span>
+                                <span v-if="prescription.anticoagulant == 4">mg</span>
+                                <span v-if="prescription.anticoagulant == 3">IU</span>
+                                <span v-if="prescription.anticoagulant == 2">mg</span>
+                                <span v-if="prescription.anticoagulant == 1">mg</span>
+                                <span v-if="prescription.anticoagulant == 6">IU</span>
+                                <span v-if="prescription.anticoagulant == 7">IU</span>
+                              </td>
+                              <td width='40'>追加</td>
+                              <td width='50'>
+                                  <div class="under-line">
+                                      &nbsp;<span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6 && prescription.anticoagulant != 7">{{ prescription.anticoagulant_weichi }}</span>
+                                  </div>
+                              </td>
+                              <td width='10'>
+                                <span v-if="prescription.anticoagulant == 7">IU/h</span>
+                                <span v-if="prescription.anticoagulant == 6">IU/h</span>
+                                <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                                <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                                <span v-if="prescription.anticoagulant == 3">IU/h</span>
+                                <span v-if="prescription.anticoagulant == 2">IU/h</span>
+                                <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                              </td>
                               <td></td>
                           </tr>
                       </tbody>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -695,7 +695,9 @@ export default {
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '1111', label: '精一' },
-        { value: '1112', label: '精二' }
+        { value: '1112', label: '精二' },
+        { value: '9922', label: '家庭通道' }
+
       ],
 
       registerThree: [
@@ -705,7 +707,11 @@ export default {
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '9922', label: '家庭通道' }
+
+
 
       ],
       register_two: [
@@ -713,7 +719,9 @@ export default {
         { value: '14', label: '门诊特殊病' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '9922', label: '家庭通道' }
+
 
       ],
       loading: false,
@@ -2152,6 +2160,11 @@ export default {
           this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
           return
         }
+        console.log( "-------")
+        console.log(this.getTotalFour(prescriptions))
+        console.log( this.currentOrder)
+        console.log( this.hisPatientInfo)
+
 
         if (this.hisPatientInfo.id_card_type == 1) {
           if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188) {
@@ -2166,6 +2179,7 @@ export default {
 
           }
         } else {
+
           if (this.activeName == 'first') {
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
           } else {