ソースを参照

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 1 ヶ月 前
コミット
0c39401583

+ 9 - 0
src/api/common/common.js ファイルの表示

@@ -548,3 +548,12 @@ export function getRolloutCount(params) {
548 548
   })
549 549
 }
550 550
 
551
+
552
+export function getPatientInspectionList(params){
553
+  
554
+  return request({
555
+    url:"/com/api/getpatientinspectionlist",
556
+    method:"get",
557
+    params:params
558
+  })
559
+}

+ 11 - 3
src/xt_pages/dialysis/details/consumable/dialysisDrug.vue ファイルの表示

@@ -22,9 +22,13 @@
22 22
                       value-format="yyyy-MM-dd"
23 23
                       placeholder="选择日期时间" align="right"
24 24
                      :picker-options="pickerOptions"></el-date-picker>
25
-      <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
25
+      <el-input size="small" style="width: 100px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
26 26
                 class="filter-item" v-model="query.keywords"/>
27
-      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
27
+      <el-button size="small" class="filter-item" type="primary" placeholder="请输入患者姓名" icon="el-icon-search" @click="search">搜索</el-button>&nbsp;&nbsp;
28
+
29
+      <!-- <el-input size="small" style="width: 100px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
30
+                class="filter-item" v-model="query.keyword"/>
31
+      <el-button size="small" class="filter-item" type="primary" placeholder="请输入药品名称" icon="el-icon-search" @click="searchOne">搜索2</el-button> -->
28 32
     </div>
29 33
     <div class="cell clearfix" style="justify-content: space-between;">
30 34
       <div style="display:flex;">
@@ -209,6 +213,7 @@
209 213
           page:1,
210 214
           limit:10,
211 215
           keywords:"",
216
+          keyword:"",
212 217
           good_type:0,
213 218
           ids:"",
214 219
         },
@@ -593,6 +598,9 @@
593 598
         this.query.page = 1
594 599
         this.getlist()
595 600
       },
601
+      searchOne() {
602
+        this.getlist()
603
+      },
596 604
 
597 605
       exportList(){
598 606
         import('@/vendor/Export2Excel').then(excel => { 
@@ -812,7 +820,7 @@
812 820
         return week;
813 821
       },
814 822
       toBiaoqian(){
815
-        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.query.schedule_type+"&partition_id="+this.query.partition_id})
823
+        this.$router.push({path:"/dialysis/hisLongSignPrint?selected_date="+this.selected_date+"&schedule_type="+this.query.schedule_type+"&partition_id="+this.query.partition_id+"&ids="+this.ids+"&keywords="+this.query.keywords})
816 824
       }
817 825
     }
818 826
   }

+ 1 - 0
src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue ファイルの表示

@@ -120,6 +120,7 @@
120 120
           partition_id:this.$route.query.partition_id,
121 121
           ids:this.$route.query.ids,
122 122
          }
123
+         console.log("HHAHDHAHHDAH",params)
123 124
         getDialysisAdviceTemplateList(params).then(response=>{
124 125
           if(response.data.state == 1){
125 126
           

+ 13 - 5
src/xt_pages/dialysis/details/consumable/dialysisGood.vue ファイルの表示

@@ -98,10 +98,10 @@
98 98
           :label="item.filed_name_cn"
99 99
         >
100 100
           <template slot-scope="scope">
101
-            <span v-if="org_id !=10599">
101
+            <!-- <span v-if="org_id !=10599 && org_id!=10138 && org_id!=10278">
102 102
               {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
103
-            </span>
104
-            <span v-if="org_id==10599">
103
+            </span> -->
104
+            <span>
105 105
               <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
106 106
               <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
107 107
             </span>
@@ -179,7 +179,9 @@
179 179
           :label="item.type_name"
180 180
         >
181 181
           <template slot-scope="scope">
182
-             {{getStr(scope.row.typeList[index].id,scope.row.projectList,scope.row.patient_id)}}
182
+            <span v-if="scope.row.his_prescription_project.length>0"> {{getStr(scope.row.typeList[index].id,scope.row.his_prescription_project,scope.row.patient_id)}}</span>
183
+            <span v-if="scope.row.his_prescription_project.length==0">  {{getStr(scope.row.typeList[index].id,scope.row.projectList,scope.row.patient_id)}}</span>
184
+           
183 185
           </template>
184 186
 
185 187
         </el-table-column>
@@ -609,7 +611,13 @@
609 611
             this.list[i].name3 = this.list[i].patient.dialysis_no
610 612
             if(this.typeList!=null && this.typeList.length > 0){
611 613
               for(let j=0;j<this.typeList.length;j++){
612
-                this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].projectList,this.list[i].patient_id)
614
+                if(this.list[i].his_prescription_project.length>0){
615
+                  this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].his_prescription_project,this.list[i].patient_id)
616
+                }
617
+                if(this.list[i].his_prescription_project.length == 0){
618
+                  this.list[i]['name'+(j+4)] = this.getStr(this.list[i].typeList[j].id,this.list[i].projectList,this.list[i].patient_id)
619
+                }
620
+              
613 621
               }
614 622
             }
615 623
 

+ 3 - 1
src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue ファイルの表示

@@ -74,7 +74,9 @@
74 74
                  <td>{{item.patient.name}}</td>
75 75
                 <td>{{item.patient.dialysis_no}}</td>
76 76
                 <td v-for="(it,index) in typeList" :key="index">
77
-                  {{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}
77
+                  <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
78
+                  <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
79
+                 
78 80
                 </td>
79 81
                </tr>
80 82
               </tbody>

+ 11 - 13
src/xt_pages/dialysis/details/dialog/computer_dialog.vue ファイルの表示

@@ -515,18 +515,9 @@ export default {
515 515
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
516 516
     this.patient_id = this.$route.query.patient_id;
517 517
     this.schedule_date = this.$route.query.date;
518
-    this.form.nurse_id =
519
-      this.dialysis_order.id == 0
520
-        ? this.$store.getters.xt_user.user.id
521
-        : this.dialysis_order.start_nurse;
522
-    this.form.puncture_nurse_id =
523
-      this.dialysis_order.id == 0
524
-        ? this.$store.getters.xt_user.user.id
525
-        : this.dialysis_order.puncture_nurse;
526
-    this.form.washpipe_nurse =
527
-      this.dialysis_order.id == 0
528
-        ? this.$store.getters.xt_user.user.id
529
-        : this.dialysis_order.washpipe_nurse;
518
+    this.form.nurse_id =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.start_nurse;
519
+    this.form.puncture_nurse_id =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.puncture_nurse;
520
+    this.form.washpipe_nurse =this.dialysis_order.id == 0? this.$store.getters.xt_user.user.id: this.dialysis_order.washpipe_nurse;
530 521
 
531 522
     if (this.form.puncture_nurse_id == 0) {
532 523
       this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id;
@@ -902,7 +893,14 @@ export default {
902 893
           console.log(this.dialysis_order);
903 894
           this.loading = true;
904 895
           let mode = "1";
905
-          var blood_drawing = this.form.blood_drawing.toString();
896
+          if(this.form.blood_drawing!=undefined){
897
+            var blood_drawing = this.form.blood_drawing.toString();
898
+          }else{
899
+            blood_drawing = ""
900
+          }
901
+
902
+
903
+         
906 904
           console.log("质控护士", this.form.quality_nurse_id);
907 905
           console.log("this.form.nuclein_date", this.form.nuclein_date);
908 906
 

+ 10 - 6
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue ファイルの表示

@@ -510,7 +510,8 @@
510 510
                 org_id ==10432 ||
511 511
                 org_id ==10445 ||
512 512
                 org_id ==10410 ||
513
-                org_id == 10395
513
+                org_id == 10395||
514
+                org_id == 10617
514 515
 
515 516
                )&& org_id!=10598
516 517
             "
@@ -540,7 +541,8 @@
540 541
               org_id !=10432 &&
541 542
               org_id !=10445 &&
542 543
               org_id!=10395 &&
543
-              org_id !=10410)|| org_id==10598
544
+              org_id !=10410 &&
545
+              org_id!=10617)|| org_id==10598
544 546
             "
545 547
           >
546 548
             <template slot-scope="scope">
@@ -1405,7 +1407,8 @@
1405 1407
               org_id!=10432 &&
1406 1408
               org_id!=10445 &&
1407 1409
               org_id!=10410 &&
1408
-              org_id!=10395)
1410
+              org_id!=10395 &&
1411
+              org_id!=10617)
1409 1412
               || org_id ==10558 || org_id==10598
1410 1413
             "
1411 1414
           >
@@ -1430,9 +1433,10 @@
1430 1433
                 template_id == 56 ||
1431 1434
                 template_id == 48 ||
1432 1435
                 org_id==10432 ||
1433
-                org_id!=10445 ||
1434
-                org_id!=10410 ||
1435
-                org_id!=10395) && org_id !=10558 && org_id!=10598
1436
+                org_id==10445 ||
1437
+                org_id==10410 ||
1438
+                org_id==10395 || 
1439
+                org_id==10617) && org_id !=10558 && org_id!=10598
1436 1440
             "
1437 1441
           >
1438 1442
             <el-form-item label="置换率(ml/min):" :prop="isName('置换率')"

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue ファイルの表示

@@ -21,8 +21,8 @@
21 21
           <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && 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 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
22 22
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
23 23
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
24
-          <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 || org_id == 10410) && org_id!=10558 && org_id!=10598" width="92px" > 置换率(ml/min) </th>
25
-          <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 && org_id!=10410) || org_id == 10558 || org_id ==10598" width="92px" > 置换率(L/h)  </th>
24
+          <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 || org_id == 10410 || org_id ==10617) && org_id!=10558 && org_id!=10598" width="92px" > 置换率(ml/min) </th>
25
+          <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 && org_id!=10410 && org_id!=10617) || org_id == 10558 || org_id ==10598" width="92px" > 置换率(L/h)  </th>
26 26
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
27 27
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || 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 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598" width="92px"  > 置换量(ml)  </th>
28 28
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && 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 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598" width="92px" > 置换量(L) </th>

+ 24 - 3
src/xt_pages/dialysis/hisLongSignPrint.vue ファイルの表示

@@ -177,8 +177,9 @@ export default {
177 177
           page:this.$route.query.page,
178 178
           limit:1000,
179 179
           keywords:"",
180
+          keyword:this.$route.query.keywords,
180 181
           good_type:0,
181
-          ids:"",
182
+          ids:this.$route.query.ids,
182 183
           
183 184
 
184 185
       }
@@ -198,8 +199,6 @@ export default {
198 199
         var adviceList = response.data.data.adviceList
199 200
         this.adviceList = adviceList
200 201
 
201
-        var longHisAdviceList = response.data.data.longHisAdviceList
202
-
203 202
 
204 203
         var tablelist = response.data.data.tablelist
205 204
         console.log("tablelsit",tablelist)
@@ -240,7 +239,29 @@ export default {
240 239
                     }
241 240
                 }
242 241
              }
242
+             console.log("寄哪里地方5555",this.$route.query.keywords)
243
+             if(this.$route.query.keywords!=""){
244
+                console.log("寄哪里地方",this.$route.query.keywords)
245
+               for(let i=0;i<list.length;i++){
246
+                 list[i].new_arr = []
247
+                 for(let j=0;j<list[i].his_advice_list.length;j++){
248
+                    console.log("iiiiii",list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords))
249
+                    if(list[i].his_advice_list[j].advice_name.indexOf(this.$route.query.keywords)!=-1){
250
+                       list[i].new_arr.push(list[i].his_advice_list[j])
251
+                    }
252
+                 }
253
+               }
254
+          }
255
+          if(list!=null && list.length>0){
256
+            for(let i=0;i<list.length;i++){
257
+                list[i].his_advice_list =[]
258
+                list[i].his_advice_list = list[i].new_arr 
259
+            }
260
+         }
243 261
         }
262
+        
263
+       
264
+      
244 265
        
245 266
         console.log("list-------------",list)
246 267
         this.list = list

+ 8 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue ファイルの表示

@@ -135,8 +135,14 @@
135 135
             </div>
136 136
         </div>
137 137
         <div class="row">
138
+          血管通路部位
139
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
140
+            {{ predialysis.blood_access_part_id }}
141
+          </div>
142
+       
138 143
           血管通路 
139
-          <div class="inline_block under_line" style="width:92%;text-align: left;">
144
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
145
+            
140 146
             {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
141 147
             <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
142 148
             (<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
@@ -161,6 +167,7 @@
161 167
             &nbsp; -->
162 168
           </div>
163 169
         </div>
170
+       
164 171
         <div class="row">
165 172
           导管
166 173
           <div class="inline_block under_line" style="width:200px;text-align: left;">

+ 5 - 0
src/xt_pages/outpatientCharges/statementTemplate/printFour.vue ファイルの表示

@@ -78,6 +78,10 @@
78 78
                               <p style="width:50%;">个人账号</p>
79 79
                               <p style="width:50%;">{{info.acct_pay?info.acct_pay.toFixed(2):0}}元</p>
80 80
                           </div>
81
+                        <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
82
+                          <p style="width:50%;">大病支付</p>
83
+                          <p style="width:50%;">{{info.hifmi_pay?info.hifmi_pay.toFixed(2):0}}元</p>
84
+                        </div>
81 85
                           <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
82 86
                               <p style="width:50%;">现金支付</p>
83 87
                               <p style="width:50%;">{{info.psn_pay?info.psn_pay.toFixed(2):0}}元</p>
@@ -185,6 +189,7 @@
185 189
                             <p style="width:50%;">个人账号</p>
186 190
                             <p style="width:50%;">0元</p>
187 191
                         </div>
192
+
188 193
                         <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
189 194
                             <p style="width:50%;">现金支付</p>
190 195
                             <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>

+ 19 - 1
src/xt_pages/qcd/patientControlAnalysis.vue ファイルの表示

@@ -77,6 +77,7 @@
77 77
         </div>
78 78
         <div>
79 79
           <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="toExportList">导出</el-button>
80
+          <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="getPatientInspectionList">导出2</el-button>
80 81
           <el-table :data="tableData" v-loading="isLoadingTwo" border style="width: 100%"
81 82
                     :row-style="{ color: '#303133' }"
82 83
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
@@ -161,7 +162,8 @@ import {
161 162
   getCurrentOrgPatients,
162 163
   getNormData,
163 164
   getPatientContorlAnalysis,
164
-  getPatientsControl
165
+  getPatientsControl,
166
+  getPatientInspectionList
165 167
 } from '@/api/common/common'
166 168
 
167 169
 export default {
@@ -843,6 +845,20 @@ export default {
843 845
     formatJson(filterVal, jsonData) {
844 846
       return jsonData.map((v) => filterVal.map((j) => v[j]));
845 847
     },
848
+    getPatientInspectionList(){
849
+       var params ={
850
+        startime:this.listQuery.start_time,
851
+        endtime: this.listQuery.end_time
852
+       }
853
+       getPatientInspectionList(params).then(response=>{
854
+          if(response.data.state ==1){
855
+            var list = response.data.data.list
856
+            console.log("list----------",list)
857
+          }
858
+       })
859
+     
860
+        
861
+    }
846 862
   },
847 863
   created() {
848 864
     var nowDate = new Date()
@@ -872,6 +888,8 @@ export default {
872 888
     //获取统计图数据
873 889
     this.getCartogramlist()
874 890
 
891
+   
892
+
875 893
   }
876 894
 }
877 895
 </script>

+ 1 - 1
src/xt_pages/stock/query/purchaseNewStockQuery.vue ファイルの表示

@@ -268,7 +268,7 @@ export default {
268 268
               if(this.org_id ==10210){
269 269
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
270 270
               }else{
271
-                console.log("good_id",list[i].id)
271
+               
272 272
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
273 273
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
274 274
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )

+ 2 - 2
src/xt_pages/user/Informed/Informedconsent.vue ファイルの表示

@@ -679,7 +679,7 @@ export default {
679 679
           this.show14=false,
680 680
           this.show15=true,
681 681
           this.show16=false
682
-          // this.getPatientCriticalList()
682
+          this.getPatientCriticalList()
683 683
         }
684 684
         if(row.value==16){
685 685
           this.filter_show=false
@@ -698,7 +698,7 @@ export default {
698 698
           this.show14=false,
699 699
           this.show15=false,
700 700
           this.show16=true
701
-          // this.getPatientCriticalOneList()
701
+          this.getPatientCriticalOneList()
702 702
         }
703 703
     },
704 704
    

+ 62 - 62
src/xt_pages/user/components/PatientSidebar.vue ファイルの表示

@@ -204,68 +204,68 @@ export default {
204 204
             },
205 205
           ]
206 206
         },
207
-        {
208
-          name: '5',
209
-          label: '评估工具',
210
-          children: [
211
-            {
212
-              name: '5-1',
213
-              label: '跌倒评估'
214
-            },
215
-            {
216
-              name: '5-2',
217
-              label: '小儿跌倒风险评估'
218
-            },
219
-            {
220
-              name: '5-3',
221
-              label: '压疮风险评估'
222
-            },
223
-            {
224
-              name: '5-4',
225
-              label: 'OH压疮评估'
226
-            },
227
-            {
228
-              name: '5-5',
229
-              label: '日常生活能力评估'
230
-            },
231
-            {
232
-              name: '5-6',
233
-              label: '导管脱落风险评估'
234
-            },
235
-            {
236
-              name: '5-7',
237
-              label: 'RASS及疼痛评估'
238
-            },
239
-            {
240
-              name: '5-8',
241
-              label: '营养状况评估'
242
-            },
243
-            {
244
-              name: '5-9',
245
-              label: '约束告知单'
246
-            },
247
-            {
248
-              name: '5-10',
249
-              label: '心理评估'
250
-            },
251
-            {
252
-              name: '5-11',
253
-              label: '瘙痒评估'
254
-            },
255
-            {
256
-              name: '5-12',
257
-              label: '血液透析患者评估'
258
-            },
259
-            {
260
-              name: '5-13',
261
-              label: 'Glasgow昏迷评分量表'
262
-            },
263
-            {
264
-              name: '5-14',
265
-              label: '肌力评估表'
266
-            },
267
-           ]
268
-         },
207
+        // {
208
+        //   name: '5',
209
+        //   label: '评估工具',
210
+        //   children: [
211
+        //     {
212
+        //       name: '5-1',
213
+        //       label: '跌倒评估'
214
+        //     },
215
+        //     {
216
+        //       name: '5-2',
217
+        //       label: '小儿跌倒风险评估'
218
+        //     },
219
+        //     {
220
+        //       name: '5-3',
221
+        //       label: '压疮风险评估'
222
+        //     },
223
+        //     {
224
+        //       name: '5-4',
225
+        //       label: 'OH压疮评估'
226
+        //     },
227
+        //     {
228
+        //       name: '5-5',
229
+        //       label: '日常生活能力评估'
230
+        //     },
231
+        //     {
232
+        //       name: '5-6',
233
+        //       label: '导管脱落风险评估'
234
+        //     },
235
+        //     {
236
+        //       name: '5-7',
237
+        //       label: 'RASS及疼痛评估'
238
+        //     },
239
+        //     {
240
+        //       name: '5-8',
241
+        //       label: '营养状况评估'
242
+        //     },
243
+        //     {
244
+        //       name: '5-9',
245
+        //       label: '约束告知单'
246
+        //     },
247
+        //     {
248
+        //       name: '5-10',
249
+        //       label: '心理评估'
250
+        //     },
251
+        //     {
252
+        //       name: '5-11',
253
+        //       label: '瘙痒评估'
254
+        //     },
255
+        //     {
256
+        //       name: '5-12',
257
+        //       label: '血液透析患者评估'
258
+        //     },
259
+        //     {
260
+        //       name: '5-13',
261
+        //       label: 'Glasgow昏迷评分量表'
262
+        //     },
263
+        //     {
264
+        //       name: '5-14',
265
+        //       label: '肌力评估表'
266
+        //     },
267
+        //    ]
268
+        //  },
269 269
         {
270 270
           name: '6',
271 271
           label: '文书管理',

+ 5 - 5
src/xt_pages/user/evaluationtool/OHpressuresore.vue ファイルの表示

@@ -479,7 +479,7 @@ export default {
479 479
           is_type:2,
480 480
           list:list,
481 481
         }
482
-     
482
+
483 483
         // console.log("data",data)
484 484
         savePatientHpressuresore(params).then(response=>{
485 485
           if(response.data.state ==1){
@@ -511,7 +511,7 @@ export default {
511 511
     },
512 512
     // 选中数据
513 513
     dele_click(row, column, event){
514
-      
514
+
515 515
       this.dele_id=row.id
516 516
       console.log('row',this.dele_id);
517 517
       if(this.baocun_open == 1){
@@ -546,7 +546,7 @@ export default {
546 546
                 this.bingli[i].check = 0
547 547
                 // this.bingli_num = 0
548 548
               }
549
-              
549
+
550 550
             }
551 551
             for(let i in this.edema){
552 552
               if(editor.edema == this.edema[i].value){
@@ -579,7 +579,7 @@ export default {
579 579
         }
580 580
       })
581 581
 
582
-      
582
+
583 583
       // for(let i in this.tiwei){
584 584
       //   if(row.list.tiwei == this.tiwei[i].value){
585 585
       //     this.tiwei[i].is_check = true
@@ -803,7 +803,7 @@ export default {
803 803
       set(val){
804 804
         return this.OH_zong = val
805 805
       }
806
-      
806
+
807 807
     }
808 808
   },
809 809
  created(){

+ 2 - 2
src/xt_pages/user/inspection.vue ファイルの表示

@@ -794,7 +794,7 @@ export default {
794 794
         console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
795 795
         console.log("inspectionsMap",this.inspectionsMap)
796 796
         for (var index in this.project.inspection_reference) {
797
-          if(this.org_id ==10278 || this.org_id ==10138 || this.org_id == 0){
797
+          if(this.org_id ==10138){
798 798
             this.form.formItem.push({
799 799
               id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
800 800
               project_id: this.project.inspection_reference[index].project_id,
@@ -1328,7 +1328,7 @@ export default {
1328 1328
               
1329 1329
               if (item.item_id > 0) {
1330 1330
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1331
-                  if(this.org_id == 10121 || this.org_id ==10138){
1331
+                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id == 0 || this.org_id ==10278){
1332 1332
                     item.value = inspectionsMap[items[index].id].inspect_value
1333 1333
                     item.item_name = inspectionsMap[items[index].id].item_name
1334 1334
                   }else{