Procházet zdrojové kódy

库存显示展示

XMLWAN před 2 roky
rodič
revize
a3e78624cf

+ 6 - 5
src/api/advice.js Zobrazit soubor

@@ -505,6 +505,7 @@ export function getSchedualDoctors(params) {
505 505
 }
506 506
 
507 507
 export function getNewSchedualDoctors(params) {
508
+  console.log('params-----', params)
508 509
   return request({
509 510
     url: '/api/schedule/new/advices',
510 511
     method: 'get',
@@ -568,10 +569,10 @@ export function excutionDoctorAdviceById(params) {
568 569
   })
569 570
 }
570 571
 
571
-export function GetMobileScheduleList(params){
572
+export function GetMobileScheduleList(params) {
572 573
   return request({
573
-    url:"/api/schedule/getmobileschedulelist",
574
-    method:"Get",
575
-    params:params,
574
+    url: '/api/schedule/getmobileschedulelist',
575
+    method: 'Get',
576
+    params: params
576 577
   })
577
-}
578
+}

+ 14 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue Zobrazit soubor

@@ -343,16 +343,28 @@
343 343
                    <td style="text-align:left;" >
344 344
                     <span style="display:inline-block;margin-left:15px;"
345 345
                       >透析/灌流器型号:
346
-                     {{
346
+                    <span v-if="record.prescription.dialysis_dialyszers!=''">
347
+                      {{
347 348
                         record.prescription.dialysis_dialyszers
348 349
                          ?  record.prescription.dialysis_dialyszers
349 350
                            : "/"
350
-                        }}&nbsp;&nbsp;{{
351
+                        }}
352
+                      </span> 
353
+                      <span v-if="record.prescription.dialysis_irrigation==''">
354
+                        &nbsp;&nbsp;{{
351 355
                         record.prescription.dialysis_irrigation
352 356
                         ? record.prescription.dialysis_irrigation
353 357
                         : "/"
354 358
                     }}
355 359
                       </span>
360
+                      <span v-if="record.prescription.dialysis_strainer!=''">
361
+                      &nbsp;&nbsp;{{
362
+                          record.prescription.dialysis_strainer
363
+                          ? record.prescription.dialysis_strainer
364
+                          : "/"
365
+                      }}
366
+                      </span> 
367
+                      </span>
356 368
                   </td>
357 369
                    <td style="text-align:left;" colspan="2">
358 370
                     <span style="display:inline-block;margin-left:15px;"

+ 16 - 3
src/xt_pages/dialysis/details/consumable/dialysisDrug.vue Zobrazit soubor

@@ -130,7 +130,7 @@
130 130
             </el-option>
131 131
            </el-select>
132 132
            <label class="title"> <span class="name">病区选择</span> : </label>
133
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
133
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
134 134
             <el-option
135 135
               v-for="item in partitionArr"
136 136
               :key="item.id"
@@ -258,6 +258,7 @@
258 258
             return v.getTime() < new Date().getTime() - 86400000;
259 259
           },
260 260
         },
261
+        zoneIdList:[]
261 262
       }
262 263
     },
263 264
     created() {
@@ -398,15 +399,27 @@
398 399
             return false
399 400
           } else {
400 401
             this.partitionArr = response.data.data.zone
401
-            this.partitionArr.unshift({ id: 0, name: '全部' })
402
+            for(let i=0;i<this.partitionArr.length;i++){
403
+              this.zoneIdList.push(this.partitionArr[i].id)
404
+            }
405
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
402 406
           }
403 407
         })
404 408
       },
405 409
       statistics() {
406 410
          this.tableList = []
411
+
412
+          var str = ""
413
+         if(this.partion_type==0){
414
+            str = this.zoneIdList.join(",")
415
+         }
416
+         if(this.partion_type!=0){
417
+            str = this.partion_type.join(",")
418
+         }
419
+          
407 420
           var params = {
408 421
             schedule_type:this.schedule_type,
409
-            partion_type:this.partion_type,
422
+            partion_type:str,
410 423
             selected_date:this.query.schedule_date,
411 424
           }
412 425
         // console.log("params2332232wo",params)

+ 19 - 3
src/xt_pages/dialysis/details/consumable/dialysisGood.vue Zobrazit soubor

@@ -212,7 +212,7 @@
212 212
             </el-option>
213 213
            </el-select>
214 214
            <label class="title"> <span class="name">病区选择</span> : </label>
215
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
215
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple>
216 216
             <el-option
217 217
               v-for="item in partitionArr"
218 218
               :key="item.id"
@@ -475,6 +475,7 @@
475 475
         typeList:[],
476 476
         ids:"",
477 477
         org_id:0,
478
+        zoneIdList:[],
478 479
       }
479 480
     },
480 481
     created() {
@@ -754,17 +755,32 @@
754 755
             return false
755 756
           } else {
756 757
             this.partitionArr = response.data.data.zone
757
-            this.partitionArr.unshift({ id: 0, name: '全部' })
758
+            for(let i=0;i<this.partitionArr.length;i++){
759
+              this.zoneIdList.push(this.partitionArr[i].id)
760
+            }
761
+            // this.partitionArr.unshift({ id: 0, name: '全部' })
758 762
           }
759 763
         })
760 764
       },
761 765
       statistics() {
762 766
         this.tableList = []
767
+        
768
+        var arr = this.zoneIdList.join(",")
769
+        var str = ""
770
+         if(this.partion_type == 0){
771
+            str = arr
772
+         }
773
+         if(this.partion_type != 0){
774
+            str = this.partion_type.join(',')
775
+         }
776
+        
777
+        console.log("str-==-------",str)
763 778
         var params = {
764 779
           schedule_type:this.schedule_type,
765
-          partion_type:this.partion_type,
780
+          partion_type:str,
766 781
           selected_date:this.query.schedule_date,
767 782
         }
783
+       
768 784
        getDialysisGoodTotalCount(params).then(response=>{
769 785
           if(response.data.state == 1){
770 786
             this.startDialogVisible = true

+ 1 - 1
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue Zobrazit soubor

@@ -1100,7 +1100,7 @@
1100 1100
           case '3': // 透析前症状
1101 1101
 
1102 1102
             this.InnerDialogProps.values = this.symptom_before_dialysis
1103
-            this.InnerDialogProps.titles = '透析期间'
1103
+            this.InnerDialogProps.titles = '透析前症状'
1104 1104
             this.InnerDialogProps.type = 'symptom_before_dialysis'
1105 1105
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.symptom_before_dialysis
1106 1106
             this.InnerDialogProps.isShowTextArea = false

+ 15 - 7
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Zobrazit soubor

@@ -238,7 +238,8 @@
238 238
                 org_id == 10210 ||
239 239
                 org_id == 9555 || org_id == 10387
240 240
                 || org_id == 10432
241
-                || org_id == 10445)
241
+                || org_id == 10445
242
+                || org_id == 10410)
242 243
             "
243 244
           >
244 245
             <template slot-scope="scope">
@@ -305,6 +306,7 @@
305 306
               org_id!= 10210 &&
306 307
               org_id != 9555 && org_id!=10387
307 308
               && org_id!=10432 && org_id!=10445
309
+              && org_id!=10410
308 310
             "
309 311
           >
310 312
             <template slot-scope="scope">
@@ -354,7 +356,8 @@
354 356
                 template_id == 47 ||
355 357
                 template_id == 60 ||
356 358
                 org_id == 10432 ||
357
-                org_id == 10445)
359
+                org_id == 10445 ||
360
+                org_id == 10410)
358 361
             "
359 362
           >
360 363
             <template slot-scope="scope">
@@ -403,7 +406,8 @@
403 406
               template_id != 47 &&
404 407
               template_id != 60 &&
405 408
               org_id!=10432 &&
406
-              org_id!=10445
409
+              org_id!=10445 &&
410
+              org_id!=10410
407 411
             "
408 412
           >
409 413
             <template slot-scope="scope">
@@ -1087,7 +1091,8 @@
1087 1091
                 template_id == 47 ||
1088 1092
                 template_id == 60 ||
1089 1093
                 org_id== 10432 || 
1090
-                org_id== 10445)
1094
+                org_id== 10445 ||
1095
+                org_id== 10410)
1091 1096
             "
1092 1097
           >
1093 1098
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
@@ -1130,7 +1135,8 @@
1130 1135
               template_id != 47 &&
1131 1136
               template_id != 60 &&
1132 1137
               org_id!=10432 && 
1133
-              org_id!=10445
1138
+              org_id!=10445 &&
1139
+              org_id!=10410
1134 1140
             "
1135 1141
           >
1136 1142
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
@@ -1183,7 +1189,8 @@
1183 1189
                 org_id == 10340 ||
1184 1190
                 org_id == 10387 ||
1185 1191
                 org_id == 10432 ||
1186
-                org_id == 10445)
1192
+                org_id == 10445 ||
1193
+                org_id == 10410)
1187 1194
             "
1188 1195
           >
1189 1196
             <el-form-item label="超滤量(ml):" :prop="isName('超滤量')"
@@ -1236,7 +1243,8 @@
1236 1243
               org_id != 9555 &&
1237 1244
               org_id!=10387&&
1238 1245
               org_id!=10432 && 
1239
-              org_id!=10445
1246
+              org_id!=10445 && 
1247
+              org_id!=10410
1240 1248
             "
1241 1249
           >
1242 1250
             <el-form-item label="超滤量(L):" :prop="isName('超滤量')"

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue Zobrazit soubor

@@ -14,10 +14,10 @@
14 14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" width="76px" > 超滤量(ml)</th>
18
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445"  width="76px"> 超滤量(L) </th>
19
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" width="50px"> 超滤率 <br />(ml/h) </th>
20
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445" width="50px"> 超滤率 <br />(L/h) </th>
17
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="76px" > 超滤量(ml)</th>
18
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  width="76px"> 超滤量(L) </th>
19
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="50px"> 超滤率 <br />(ml/h) </th>
20
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" width="50px"> 超滤率 <br />(L/h) </th>
21 21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22 22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23 23
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>

+ 51 - 3
src/xt_pages/dialysis/newDoctorAdvice.vue Zobrazit soubor

@@ -137,6 +137,22 @@
137 137
         </div>
138 138
       </div>
139 139
 
140
+      <div class="cell clearfix">
141
+        <label class="title"> <span class="name">执行频率</span> : </label>
142
+        <div class="time">
143
+          <ul class>
144
+            <li
145
+              :class="item.id == execution_frequency ? 'active' : ''"
146
+              @click="selectFrequencyWay(item.id)"
147
+              v-for="item in excutList"
148
+              :key="item.id"
149
+            >
150
+              {{ item.name }}
151
+            </li>
152
+          </ul>
153
+        </div>
154
+      </div>
155
+
140 156
        <div class="cell clearfix">
141 157
         <label class="title"> <span class="name">执行状态</span> : </label>
142 158
         <div class="time">
@@ -801,6 +817,8 @@ export default {
801 817
       tableDataList:[],
802 818
       adminUserList:[],
803 819
       doctorMap:[],
820
+      excutList:[],
821
+      execution_frequency:"",
804 822
     };
805 823
   },
806 824
   created() {
@@ -863,6 +881,10 @@ export default {
863 881
        this.delivery_way = val
864 882
        this.requestSchedualDoctors(this.time)
865 883
     },
884
+    selectFrequencyWay(val){
885
+      this.execution_frequency = val
886
+      this.requestSchedualDoctors(this.time)
887
+    },
866 888
 
867 889
     selectExcutionWay(val){
868 890
        this.excution_way = val
@@ -886,6 +908,11 @@ export default {
886 908
           var obj = {id:0,name:"全部"}
887 909
           this.deliveryWay.push(obj)
888 910
           this.deliveryWay.push(...dics)
911
+          var objOne = {id:0,name:"全部"}
912
+           this.excutList.push(objOne)
913
+           var efs = response.data.data.efs
914
+           this.excutList.push(...efs)
915
+          console.log("执行瓶绿",this.excutList)
889 916
         }
890 917
       });
891 918
     },
@@ -900,13 +927,24 @@ export default {
900 927
         if(name == '全部'){
901 928
           name = ""
902 929
         }
930
+       
931
+        var nameOne = ""
932
+         for(let i=0;i<this.excutList.length;i++){
933
+            if(this.execution_frequency == this.excutList[i].id){
934
+              nameOne = this.excutList[i].name
935
+            }
936
+        }
937
+
938
+         if(nameOne == '全部'){
939
+          nameOne = ""
940
+        }
903 941
 
904 942
         let newTime =  moment(time).format('YYYY-MM-DD')
905 943
 
906 944
          var schedule_type = this.listQuery.schedul_type
907 945
          var partition_type = this.listQuery.partition_type
908
-
909
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType}).then(rs => {
946
+       
947
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
910 948
         var resp = rs.data
911 949
         if (resp.state == 1) {
912 950
             this.admin_users = resp.data.adminUser
@@ -1258,7 +1296,17 @@ export default {
1258 1296
         if(name == '全部'){
1259 1297
           name = ""
1260 1298
        }
1261
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
1299
+        var nameOne = ""
1300
+         for(let i=0;i<this.excutList.length;i++){
1301
+            if(this.execution_frequency == this.excutList[i].id){
1302
+              nameOne = this.excutList[i].name
1303
+            }
1304
+        }
1305
+
1306
+         if(nameOne == '全部'){
1307
+          nameOne = ""
1308
+        }
1309
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne} });
1262 1310
 
1263 1311
     },
1264 1312
     batchPrintActionOne: function() {

+ 5 - 1
src/xt_pages/dialysis/signPrint.vue Zobrazit soubor

@@ -74,7 +74,8 @@ export default {
74 74
             show:true,
75 75
             showOne:false,
76 76
             delivery_way:"",
77
-            list:[]
77
+            list:[],
78
+            execution_frequency:"",
78 79
         }
79 80
     },
80 81
     methods:{
@@ -96,6 +97,7 @@ export default {
96 97
             patient_type: 0,
97 98
             advice_type: 2,
98 99
             delivery_way:this.delivery_way,
100
+            execution_frequency:this.execution_frequency,
99 101
             }).then(rs => {
100 102
                 var resp = rs.data
101 103
                 if (resp.state == 1) {
@@ -641,6 +643,8 @@ export default {
641 643
       var delivery_way = this.$route.query.delivery_way
642 644
       console.log("delivery_Way",delivery_way)
643 645
       this.delivery_way = delivery_way
646
+      var execution_frequency = this.$route.query.execution_frequency
647
+      this.execution_frequency = execution_frequency
644 648
       this.time = moment(time).format('YYYY-MM-DD')
645 649
       console.log(11,this.$route.query)
646 650
       this.requestSchedualDoctors(time)

+ 15 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue Zobrazit soubor

@@ -354,15 +354,28 @@
354 354
             </td>
355 355
             <td style="text-align: left" colspan="1">
356 356
               <span style="display: inline-block; margin-left: 15px">
357
-                透析/灌流器型号:{{
357
+                透析/灌流器型号:
358
+                <span v-if="prescription.dialysis_dialyszers!=''">{{
358 359
                   prescription.dialysis_dialyszers
359 360
                     ? prescription.dialysis_dialyszers
360 361
                     : "/"
361
-                }}&nbsp;&nbsp;{{
362
+                }}
363
+                </span>
364
+               <span v-if="prescription.dialysis_irrigation!=''">
365
+                 &nbsp;&nbsp;{{
362 366
                   prescription.dialysis_irrigation
363 367
                     ? prescription.dialysis_irrigation
364 368
                     : "/"
365 369
                 }}
370
+               </span>
371
+               <span v-if="prescription.dialysis_strainer!=''">
372
+                &nbsp;&nbsp;{{
373
+                    prescription.dialysis_strainer
374
+                      ? prescription.dialysis_strainer
375
+                      : "/"
376
+                  }}
377
+               </span>
378
+                
366 379
               </span>
367 380
             </td>
368 381
             <td style="text-align: left" colspan="2">

+ 4 - 1
src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue Zobrazit soubor

@@ -7,7 +7,9 @@
7 7
       class="prescription-print"
8 8
       v-for="(item,index) in i.prescriptions"
9 9
       :key="index"
10
+
10 11
     >
12
+
11 13
       <span v-if="org_id == 10138">
12 14
         <img
13 15
           src="https://kuyi.shengws.com/bailin/bltotle.jpg"
@@ -158,7 +160,7 @@
158 160
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
159 161
               </div> -->
160 162
         <div class="drugsBox" v-for="(it, index) in item.project" :key="index">
161
-          <div class="drugsOne">
163
+          <div class="drugsOne" v-if="(item.type == 2 && item.project.cost_classify != 3) || item.type ==3">
162 164
             <span style="font-weight: bold">{{ index + 1 + "." }}</span
163 165
             >{{
164 166
               it.type == 2 ? it.project.project_name : it.good_info.good_name
@@ -209,6 +211,7 @@
209 211
         alt=""
210 212
       /></span>
211 213
       <div style="page-break-after: always"></div>
214
+
212 215
     </div>
213 216
 
214 217
     <!-- <div id='prescriptionPrint'>

+ 43 - 5
src/xt_pages/outpatientDoctorStation/pastInquiries.vue Zobrazit soubor

@@ -429,11 +429,49 @@ export default {
429 429
 
430 430
           let new_patients = []
431 431
           if (type != 3) {
432
-            Arr.forEach((i) => {
433
-              if (i.prescriptions.length != 0) {
434
-                new_patients.push(i)
435
-              }
436
-            })
432
+
433
+            if (type == 1){
434
+              Arr.forEach((i) => {
435
+                if (i.prescriptions.length != 0) {
436
+                  new_patients.push(i)
437
+                }
438
+              })
439
+
440
+            }else {
441
+              Arr.forEach((i) => {
442
+                if (i.prescriptions.length != 0) {
443
+                  for(let b = 0; b < i.prescriptions.length;b++) {
444
+                    for (let c = 0; c < i.prescriptions[b].project.length; c++) {
445
+                      if(b == 1) {
446
+                        console.log(i.prescriptions[b].project.length)
447
+                        console.log(i.prescriptions[b].project[c].project.cost_classify)
448
+                        console.log(i.prescriptions[b].project[c].type)
449
+                      }
450
+                      if(i.prescriptions[b].project[c].type == 2 && i.prescriptions[b].project[c].project.cost_classify == 3){
451
+                        i.prescriptions[b].project.splice(c,1)
452
+                        c--
453
+                      }
454
+                    }
455
+                  }
456
+                  new_patients.push(i)
457
+                }
458
+              })
459
+              let new_patients_two = []
460
+
461
+              new_patients.forEach((i) => {
462
+                if (i.prescriptions.length != 0) {
463
+                  for(let b = 0; b < i.prescriptions.length;b++) {
464
+                    if(i.prescriptions[b].project.length == 0){
465
+                      i.prescriptions.splice(b,1)
466
+                      b--
467
+                    }
468
+                  }
469
+                  new_patients_two.push(i)
470
+                }
471
+              })
472
+              new_patients = new_patients_two
473
+            }
474
+
437 475
           } else {
438 476
             Arr.forEach((el) => {
439 477
               el.new_prescriptions.forEach((o) => {

+ 2 - 0
src/xt_pages/workforce/components/tableData.vue Zobrazit soubor

@@ -1772,6 +1772,7 @@ export default {
1772 1772
       this.currentData.patient_id = 0;
1773 1773
     },
1774 1774
     getSchedules() {
1775
+      console.log
1775 1776
          var partionStr = this.partition_id
1776 1777
          var arr = this.zoneIdList.join(',')
1777 1778
          var str = ""
@@ -1786,6 +1787,7 @@ export default {
1786 1787
           patitionid:str,
1787 1788
           schedule_type:this.schedule_type,
1788 1789
         }
1790
+        
1789 1791
 
1790 1792
       getSchedulesOne(params).then(response => {
1791 1793
         if (response.data.state == 1) {