XMLWAN 3 years ago
parent
commit
1022053fc1

+ 2 - 1
src/xt_pages/user/templateSummary.vue View File

@@ -1047,7 +1047,7 @@
1047 1047
 
1048 1048
       },
1049 1049
       changeCurrentRecord(val){
1050
-
1050
+        this.tableData = []
1051 1051
         this.getInspectionDetai(val)
1052 1052
       },
1053 1053
       selectionChangeOne(val){
@@ -1240,6 +1240,7 @@
1240 1240
       },
1241 1241
       //获取小项的值
1242 1242
       getInspectionDetai(val){
1243
+        console.log("val2332232",val)
1243 1244
         var params = {
1244 1245
           project_id:val.project_id,
1245 1246
           patient_id:val.patient_id,

+ 17 - 16
src/xt_pages/workforce/components/nextTableWeeks.vue View File

@@ -146,26 +146,27 @@
146 146
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
147 147
         <template slot-scope="scope">
148 148
           <span v-if="org_id!=9987" >
149
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
150
-                <span v-if="org_id!=10131">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
151
-                <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
149
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
150
+                <span v-if="org_id!=10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
151
+                <span v-if="org_id==10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
152
+                <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
152 153
               </span> 
153
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
154
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
154 155
           </span>
155
-          {{scope.row.prescription.dialysis_dialyszers}}
156
-         <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
157
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
156
+          {{scope.row.dialysissolution.dialysis_dialyszers}}
157
+         <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>
158
+          <span v-if="scope.row.dialysissolution.dialysis_irrigation!=''">{{scope.row.dialysissolution.dialysis_irrigation}}</span>
158 159
         </template>
159 160
       </el-table-column>
160 161
       <el-table-column label="抗凝剂(商品名称)" min-width="100" align="center">
161 162
         <template slot-scope="scope">
162
-          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
163
-          <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
164
-          <span v-if="scope.row.prescription.anticoagulant === 3" >低分子肝素</span>
165
-          <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
166
-          <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
167
-          <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
168
-          <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
163
+          <span v-if="scope.row.dialysissolution.anticoagulant === 1">无肝素</span>
164
+          <span v-if="scope.row.dialysissolution.anticoagulant === 2">普通肝素</span>
165
+          <span v-if="scope.row.dialysissolution.anticoagulant === 3" >低分子肝素</span>
166
+          <span v-if="scope.row.dialysissolution.anticoagulant === 4">阿加曲班</span>
167
+          <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
168
+          <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
169
+          <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
169 170
          <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
170 171
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
171 172
           </span>
@@ -345,7 +346,7 @@ export default {
345 346
         //   week_type:this.week_type,
346 347
         //   week_time:this.week_time,
347 348
         // }
348
-     
349
+      console.log("params",params)
349 350
       getNextScheduleWeekDay(params).then(response => {
350 351
         this.scheduleData = [];
351 352
         if (response.data.state == 1) {
@@ -635,7 +636,7 @@ export default {
635 636
           str = zone.join(",")
636 637
         }
637 638
         this.$router.push({
638
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
639
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
639 640
         })
640 641
     }
641 642
   },

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue View File

@@ -887,7 +887,7 @@
887 887
           str = zone.join(",")
888 888
         }
889 889
         this.$router.push({
890
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
890
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
891 891
         })
892 892
       }
893 893
       ,

+ 9 - 9
src/xt_pages/workforce/next_remind_print.vue View File

@@ -64,8 +64,8 @@
64 64
                  <span v-if="org_id!=9987">
65 65
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
66 66
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67
-                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
68
-                         <!-- <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
67
+                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
68
+                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
69 69
                      </span>
70 70
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
71 71
                   </span>
@@ -81,13 +81,13 @@
81 81
                   </span>
82 82
                 </td>
83 83
                 <td :width="td_1_width"  v-if="printObj.anticoagulant_zongliang == 1">
84
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
85
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
86
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
87
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
88
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
89
-                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
90
-                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
84
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
85
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
86
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
87
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
88
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
89
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
90
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
91 91
                 </td>
92 92
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
93 93
                   <span style="white-space: pre" v-if="main_collection.doctor_advice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>

+ 80 - 10
src/xt_pages/workforce/remind_print_setting.vue View File

@@ -21,7 +21,10 @@
21 21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
22 22
               <div class="signPrint">
23 23
                 <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
24
-                <div>姓名:{{main_collection.patient.name}}</div> 
24
+                <div>姓名:
25
+                  <span v-if="type ==1">{{main_collection.patient.name}} </span> 
26
+                  <span v-if="type ==2">{{main_collection.patient}} </span> 
27
+                </div> 
25 28
                 <div>抗凝剂: 
26 29
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
27 30
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
@@ -51,7 +54,7 @@
51 54
 </template>
52 55
 
53 56
 <script>
54
-  import { getScheduleList,getPrintList } from '@/api/schedule'
57
+  import { getScheduleList,getPrintList,getNextScheduleWeekDay } from '@/api/schedule'
55 58
   import { parseTime } from '@/utils'
56 59
   import { uParseTime } from '@/utils/tools'
57 60
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -81,24 +84,29 @@
81 84
         now_time:0,
82 85
         zone:"",
83 86
         pre_status:0,
84
-        printObj:{}
87
+        printObj:{},
88
+        type:1,
85 89
       }
86 90
     },
87 91
     components: {
88 92
       BreadCrumb
89 93
     },
90 94
     created() {
95
+      console.log("type2323233223232",this.$route.query.type)  
96
+     this.type = this.$route.query.type
91 97
      this.getPrintList()
92 98
      this.org_id = this.$store.getters.xt_user.org.id
93 99
      this.currentDate = this.getCurrentDate()
94 100
    
95
-      this.modeOptions = this.$store.getters.treatment_mode
96
-      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
97
-      this.week_type = this.$route.query.week_type
98
-      this.week_time  = this.$route.query.week_time
99
-      this.zone = this.$route.query.zone
100
-      this.pre_status = this.$route.query.prestatus
101
-     const params = {
101
+     this.modeOptions = this.$store.getters.treatment_mode
102
+     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
103
+    this.week_type = this.$route.query.week_type
104
+    this.week_time  = this.$route.query.week_time
105
+    this.zone = this.$route.query.zone
106
+    this.pre_status = this.$route.query.prestatus
107
+    
108
+    if(parseInt(this.$route.query.type) == 1){
109
+      const params = {
102 110
           week_type:this.week_type,
103 111
           week_time:this.week_time,
104 112
           zone:this.zone,
@@ -152,6 +160,11 @@
152 160
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
153 161
       console.log("now",now_time)
154 162
       this.now_time = now_time
163
+    }
164
+    if(parseInt(this.$route.query.type) == 2){
165
+       this.getNextScheduleWeekDay()
166
+    }
167
+    
155 168
     },
156 169
     methods: {
157 170
       getAdvice:function(doctor_advice) {
@@ -305,6 +318,63 @@
305 318
            this.printObj = list
306 319
          }
307 320
       })
321
+     },
322
+    getNextScheduleWeekDay() {
323
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
324
+        const end = moment().weekday(7).format('YYYY-MM-DD')
325
+        var zone = this.zone
326
+        // var newArr = []
327
+        // for(let i=0;i<this.zoneList.length;i++){
328
+        //    newArr.push(this.zoneList[i].id)
329
+        // }
330
+        // var arr = newArr.join(",")
331
+        // var str = ""
332
+        // if(this.zone == 0){
333
+        //    str = arr  
334
+        // }
335
+        // if(zone != 0){
336
+        //   str = zone.join(",")
337
+        // }
338
+        const params = {
339
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
340
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
341
+          week_type:this.week_type,
342
+          week_time:this.week_time,
343
+          zone:this.zone,
344
+        }
345
+        // const params = {
346
+        //   start_time:1609603200,
347
+        //   end_time:1610208000,
348
+        //   week_type:this.week_type,
349
+        //   week_time:this.week_time,
350
+        // }
351
+      console.log("params",params)
352
+      getNextScheduleWeekDay(params).then(response => {
353
+        this.scheduleData = [];
354
+        if (response.data.state == 1) {
355
+          var scheduleData = response.data.data.schedule;
356
+      
357
+          for(let i=0;i<scheduleData.length;i++){
358
+              scheduleData[i].sort = scheduleData[i].number.sort
359
+          }
360
+            var arr =   scheduleData.sort(this.compare('sort'))
361
+            console.log("元旦快乐",arr)
362
+            this.scheduleData = arr
363
+          
364
+            // var newList = []
365
+            // for(let i=0;i<scheduleData.length;i++){
366
+            //   if(scheduleData.prescription.id > 0){
367
+            //      newList.push(scheduleData[i])
368
+            //   } 
369
+            // }
370
+            // var arr =   newList.sort(this.compare('sort'))
371
+            // console.log("元旦快乐",arr)
372
+            // this.scheduleData = arr 
373
+        } else {
374
+          this.$message.error("网络错误");
375
+          return false;
376
+        }
377
+      });
308 378
      }
309 379
     }
310 380
   }