Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/doctorAdvice/components/new_Inspectiondetails.vue

@@ -195,7 +195,7 @@ export default {
     // 顶部返回
     toReturn(){
       this.$router.push(
-        {path:"/patientdetail?patientid=" +this.patientid,query:{active:this.active} }
+        {path:"/patientdetail?patientid=" +this.patientid +'&seacherActive='+1,query:{active:this.active} }
       );
     },
     getTime (time) {
@@ -280,7 +280,7 @@ export default {
       for(let i=0;i<this.tableData.length;i++){
         for(let j=0;j<this.tableData[i].Child.length;j++){
           if(inspect_date == this.tableData[i].Child[j].inspect_date && item_name == this.tableData[i].Child[j].item_name){
-            inspect_value = this.tableData[i].Child[j].inspect_value
+            inspect_value = this.tableData[i].Child[j].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
           }
         }
       }
@@ -314,11 +314,10 @@ export default {
       this.$router.push(
         {path:'/patientdetail?' +
           'patientid=' +
-          this.patientid +
-          '&active=' +
-          4 +
-          '&restatus=' +
-          1,query:{id:this.blood_id,date:this.route_date,name:this.patient_name,}})
+          this.patientid + '&seacherActive=' + 1 + 
+          '&active=' + 4 + '&restatus=' +1,
+          query:{id:this.blood_id,date:this.route_date,name:this.patient_name,}
+        })
     },
     down (event) {
       this.flags = true

src/pages/doctorAdvice/index.vue

@@ -61,6 +61,7 @@
         <device-management :active="active"></device-management>
       </van-tab>
     </van-tabs>
+    <!-- 患者弹窗 -->
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
       <div
         style="padding:10px;font-size:1.25rem;text-align:right"
@@ -380,6 +381,7 @@ export default {
         }
       })
     },
+    // 全部病人
     getBloodDialysisPatientTwo () {
       getBloodDialysisPatientTwo(this.page, this.limit).then(response => {
         var patient = response.data.data.patient
@@ -474,12 +476,14 @@ export default {
         }
       })
     },
+    // 
     getMemberPatient () {
       getMemberPatient().then(response => {
         if (response.data.state === 1) {
           var patient = response.data.data.patient
           this.patient = patient
           let cityNameList = []
+          console.log('response.data.data12112康桥',response.data.data);
           for (let p in patient) {
             cityNameList.push(patient[p].name)
           }
@@ -505,6 +509,7 @@ export default {
         }
       })
     },
+    // 弹窗搜索
     onSearch (val) {
       ToSearch(val).then(response => {
         if (response.data.state === 1) {
@@ -536,6 +541,7 @@ export default {
       })
     },
     onCancel () {},
+    // 弹窗选中患者
     chooseCity (val) {
       this.value = val
       console.log('val',val);
@@ -544,7 +550,7 @@ export default {
           var id = this.patient[i].id
           this.show = false
           this.$router.push(
-            '/patientdetail?patientid=' + id + '&seacherActive=' + this.active
+            '/patientdetail?patientid=' + id + '&seacherActive=' + 1 + '&active='+this.active
           )
           this.patientName = this.value
           this.reload()
@@ -581,6 +587,8 @@ export default {
     this.patient_id = patientid
     this.getPatientDetail(patientid)
     var seacherActive = this.$route.query.seacherActive
+    console.log('seacherActive',seacherActive);
+    
     if (seacherActive == 0) {
       this.getBloodDialysisPatientTwo()
     }

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -785,7 +785,7 @@
                         置换液速度<br />(ml/h)
                         </td>
                       <td width="50" v-if="org_id == 10449 || org_id == 3877">累计超滤量<br/>(ml)</td>
-                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))" width="50">置换量<br/>
+                      <td v-if="(org_id!=10683 && org_id!=10402 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))" width="50">置换量<br/>
                         <span v-if="org_id !=10644"> (ml)</span>
                         <span v-if="org_id ==10644"> (L)</span>
                       </td>
@@ -843,7 +843,7 @@
                         {{ monitor.replacement_speed?monitor.replacement_speed:"" }}
                         <br />
                         </td>
-                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}</td>
+                      <td v-if="(org_id!=10683 && org_id!=10402 &&(prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}</td>
 
                       <td width="50" v-if="org_id == 3877 || org_id == 10449">{{monitor.filter_pressure }}</td>
                       <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id ==10517  || org_id == 10567 || org_id ==10724">

src/pages/main/template/DialysisPrintOrderThirtyOne.vue

@@ -126,7 +126,26 @@
             <div class="inline_block" style="margin-right:30px;">
               血液净化器类型
               <div class="inline_block under_line" style="width:150px;text-align: center;">
-                  {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : ''}}
+                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
+                  {{
+                    prescription.dialyzer_perfusion_apparatus
+                      ? prescription.dialyzer_perfusion_apparatus
+                      : ""
+                  }}
+                </span>
+                <span v-if="prescription.dialysis_dialyszers !=''">
+                  {{
+                    prescription.dialysis_dialyszers
+                      ? prescription.dialysis_dialyszers
+                      : "/"
+                  }}
+                </span>
+                <span v-if="prescription.dialysis_strainer !=''">
+                  {{
+                    prescription.dialysis_strainer?
+                    prescription.dialysis_strainer:""
+                  }}
+                </span>
               </div>
             </div>
             <div class="inline_block" style="margin-right:30px;">
@@ -679,6 +698,7 @@ import { getDialysisRecord, getPrintDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import LabelBox from '../printItem/LabelBox'
+import {Toast} from 'vant'
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from 'print-js'
@@ -1343,9 +1363,9 @@ export default {
 
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
-          var start_nurse = response.data.data.startNuse
-          this.orderForm.start_nurse = start_nurse.user_name
-          this.orderForm.url = start_nurse.url
+          // var start_nurse = response.data.data.startNuse
+          // this.orderForm.start_nurse = start_nurse.user_name
+          // this.orderForm.url = start_nurse.url
           this.org_template_info = response.data.data.org_template_info
           // 配置超滤量和置换量是否要显示0还是空
           if (this.org_template_info.org_id == 9535) {
@@ -1362,84 +1382,87 @@ export default {
           this.advices = response.data.data.advices
 
           var doctorAdevieInfo = response.data.data.advices
-          var tableAdvice = doctorAdevieInfo
-          if (tableAdvice.length === 0) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
-            var obj4 = { advice_name: '', start_time: '' }
-            var obj5 = { advice_name: '', start_time: '' }
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            tableAdvice.push(obj2)
-            tableAdvice.push(obj3)
-            tableAdvice.push(obj4)
-            tableAdvice.push(obj5)
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 1) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
-            var obj4 = { advice_name: '', start_time: '' }
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            tableAdvice.push(obj2)
-            tableAdvice.push(obj3)
-            tableAdvice.push(obj4)
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 2) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            tableAdvice.push(obj2)
-            tableAdvice.push(obj3)
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 3) {
-            // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-            var obj2 = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            tableAdvice.push(obj2)
-
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 4) {
-            // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            this.tableAdvice = tableAdvice
-          }
-          if (tableAdvice.length === 5) {
-            // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
-            // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
-            tableAdvice.push(obj)
-            tableAdvice.push(obj1)
-            this.tableAdvice = tableAdvice
-          }
-
-          if (tableAdvice.length >= 6) {
-            this.tableAdvice = tableAdvice
-          }
+          this.tableAdvice = doctorAdevieInfo
+          console.log('医嘱',this.tableAdvice);
+
+          // var tableAdvice = doctorAdevieInfo
+          // if (tableAdvice.length === 0) {
+          //   var obj = { advice_name: '', start_time: '' }
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   var obj2 = { advice_name: '', start_time: '' }
+          //   var obj3 = { advice_name: '', start_time: '' }
+          //   var obj4 = { advice_name: '', start_time: '' }
+          //   var obj5 = { advice_name: '', start_time: '' }
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   tableAdvice.push(obj2)
+          //   tableAdvice.push(obj3)
+          //   tableAdvice.push(obj4)
+          //   tableAdvice.push(obj5)
+          //   this.tableAdvice = tableAdvice
+          // }
+          // if (tableAdvice.length === 1) {
+          //   var obj = { advice_name: '', start_time: '' }
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   var obj2 = { advice_name: '', start_time: '' }
+          //   var obj3 = { advice_name: '', start_time: '' }
+          //   var obj4 = { advice_name: '', start_time: '' }
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   tableAdvice.push(obj2)
+          //   tableAdvice.push(obj3)
+          //   tableAdvice.push(obj4)
+          //   this.tableAdvice = tableAdvice
+          // }
+          // if (tableAdvice.length === 2) {
+          //   var obj = { advice_name: '', start_time: '' }
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   var obj2 = { advice_name: '', start_time: '' }
+          //   var obj3 = { advice_name: '', start_time: '' }
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   tableAdvice.push(obj2)
+          //   tableAdvice.push(obj3)
+          //   this.tableAdvice = tableAdvice
+          // }
+          // if (tableAdvice.length === 3) {
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj2 = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   tableAdvice.push(obj2)
+
+          //   this.tableAdvice = tableAdvice
+          // }
+          // if (tableAdvice.length === 4) {
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   this.tableAdvice = tableAdvice
+          // }
+          // if (tableAdvice.length === 5) {
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj = { advice_name: '', start_time: '' }
+          //   // eslint-disable-next-line no-redeclare
+          //   var obj1 = { advice_name: '', start_time: '' }
+          //   tableAdvice.push(obj)
+          //   tableAdvice.push(obj1)
+          //   this.tableAdvice = tableAdvice
+          // }
+
+          // if (tableAdvice.length >= 6) {
+          //   this.tableAdvice = tableAdvice
+          // }
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info
@@ -1574,10 +1597,14 @@ export default {
     },
     getcheckData(val){
       if(val.length >0){
-        const a = val.join(',')
-        console.log('a',a);
-        this.$toast(a +" 未填");
-        return a
+        let message = `记录单未填数据:\n${val.join("\n")}`;
+        Toast({
+          duration:0,
+          message:message,
+          closeOnClick:true,
+          closeOnClickOverlay:true,
+        })
+        return message
       }else{
         this.$toast('核对完成');
       }

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -565,13 +565,15 @@
                   <div class="inline_block" style="flex: 1">
                     型号：
                     <div class="under_line" style="width: 60%; text-align: center">
-                      <!-- <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
-                        {{ getnumberlist(dialysisOrder.bed_id) }} 
+                      <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
+                        {{ getnumberlist(dialysisOrder.bed_id) ? getnumberlist(dialysisOrder.bed_id) : '东丽'}} 
                       </span>
                       <span v-else>
-                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }} 
-                      </span> -->
-                      {{predialysis.machine_type ? predialysis.machine_type : ""}}
+                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) ?                    
+                          getnumberlist(patientInfo.DialysisSchedule.bed_id) : '东丽'
+                        }} 
+                      </span>
+                      <!-- {{predialysis.machine_type ? predialysis.machine_type : ""}} -->
                     </div>
                   </div>   
                 </div>