浏览代码

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 1年前
父节点
当前提交
debca79bcb

+ 16 - 16
src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue 查看文件

@@ -118,7 +118,7 @@
118 118
                 v-for="(item, i) in way_arr"
119 119
                 class="under_line"
120 120
                 v-if="record.receive_assessment.way == item.id"
121
-                style="width: 100px; text-align: left"
121
+                style="width: 60px; text-align: left"
122 122
               >
123 123
                 {{ item.name }}
124 124
               </div>
@@ -126,19 +126,19 @@
126 126
             <!-- 病人意识 -->
127 127
             <div class="inline_block">
128 128
               病人意识:
129
-              <div class="under_line" style="width: 80px; text-align: left">
130
-                <div v-for="(item, index) in consciousness_arr">
129
+              <div class="under_line" style="width: 60px; text-align: left">
130
+                <span v-for="(item, index) in consciousness_arr">
131 131
                   <span v-if="record.receive_assessment.consciousness==item.id">{{ item.name }}</span>
132
-                </div>
132
+                </span>
133 133
               </div>
134 134
             </div>
135 135
             <!-- 病人情况 -->
136 136
             <div class="inline_block">
137 137
               病人情况:
138
-              <div class="under_line" style="width: 80px; text-align: left">
139
-                <div v-for="item in condition">
138
+              <div class="under_line" style="width: 60px; text-align: left">
139
+                <span v-for="item in condition">
140 140
                   <span v-if="record.receive_assessment.condition==item.id">{{ item.lable }}</span>
141
-                </div>
141
+                </span>
142 142
               </div>
143 143
             </div>
144 144
             <div class="inline_block" style="margin-left: 10px" >
@@ -1198,7 +1198,7 @@
1198 1198
                           <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
1199 1199
                           <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
1200 1200
                           <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
1201
-                          <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">肝素剩余量度(ml)</div>
1201
+                          <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">肝素剩余量度(ml)</div>
1202 1202
                           <div style="flex: 2;">病情变化及处理</div>
1203 1203
                         </div>
1204 1204
                     </div>
@@ -1234,7 +1234,7 @@
1234 1234
                       <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">
1235 1235
                         {{ monitor_record.replacement_speed ? monitor_record.replacement_speed : "" }}
1236 1236
                       </div>
1237
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">
1237
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">
1238 1238
 
1239 1239
                       </div>
1240 1240
                       <div style="flex: 2;">
@@ -1547,7 +1547,7 @@
1547 1547
                   :key="index"
1548 1548
                   class="under_line"
1549 1549
                   v-if="record.receive_assessment.way == item.id"
1550
-                  style="width: 100px; text-align: left"
1550
+                  style="width: 60px; text-align: left"
1551 1551
                 >
1552 1552
                   {{ item.name }}
1553 1553
                 </div>
@@ -1555,19 +1555,19 @@
1555 1555
                <!-- 病人意识 -->
1556 1556
               <div class="inline_block">
1557 1557
                 病人意识:
1558
-                <div class="under_line" style="width: 80px; text-align: left">
1559
-                  <div v-for="(item, index) in consciousness_arr">
1558
+                <div class="under_line" style="width: 60px; text-align: left">
1559
+                  <span v-for="(item, index) in consciousness_arr">
1560 1560
                     <span v-if="record.receive_assessment.consciousness==item.id">{{ item.name }}</span>
1561
-                  </div>
1561
+                  </span>
1562 1562
                 </div>
1563 1563
               </div>
1564 1564
               <!-- 病人情况 -->
1565 1565
               <div class="inline_block">
1566 1566
                 病人情况:
1567
-                <div class="under_line" style="width: 80px; text-align: left">
1568
-                  <div v-for="item in condition">
1567
+                <div class="under_line" style="width: 60px; text-align: left">
1568
+                  <span v-for="item in condition">
1569 1569
                     <span v-if="record.receive_assessment.condition==item.id">{{ item.lable }}</span>
1570
-                  </div>
1570
+                  </span>
1571 1571
                 </div>
1572 1572
               </div>
1573 1573
               <div class="inline_block" style="margin-left: 10px" >

+ 25 - 18
src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue 查看文件

@@ -114,7 +114,7 @@
114 114
               v-for="(item, index) in way_arr"
115 115
               class="under_line"
116 116
               v-if="receiverTreatmentAccess.way == item.id"
117
-              style="width: 80px; text-align: left"
117
+              style="width: 60px; text-align: left"
118 118
             >
119 119
               {{ item.name }}
120 120
             </div>
@@ -123,19 +123,23 @@
123 123
           <!-- 病人意识 -->
124 124
           <div class="inline_block">
125 125
             病人意识:
126
-            <div class="under_line" style="width: 80px; text-align: left">
127
-              <div v-for="(item, index) in consciousness_arr">
126
+            <div class="under_line" style="width: 60px; text-align: left" 
127
+              >
128
+              <!-- <div  style="display: inline-block;"> -->
129
+              <span v-for="(item, index) in consciousness_arr">
128 130
                 <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
129
-              </div>
131
+              </span>
132
+              <!-- </div> -->
130 133
             </div>
131 134
           </div>
132 135
           <!-- 病人情况 -->
133 136
           <div class="inline_block">
134 137
             病人情况:
135
-            <div class="under_line" style="width: 80px; text-align: left">
136
-              <div v-for="item in condition">
138
+            <div class="under_line" style="width: 60px; text-align: left"
139
+            >
140
+              <span v-for="item in condition">
137 141
                 <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
138
-              </div>
142
+              </span>
139 143
             </div>
140 144
           </div>
141 145
 
@@ -1095,7 +1099,9 @@
1095 1099
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
1096 1100
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
1097 1101
                       <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
1098
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7">肝素剩余量度(ml)</div>
1102
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7 && 
1103
+                        prescription.anticoagulant_name != ''">肝素剩余量度(ml)
1104
+                      </div>
1099 1105
                       <div style="flex: 2;">病情变化及处理</div>
1100 1106
                     </div>
1101 1107
                   </div>
@@ -1148,7 +1154,7 @@
1148 1154
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
1149 1155
                       {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
1150 1156
                     </div>
1151
-                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7">
1157
+                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''">
1152 1158
 
1153 1159
                     </div>
1154 1160
                     <div style="flex: 2;">
@@ -1428,25 +1434,26 @@
1428 1434
                 v-for="(item, index) in way_arr"
1429 1435
                 class="under_line"
1430 1436
                 v-if="receiverTreatmentAccess.way == item.id"
1431
-                style="width: 80px; text-align: left"
1437
+                style="width: 60px; text-align: left"
1432 1438
               >
1433 1439
                 {{ item.name }}
1434 1440
               </div>
1435 1441
             </div>
1436 1442
             <div class="inline_block">
1437 1443
               病人意识:
1438
-              <div class="under_line" style="width: 80px; text-align: left">
1439
-                <div v-for="(item, index) in consciousness_arr">
1440
-                  <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
1441
-                </div>
1444
+              <div class="under_line" style="width: 60px; text-align: left">
1445
+              <span v-for="(item, index) in consciousness_arr">
1446
+                <span v-if="receiverTreatmentAccess.consciousness==item.id">{{ item.name }}</span>
1447
+              </span>
1442 1448
               </div>
1443 1449
             </div>
1444 1450
             <div class="inline_block">
1445 1451
               病人情况:
1446
-              <div class="under_line" style="width: 80px; text-align: left">
1447
-                <div v-for="item in condition">
1448
-                  <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
1449
-                </div>
1452
+              <div class="under_line" style="width: 60px; text-align: left" >
1453
+
1454
+                  <span v-for="item in condition">
1455
+                    <span v-if="receiverTreatmentAccess.condition==item.id">{{ item.lable }}</span>
1456
+                  </span>
1450 1457
               </div>
1451 1458
             </div>
1452 1459
             <div class="inline_block" style="margin-left: 10px" >

+ 65 - 10
src/xt_pages/user/Informed/components/Medicalhistory.vue 查看文件

@@ -1,9 +1,9 @@
1 1
 <template>
2 2
   <div style="border:1px solid gainsboro ;padding:10px">
3 3
     <div style="position: relative; left: 400px;width: 250px;margin: 20px 0;">
4
-      <el-button type="primary" style=""  @click="bianji">
4
+      <!-- <el-button type="primary" style=""  @click="bianji">
5 5
             编辑
6
-        </el-button>
6
+        </el-button> -->
7 7
       <!-- <el-button type="danger" style=""  @click="">
8 8
             删除
9 9
       </el-button> -->
@@ -24,8 +24,8 @@
24 24
           <div style="display: flex;padding: 10px 5px">
25 25
             <div style="flex: 1;">姓名:<span class="unile">{{ patient.name }}</span></div>
26 26
             <div style="flex: 1;">性别:
27
-              <input type="checkbox" />女
28
-              <input type="checkbox" />男
27
+              <input type="checkbox" v-model="nv" class="nv"/>女
28
+              <input type="checkbox" v-model="nan" class="nan"/>男
29 29
             </div>
30 30
           </div>
31 31
           <div style="display: flex;padding: 10px 5px">
@@ -36,7 +36,8 @@
36 36
           </div>
37 37
           <div style='padding: 10px 5px'>
38 38
             <div>
39
-              现住址(详填) <span class="unile2"></span> 省 <span class="unile2"></span>市<span class="unile2"></span>县(区)<span class="unile2"></span>乡(镇、街道)<span class="unile2"></span>村(门牌号)
39
+              现住址(详填) <span class="unile2">{{ sheng ? sheng:' ' }}</span> 省 <span class="unile2">{{ shi? shi:' ' }}</span>市
40
+              <span class="unile2">{{ xian ?xian:'' }}</span>县(区)<span class="unile2">{{ jie?jie:'' }}</span>乡(镇、街道)<span class="unile2">{{ hao?hao:'' }}</span>村(门牌号)
40 41
             </div>
41 42
             <div style="flex: 1;">邮编<span class="unile2"></span></div>
42 43
           </div>
@@ -64,7 +65,7 @@
64 65
             地址<span class="unile2"></span> 省(市)<span class="unile2"></span>路<span class="unile2"></span>号
65 66
           </div>
66 67
           <div style="padding: 10px 5px">
67
-            诊断:<span class="unile"></span>
68
+            诊断:<span class="unile">{{ patient.diagnose }}</span>
68 69
           </div>
69 70
           <div style="padding: 10px 5px">
70 71
             合并症或并发症 <span class="unile"></span>
@@ -84,7 +85,7 @@
84 85
                 <td>日期</td>
85 86
                 <td>种类</td>
86 87
               </tr>
87
-              <tr>
88
+              <tr v-for="item in 6">
88 89
                 <td class="tablepadd">2023.11.30</td>
89 90
                 <td>待定</td>
90 91
                 <td>2023.11.30</td>
@@ -105,7 +106,7 @@
105 106
                 <td>日期</td>
106 107
                 <td>药物名称</td>
107 108
               </tr>
108
-              <tr>
109
+              <tr v-for="item in 6">
109 110
                 <td class="tablepadd">2023.11.30</td>
110 111
                 <td></td>
111 112
                 <td></td>
@@ -124,7 +125,7 @@
124 125
                 <td>透析液钙浓度</td>
125 126
                 <td>调整日期</td>
126 127
               </tr>
127
-              <tr>
128
+              <tr v-for="item in 3">
128 129
                 <td class="tablepadd">每周3次</td>
129 130
                 <td>2023.11.30</td>
130 131
                 <td>HD</td>
@@ -176,10 +177,18 @@ export default{
176 177
     return{
177 178
       patient:{},
178 179
       dialogVisible:false,
180
+      sex:'',
181
+      sheng:'',
182
+      shi:'',
183
+      xian:'',
184
+      jie:'',
185
+      hao:''
179 186
     }
180 187
   },
181 188
   created(){
182 189
     this.getlist()
190
+
191
+    // }
183 192
   },
184 193
   methods:{
185 194
     getlist(){
@@ -189,6 +198,31 @@ export default{
189 198
           var patient =  response.data.data.patients
190 199
           console.log("patinet",patient)
191 200
           this.patient =patient
201
+          this.sex=patient.gender
202
+
203
+          console.log('2222', patient.home_address)
204
+          if(patient.home_address != ''){
205
+            var str = patient.home_address
206
+            var reg = /.+?(省|市|自治区|自治州|县|区|乡|镇|街道|号)/g; // 省市区的正则
207
+            const address = str.match(reg)
208
+            for(let i in address){
209
+              // console.log(i,address[i]);
210
+              if(address[i].indexOf('省') != -1 || address[i].indexOf('自治区') != -1){
211
+                this.sheng = address[i]
212
+              }else if(address[i].indexOf('市') != -1 || address[i].indexOf('自治州') != -1){
213
+                this.shi = address[i]
214
+              }else if(address[i].indexOf('县') != -1 || address[i].indexOf('区') != -1){
215
+                this.xian = address[i]
216
+              }else if(address[i].indexOf('乡') != -1 || address[i].indexOf('街道') != -1 || address[i].indexOf('镇') != -1){
217
+                this.jie = address[i]
218
+              }else{
219
+                this.hao =address[i]
220
+              }
221
+            }
222
+            console.log('ffff',this.sheng,this.shi,this.xian,this.jie,this.hao);
223
+
224
+          }
225
+
192 226
         }
193 227
       })
194 228
     },
@@ -216,6 +250,25 @@ export default{
216 250
     bianji(){
217 251
       this.dialogVisible = true
218 252
     }
253
+  },
254
+  computed:{
255
+    nv(){
256
+      const sex=document.getElementsByClassName('nv')
257
+      if(this.sex==2){
258
+        return sex.checked=true
259
+      }else{
260
+        return sex.checked=false
261
+      }
262
+
263
+    },
264
+    nan(){
265
+      const sex2=document.getElementsByClassName('nan')
266
+      if(this.sex==1){
267
+        return sex2.checked=true
268
+      }else{
269
+        return sex2.checked=false
270
+      }
271
+    }
219 272
   }
220 273
 }
221 274
 
@@ -230,7 +283,9 @@ export default{
230 283
   .unile2{
231 284
     display: inline-block;
232 285
     border-bottom: 1px solid black;
233
-    width: 150px;
286
+    height: 30px;
287
+    text-align: center;
288
+    width: 170px;
234 289
     padding: 15px 0;
235 290
   }
236 291
   .tablepadd{