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

@@ -321,7 +321,7 @@ export default {
       ],
       tableHeight: 400,
       start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
-      start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD hh:mm"),
+      start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD HH:mm"),
       state: 1, //1待发药，2已发药
       waitmount: 0, //待发药人数
       waitmount_data: [],
@@ -349,7 +349,9 @@ export default {
       baseList:[],
       org_id:'',
       patients:{},
-      doctors:[]
+      doctors:[],
+      diagnosearr:[],
+      diagnosis:'',
     };
   },
   watch: {},
@@ -565,6 +567,8 @@ export default {
            this.baseList =[]
           this.baseList = res.data.data.baseList
           this.doctors = res.data.data.doctors
+          this.diagnosearr = res.data.data.diagnose
+          this.diagnosis = res.data.data.prescription.diagnosis
           const obj={
             age:res.data.data.patients.age,
             gender: res.data.data.patients.gender,
@@ -611,10 +615,12 @@ export default {
             this.tableData,
             this.currentRow,
             this.state,
-            this.start_time2,
+            this.start_time,
             this.baseList,
             this.patients,
-            this.doctors
+            this.doctors,
+            this.diagnosearr,
+            this.diagnosis
           )
         }
       }

src/xt_pages/Pharmacy/print/patientPrintTwo.vue

@@ -6,7 +6,7 @@
     :close-on-press-escape="isClose"
   >
     <el-button type="primary" @click="print" class="print_style"
-      >打印23</el-button
+      >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
       <div class="list_title" style="border-bottom:none;">
@@ -25,7 +25,8 @@
         <span>性别:{{ patients.gender==1 ?'男':'女'}}</span>&nbsp;&nbsp;
         <span>年龄:{{patients.age}}</span>&nbsp;&nbsp;
         <span>住院科室:肾内科</span>&nbsp;&nbsp;
-        <span>入院诊断:{{patients.diagnose}}</span>
+        <!-- <span>入院诊断:{{patients.diagnose}}</span> -->
+        <span>入院诊断:{{ getdiagnosis(diagnosis) }}</span>
       </div>
       <div>
         <table class="table" border="1" 
@@ -102,7 +103,9 @@ export default {
       Doctor:'',
       patients:{},
       doctors:[],
-      Price_zong:0
+      Price_zong:0,
+      diagnosearr:[],
+      diagnosis:'',
     };
   },
   props: {
@@ -137,7 +140,7 @@ export default {
         }
       }
     },
-    show: function (val,data,state,times,base,patients,doctors) {
+    show: function (val,data,state,times,base,patients,doctors,arr,diagnosis) {
       this.times = times
       this.visibility = true;
       console.log("val",val)
@@ -148,6 +151,8 @@ export default {
       this.baseList = base
       this.patients = patients
       this.doctors = doctors
+      this.diagnosearr = arr
+      this.diagnosis = diagnosis
       if (state == 1){
         this.state = "待发药"
       }
@@ -160,7 +165,25 @@ export default {
         }
       }
     },
-
+    getdiagnosis(val){
+      const diagnosis = val.split(',')
+      console.log('diagnosis',diagnosis)
+      const diagn = []
+      // const dia_id =[]
+      const arr = this.diagnosearr
+      if(diagnosis.length>0 && arr.length>0){
+        for(let i in arr){
+          for(let j in diagnosis){
+            if(arr[i].id ==diagnosis[j]){
+              diagn.push(arr[i].class_name)
+            }
+          }
+          var arr2 = diagn.join()
+          console.log('arr2',arr2);
+        }
+      }
+      return arr2
+    },
     comfirm: function (formName) {
       this.goodInfo = [];
       this.goodInfoTableData = [];
@@ -301,8 +324,8 @@ export default {
 .table tr td{
  border:1px solid black;
  padding: 5px 0;
-//  border-left: none;
-//  border-right: none;
+ border-left: none;
+ border-right: none;
 }
 </style>
 

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -1657,6 +1657,7 @@
 
          if(ParamsQuery.additional_weight >=30){
              this.$message.error("衣物重异常,请重新填写!")
+             return
          }
 
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2345,7 +2345,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -4718,7 +4718,7 @@ export default {
 
         
 
-        if(this.org_id== 0 || this.org_id ==10206){
+        if(this.org_id== 0 || this.org_id ==10206 || this.org_id ==10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -68,10 +68,13 @@
               <td colspan="3">
                 <div style="display: flex;">
                   <span>治疗抗凝:</span>
-                  <label-box :isChecked="prescription.anticoagulant=='低分子量肝素'?true :false" showValue="低分子量肝素:"></label-box>&nbsp;
-                  <span v-if="prescription.anticoagulant=='低分子量肝素'">
+                  <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
+                    {{ prescription.anticoagulant }} &nbsp;&nbsp; 
                     {{prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "0"}}
-                  </span>U &nbsp;&nbsp;
+                  </span>U&nbsp;&nbsp; 
+                  <!-- <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
+                    
+                  </span>U &nbsp;&nbsp; -->
                   <label-box :isChecked="prescription.anticoagulant=='普通肝素'?true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
                   <div style="display: inline-block;">
                     首剂：
@@ -159,7 +162,7 @@
                             predialysis.blood_access_part_opera_name!='长期静脉导管' &&
                             predialysis.blood_access_part_opera_name!='临时静脉导管' &&
                             predialysis.blood_access_part_opera_name!=''?true :false" showValue="其它">
-                </label-box>
+                </label-box> 
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;">
                 穿刺者:

src/xt_pages/outpatientCharges/components/callUnAssociationPrescription.vue

@@ -319,7 +319,7 @@
               tempProject.push(obj)
             }
             let obj = {
-              id: 0,
+              id: prescription.id,
               advices: tempAdvice,
               project: tempProject,
               addition:tempAddition,

src/xt_pages/user/patients.vue

@@ -101,7 +101,7 @@
         <el-badge :value=value class="item">
           <el-button size="small" type="primary" @click="toRemind">传染病检查提醒</el-button>
         </el-badge>
-        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload" v-if="isShow"></upload-excel>
+        <upload-excel :on-success='handleSuccess'  v-if="isShow"></upload-excel>
 
         <el-link target="_blank" href="https://kuyi.shengws.com/patient_template.xlsx" :underline="false"
                  style="margin-left:15px">
@@ -1031,7 +1031,7 @@
 
       },
       handleSuccess({ results, header }) {
-
+        console.log("header5444444444444444",header)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
           var isHasGender = header.includes('*性别')
@@ -1880,9 +1880,7 @@
        return work_unit
     },
 
-    beforeUpload(){
-
-    }
+   
 
     }
   }