Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -840,7 +840,7 @@
                     that.form.psn_desc = response.data.data.desc
 
                   } else if (that.form.id_card_type == 2) {
-                    2
+                    that.form.social_type = parseInt(response.data.data.insutype)
                     that.form.id = patient.id
                     that.form.name = patient.name
                     that.form.gender = patient.gender

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -40,9 +40,13 @@
                 <td style="width:25%">{{item.code}}</td>
                 <td style="width:25%">{{item.name}}</td>
                 <td style="width:15%">{{item.spec}}</td>
-                <td style="width:5%">{{item.count}}</td>
-                <td style="width:5%">{{item.unit}}</td>
-                <td style="width:8%">{{(item.price*1).toFixed(2)}}</td>
+                <td style="width:5%" >
+                  <span v-if="item.code!=undefined">{{item.count}}</span>
+                </td>
+                <td style="width:5%" >{{item.unit}}</td>
+                <td style="width:8%">
+                  <span v-if="item.code!=undefined">{{(item.price*1).toFixed(2)}}</span>
+                </td>
                 <td style="width:8%">{{(item.price * item.count).toFixed(2)}}</td>
                 <td style="width:8%" v-if="item.code!=undefined">
                   {{(item.selfpay_prop)*100}}

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,7 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 ||  org_id == 0
+          org_id==10537 
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -70,17 +70,17 @@
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
 
       <printOne :info="info" v-if=" org_id != 9990 &&
-            org_id != 10138 &&
-            org_id != 9504 &&
-            org_id != 10028 &&
-            org_id != 0 &&   org_id != 10610 && org_id !=10537 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 10633 &&org_id != 0  && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10138 && org_id != 9504 && org_id != 10028 &&
+            org_id != 10610 && org_id !=10537 && org_id !=10697 &&
+            org_id != 10278 && org_id != 10387 && org_id != 10191 && 
+            org_id != 10210 &&org_id != 10485 &&org_id != 10480 && 
+            org_id != 10510 &&org_id != 10088 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
-            org_id != 10138 &&
-            org_id != 9504 &&
-            org_id != 10028 && org_id !=10697 &&
-            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510 &&org_id != 10633 && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
+            org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 && 
+            org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 && 
+            org_id != 10510 &&org_id != 10633 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -33,7 +33,8 @@
       </tr>
       <tr>
         <td width="70">就医登记号</td>
-        <td colspan="7">{{info.psn_no}}</td>
+        <td colspan="7" v-if="org_id !=10644">{{info.psn_no}}</td>
+        <td colspan="7" v-if="org_id ==10644">{{info.mdtrt_id}}</td>
         <td width="50">门诊号</td>
         <td colspan="3">{{info.number}}</td>
       </tr>
@@ -346,7 +347,13 @@
           return {}
         }
       }
-    },methods:{
+    },
+    data(){
+      return{
+        org_id:'',
+      }
+    },
+    methods:{
       getBirth(idNo){
         var year = idNo.substring(6, 10);
         var month = idNo.substring(10, 12);
@@ -382,6 +389,9 @@
         return dateTime
       },
 
+    },
+    created(){
+      this.org_id = this.$store.getters.xt_user.org_id
     }
   }