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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -515,6 +515,7 @@ export default {
     },
     //获取患者信息详情
     getpatientdetails(val) {
+      console.log("val2332323223",this.currentRow)
       var params = {
         patient_id: this.currentRow.PatientID,
         is_medicine: val,
@@ -524,7 +525,7 @@ export default {
         if (res.data.state == 1) {
            var list = res.data.data.list;
            console.log("hhhhawoowowow",list)
-          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 ){
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 0 ){
             this.tableData = []
             if(list!=null && list.length >0){
               for(let i=0;i<list.length;i++){
@@ -535,7 +536,7 @@ export default {
             }
 
           }
-          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217){
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 0){
             this.tableData = []
             this.tableData = list
           }

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -872,7 +872,7 @@
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg</span
                           >
-                          <span v-if="record.prescription.anticoagulant == 3"
+                          <span v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
                             >iu</span
                           >
                           <span v-if="record.prescription.anticoagulant == 2"

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -1160,7 +1160,7 @@
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
-                              <span v-if="prescription.anticoagulant == 3"
+                              <span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7"
                                 >iu</span
                               >
                               <span v-if="prescription.anticoagulant == 2"

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -536,10 +536,14 @@
                     <tr>
                       <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
                       <td width="220" style="text-align:left;border:none;">
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器0' ? true : false) :false" showValue="0"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+' ? true : false) :false" showValue="+"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器++' ? true : false) :false" showValue="+ +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+++' ? true : false) :false" showValue="+ + +"></label-box>
+                        <!-- <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
                         <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+') > -1 ? true : false) :false" showValue="+"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++') > -1 ? true : false) :false" showValue="+ +"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++') > -1 ? true : false) :false" showValue="+ + +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++')> -1 ? true : false) :false" showValue="+ +"></label-box>
+                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++')> -1 ? true : false) :false" showValue="+ + +"></label-box> -->
                       </td>
                       <td width="90" style="border:none;padding-left:5px">静脉管道:</td>
                       <td width="220" style="text-align:left;border:none;">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2612,7 +2612,7 @@
                           newProjectArr[i].out_count += parseInt(newProjectArr[i].child[j].total)
                         }
                       }
-                      console.log("河滨232332newArr",newProjectArr)
+                      
                       for(let i=0;i<newProjectArr.length;i++){
                         if(newProjectArr[i].out_count > newProjectArr[i].sum_count){
                               this.$message.error(newProjectArr[i].str + "库存不足,保存失败!")
@@ -2624,7 +2624,7 @@
 
                     }
                }
-
+               console.log("params23332232323232323------",data)
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -65,7 +65,17 @@
               </span>
             </td>
           </tr>
-
+          <tr>
+            <td style="text-align:center;width:100px" colspan="1">
+              身份证:
+            </td>   
+            <td style="text-align:left;width:500px" colspan="12">
+            
+              <span style="display:inline-block;margin-left:10px;">
+                {{patient.id_card_no}}
+              </span>
+            </td>   
+          </tr>
           <tr>
             <td style="text-align:center;width:100px" colspan="1">
               住址: