Browse Source

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

yq1 1 week ago
parent
commit
5f5758906a

+ 31 - 3
src/api/patient.js View File

@@ -211,10 +211,11 @@ export function getRescueRecords(patient_id, start_time_ymd, end_time_ymd) {
211 211
   })
212 212
 }
213 213
 
214
-export function createRescueRecord(patient_id, content) {
214
+export function createRescueRecord(patient_id, content,record_date) {
215 215
   var params = {
216 216
     patient_id: patient_id,
217
-    content: content
217
+    content: content,
218
+    record_date:record_date,
218 219
   }
219 220
   return request({
220 221
     url: '/api/patient/rescue/create',
@@ -1448,4 +1449,31 @@ export function getPatientAdviceList(params){
1448 1449
     method:"Get",
1449 1450
     params:params,
1450 1451
   })
1451
-}
1452
+}
1453
+
1454
+export function getPatientInspectionList(params){
1455
+
1456
+  return request({
1457
+    url:"/api/patient/getpatientinspectionlist",
1458
+    method:"get",
1459
+    params:params
1460
+  })
1461
+}
1462
+
1463
+export function getInspectionByProjectId(params){
1464
+ 
1465
+  return request({
1466
+    url:"/api/patient/getinspectionbyprojectid",
1467
+    method:"get",
1468
+    params:params
1469
+  })
1470
+}
1471
+
1472
+// export function getNewInspetingList(params){
1473
+
1474
+//   return request({
1475
+//     url:"/api/patient/getnewinspetionlist",
1476
+//     method:"get",
1477
+//     params:params
1478
+//   })
1479
+// }

+ 45 - 2
src/xt_pages/Pharmacy/PatientDispensing.vue View File

@@ -301,14 +301,17 @@
301 301
 
302 302
       <el-dialog
303 303
         title="药品追溯码"
304
+        @open="openDialog"
304 305
         :visible.sync="dialogVisibleOne"
305 306
          width="40%">
306 307
        <span>
307 308
         <el-input
309
+          ref="inputRef"
308 310
           @keyup.native="changeText"
309 311
           type="textarea"
310 312
           placeholder="请输入内容"
311 313
           v-model="textarea"
314
+          autofocus
312 315
           :rows="10"
313 316
         >
314 317
         </el-input>
@@ -427,6 +430,11 @@ export default {
427 430
     // this.selectedbydefault();
428 431
   },
429 432
   methods: {
433
+    openDialog(){
434
+      this.$nextTick(() => {
435
+        this.$refs.inputRef.$refs.input.focus()
436
+      });
437
+    },
430 438
     changevalue(row){
431 439
       var params = {
432 440
         id:row.ID,
@@ -1242,6 +1250,7 @@ export default {
1242 1250
        this.is_source = is_source
1243 1251
        this.textarea = DrugCode
1244 1252
        this.currentIndex = index
1253
+      
1245 1254
        this.dialogVisibleOne = true
1246 1255
 
1247 1256
     },
@@ -1265,12 +1274,45 @@ export default {
1265 1274
       })
1266 1275
     },
1267 1276
     changeText(event){
1277
+     
1268 1278
       // 检查是否为特定的按键,例如回车键,来确认扫码枪输入完成
1269 1279
       if (event.key === 'Enter') {
1280
+       
1270 1281
         var textarea = ""
1271
-        textarea += this.textarea + ","
1282
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
1283
+         
1284
+      
1285
+
1286
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
1287
+          var arr= []
1288
+          arr = textarea.split(",")
1289
+          var is_err_check = false
1290
+          var i_index = ""
1291
+          if(arr!=null && arr.length>0){
1292
+            for(let i=0;i<arr.length;i++){
1293
+               if(arr[i]!=""){
1294
+                 if(arr[i].length!=20){
1295
+                   this.$message.error("药品追溯码长度没有满足20位!")
1296
+                   is_err_check = true
1297
+                   i_index = i
1298
+                 }
1299
+               }
1300
+
1301
+            }
1302
+          }
1303
+          console.log("is_err_check+++++++++++++",is_err_check)
1304
+          if(is_err_check == true){
1305
+              arr.splice(i_index,1)
1306
+          }
1307
+          console.log("arr-------------------------",arr)
1308
+          this.textarea = arr.join(",")
1309
+        }else{
1310
+
1311
+          this.textarea = textarea
1312
+        }
1313
+        
1272 1314
 
1273
-        this.textarea = textarea
1315
+       
1274 1316
       }
1275 1317
 
1276 1318
 
@@ -1278,6 +1320,7 @@ export default {
1278 1320
 
1279 1321
 
1280 1322
   },
1323
+  
1281 1324
 };
1282 1325
 </script>
1283 1326
 

+ 11 - 2
src/xt_pages/data/components/addDrugs.vue View File

@@ -541,6 +541,13 @@
541 541
                     <el-form-item label="" style="visibility: hidden;">
542 542
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
543 543
                     </el-form-item>
544
+
545
+                    <el-form-item label="扫码次数:" prop="scan_code">
546
+                        <el-input v-model="form.scan_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
547
+                    </el-form-item>
548
+                    <el-form-item label="药品标识码:" prop="drug_identification_code">
549
+                        <el-input v-model="form.drug_identification_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
550
+                    </el-form-item>
544 551
                 </el-form>
545 552
             </el-tab-pane>
546 553
         </el-tabs>
@@ -689,7 +696,8 @@
689 696
           is_show:"",
690 697
           is_self_drug:"2",
691 698
           is_zero_flag:"",
692
-
699
+          scan_code:"",
700
+          drug_identification_code:""
693 701
         },
694 702
 
695 703
         rules: {
@@ -1034,7 +1042,8 @@
1034 1042
         form['is_show'] = this.form.is_show
1035 1043
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
1036 1044
         form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
1037
-
1045
+        form["scan_code"] = this.form.scan_code
1046
+        form["drug_identification_code"] = this.form.drug_identification_code
1038 1047
 
1039 1048
 
1040 1049
         return form

+ 4 - 0
src/xt_pages/data/components/drugs.vue View File

@@ -343,6 +343,8 @@
343 343
           bbx01:"",
344 344
           bby01:"",
345 345
           is_show:"",
346
+          scan_code:"",
347
+          drug_identification_code:"",
346 348
         },
347 349
         tempFormValue: {
348 350
           drug_name: '',//药品名称
@@ -779,6 +781,8 @@
779 781
                 this.formValue.is_self_drug = this.formValue.is_self_drug.toString()
780 782
               }
781 783
 
784
+              
785
+
782 786
 
783 787
               this.$refs.addDrugs.show(id, this.formValue)
784 788
 

+ 10 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue View File

@@ -1212,11 +1212,18 @@
1212 1212
                         <div class="under_line"
1213 1213
                           style="width: 70px; text-align: center"
1214 1214
                         >
1215
-                          <span>
1216
-                           {{ record.assessment_after_dislysis &&
1215
+                          <span v-if="record.assessment_before_dislysis.weight_before>0&&record.assessment_after_dislysis.weight_after>0">
1216
+                           <!-- {{ record.assessment_after_dislysis &&
1217 1217
                             record.assessment_after_dislysis.weight_loss
1218 1218
                               ? record.assessment_after_dislysis.weight_loss
1219
-                              : "/"}}
1219
+                              : "/"}} -->
1220
+                              {{
1221
+                              record.assessment_after_dislysis && 
1222
+                              record.assessment_before_dislysis&&
1223
+                              (record.assessment_before_dislysis.weight_before  - record.assessment_after_dislysis.weight_after).toFixed(1)
1224
+                                ?(record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after).toFixed(1)
1225
+                                : "/"
1226
+                            }}
1220 1227
                           </span>
1221 1228
 
1222 1229
                         </div>

+ 41 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue View File

@@ -2132,7 +2132,7 @@
2132 2132
                       class="row"
2133 2133
                       style="padding: 2px 0; line-height: 23px; display: flex"
2134 2134
                     >
2135
-                      <div class="inline_block" style="flex: 1">
2135
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.puncture_nurse>0">
2136 2136
                         穿刺护士:
2137 2137
                         <div
2138 2138
                           class="under_line"
@@ -2172,6 +2172,46 @@
2172 2172
                           />
2173 2173
                         </div>
2174 2174
                       </div>
2175
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.change_nurse>0">
2176
+                        换药护士:
2177
+                        <div
2178
+                          class="under_line"
2179
+                          style="width: 80px; text-align: center"
2180
+                        >
2181
+                          <span
2182
+                            v-if="
2183
+                              setAdminUserES(
2184
+                                record.dialysis_order,
2185
+                                'change_nurse'
2186
+                              ) == ''
2187
+                            "
2188
+                            >{{
2189
+                              getAdminUser(
2190
+                                record.dialysis_order,
2191
+                                "change_nurse"
2192
+                              )
2193
+                                ? getAdminUser(
2194
+                                    record.dialysis_order,
2195
+                                    "change_nurse"
2196
+                                  )
2197
+                                : "/"
2198
+                            }}</span
2199
+                          >
2200
+                          <img
2201
+                            class="es-img"
2202
+                            :src="
2203
+                              setAdminUserES(
2204
+                                record.dialysis_order,
2205
+                                'change_nurse'
2206
+                              )
2207
+                            "
2208
+                            alt=""
2209
+                            srcset=""
2210
+                            v-else
2211
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
2212
+                          />
2213
+                        </div>
2214
+                      </div>
2175 2215
                       <div class="inline_block" style="flex: 1">
2176 2216
                         治疗护士:
2177 2217
                         <div

+ 8 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

@@ -1701,7 +1701,7 @@
1701 1701
                           <td width="50">脉搏<br />(次/分)</td>
1702 1702
                           <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
1703 1703
                           <td width="50">血流量<br />(ml/min)</td>
1704
-                          <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
1704
+                          <td width="50" v-if="org_id == 10478 || org_id ==10510 || org_id ==10735">动脉压<br />(mmHg)</td>
1705 1705
                           <td width="50">静脉压<br />(mmHg)</td>
1706 1706
                           <td width="50">跨膜压<br />(mmHg)</td>
1707 1707
                           <td width="60" v-if="org_id != 9836 && org_id!=10644">透析液温度(°C)
@@ -1718,7 +1718,8 @@
1718 1718
                               org_id!=10644 &&
1719 1719
                               org_id!=0&&
1720 1720
                               org_id!=10567 &&
1721
-                              org_id!=10724
1721
+                              org_id!=10724 &&
1722
+                              org_id!=10735
1722 1723
                             "
1723 1724
                           >
1724 1725
                             电导度<br />(ms/cm)
@@ -1872,7 +1873,7 @@
1872 1873
                             }}
1873 1874
                           </td>
1874 1875
 
1875
-                          <td v-if="org_id == 10478 || org_id ==10510">
1876
+                          <td v-if="org_id == 10478 || org_id ==10510 || org_id == 10735">
1876 1877
                             {{
1877 1878
                               monitor_record.arterial_pressure
1878 1879
                                 ? monitor_record.arterial_pressure
@@ -1931,7 +1932,8 @@
1931 1932
                               org_id!=10644 &&
1932 1933
                               org_id!=0 &&
1933 1934
                               org_id!=10567 &&
1934
-                              org_id!=10724
1935
+                              org_id!=10724 &&
1936
+                              org_id!=10735
1935 1937
 
1936 1938
 
1937 1939
                             "
@@ -3103,7 +3105,8 @@
3103 3105
                          </span>
3104 3106
 
3105 3107
                          <span v-if="org_id == 10551">{{
3106
-                            record.assessment_after_dislysis &&
3108
+                            record.assessment_after_dislysis && 
3109
+                            record.assessment_before_dislysis&&
3107 3110
                             record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
3108 3111
                               ?record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
3109 3112
                               : "/"

+ 5 - 5
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -161,7 +161,7 @@
161 161
                     </el-col>
162 162
 
163 163
                     <el-col :span="8"
164
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
164
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745">
165 165
                         <el-form-item label="处方脱水量(ml):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
166 166
                             <el-input
167 167
                                     type="number"
@@ -171,7 +171,7 @@
171 171
                     </el-col>
172 172
 
173 173
                     <el-col :span="8"
174
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
174
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745">
175 175
                         <el-form-item label="处方脱水量(L):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
176 176
                             <el-input
177 177
                                     type="number"
@@ -3316,7 +3316,7 @@ mu
3316 3316
         this.pre = pre
3317 3317
         // console.log("pre1", pre);
3318 3318
         this.getPermission()
3319
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735){
3319
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745){
3320 3320
           this.getPatientBefor()
3321 3321
         }
3322 3322
 
@@ -5167,11 +5167,11 @@ mu
5167 5167
           var prescription = response.data.data.prescription
5168 5168
           if(patientBefor!=undefined){
5169 5169
 
5170
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731){
5170
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745 ){
5171 5171
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
5172 5172
               
5173 5173
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000
5174
-                 console.log("hhhhhhhhhhhhhhhhhh",this.dialysisPrescription.target_ultrafiltration)
5174
+                
5175 5175
               }
5176 5176
             }else{
5177 5177
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){

+ 11 - 8
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

@@ -387,7 +387,7 @@
387 387
                 org_id == 10599 || 
388 388
                 org_id == 10612 ||
389 389
                 org_id == 10617 ||
390
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206) &&
390
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 ) &&
391 391
                 org_id!=10387
392 392
             "
393 393
           >
@@ -458,7 +458,7 @@
458 458
               && org_id!=10432 && org_id!=10445
459 459
               && org_id!=10410 && org_id!=10495 &&
460 460
                org_id!=10485 && org_id!=10395 && org_id!=10375
461
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206)
461
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
462 462
               || org_id == 10387
463 463
             "
464 464
           >
@@ -529,7 +529,7 @@
529 529
                 org_id == 10410 ||
530 530
                 org_id == 10495  ||
531 531
                 org_id == 10395
532
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206)
532
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745)
533 533
                 && org_id!=10387
534 534
             "
535 535
           >
@@ -584,7 +584,7 @@
584 584
               org_id!=10432 &&
585 585
               org_id!=10445 &&
586 586
               org_id!=10410 && org_id!=10495
587
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206) ||
587
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 ) ||
588 588
               org_id == 10387
589 589
             "
590 590
           >
@@ -1685,7 +1685,7 @@
1685 1685
                 org_id== 10432 ||
1686 1686
                 org_id== 10445 ||
1687 1687
                 org_id== 10410 ||
1688
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206) &&
1688
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745) &&
1689 1689
                 org_id!=10387
1690 1690
             "
1691 1691
           >
@@ -1733,7 +1733,7 @@
1733 1733
               org_id!=10445 &&
1734 1734
               org_id!=10410 &&
1735 1735
               org_id!=10485 &&
1736
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206)
1736
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
1737 1737
               || org_id == 10387
1738 1738
             "
1739 1739
           >
@@ -1806,7 +1806,7 @@
1806 1806
                 org_id == 10599 ||
1807 1807
                 org_id ==10612 || 
1808 1808
                 org_id ==10617 || 
1809
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206)
1809
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745)
1810 1810
                 && org_id!=10387 && org_id!=10694
1811 1811
             "
1812 1812
           >
@@ -1884,7 +1884,10 @@
1884 1884
               org_id!=10723 &&
1885 1885
               org_id!=10721 &&
1886 1886
               org_id!=10727 &&
1887
-              org_id!=10206
1887
+              org_id!=10206 &&
1888
+              org_id!=10740 &&
1889
+              org_id!=10742 &&
1890
+              org_id!=10745
1888 1891
               )
1889 1892
               || org_id == 10387 || org_id == 10694
1890 1893
             "

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

@@ -20,11 +20,11 @@
20 20
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
21 21
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
22 22
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
23
-          <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 || template_id == 65 || 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 || 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 == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || 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 == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
24
-          <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 && template_id != 65 && 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!=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!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
23
+          <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 || template_id == 65 || 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 || 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 == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || 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 == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 " width="76px" > 超滤量(ml)</th>
24
+          <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 && template_id != 65 && 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!=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!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745"  width="76px"> 超滤量(L) </th>
25 25
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
26
-          <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 == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
-          <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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
26
+          <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 == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
+          <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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
28 28
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
29 29
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
30 30
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

+ 2 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue View File

@@ -3420,9 +3420,10 @@ export default {
3420 3420
       var end_time =   moment().endOf('month').format("YYYY-MM-DD")
3421 3421
        var params = {
3422 3422
         start_time:start_time,
3423
-        end_time:end_time,
3423
+        end_time:this.$route.query && this.$route.query.xtdate,
3424 3424
         patient_id:this.$route.query && this.$route.query.patient_id,
3425 3425
        }
3426
+       console.log("param================",params)
3426 3427
       getDialysisTotalCount(params).then(response=>{
3427 3428
         if(response.data.state == 1){
3428 3429
           var order =  response.data.data.order

+ 40 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue View File

@@ -2150,7 +2150,7 @@
2150 2150
                     style="padding: 2px 0; line-height: 23px; display: flex"
2151 2151
                   >
2152 2152
                     <div >
2153
-                      <div class="inline_block" style="flex: 1">
2153
+                      <div class="inline_block" style="flex: 1" v-if="dialysisOrder.puncture_nurse>0">
2154 2154
                         穿刺护士:
2155 2155
                         <div
2156 2156
                           class="under_line"
@@ -2189,6 +2189,45 @@
2189 2189
                           />
2190 2190
                         </div>
2191 2191
                       </div>
2192
+                      <div class="inline_block" style="flex: 1" v-if="dialysisOrder.change_nurse>0">
2193
+                        换药护士:
2194
+                        <div
2195
+                          class="under_line"
2196
+                          style="width: 90px; text-align: center"
2197
+                        >
2198
+                          <span
2199
+                            style="height: 30px; display: inline-block"
2200
+                            v-if="
2201
+                              setAdminUserES(
2202
+                                dialysisOrder == null
2203
+                                  ? 0
2204
+                                  : dialysisOrder.change_nurse
2205
+                              ) == ''
2206
+                            "
2207
+                          >
2208
+                            {{
2209
+                              getAdminUser(
2210
+                                dialysisOrder == null
2211
+                                  ? 0
2212
+                                  : dialysisOrder.change_nurse
2213
+                              )
2214
+                            }}</span
2215
+                          >
2216
+                          <img
2217
+                            :style="{'height':org_id==10597 ? '25px':'35px'}"
2218
+                            :src="
2219
+                              setAdminUserES(
2220
+                                dialysisOrder == null
2221
+                                  ? 0
2222
+                                  : dialysisOrder.change_nurse
2223
+                              )
2224
+                            "
2225
+                            alt=""
2226
+                            srcset=""
2227
+                            v-else
2228
+                          />
2229
+                        </div>
2230
+                      </div>
2192 2231
                     </div>
2193 2232
 
2194 2233
                     <div>

+ 31 - 15
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue View File

@@ -1805,7 +1805,7 @@
1805 1805
                         <td width="50">脉搏<br />(次/分)</td>
1806 1806
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
1807 1807
                         <td width="50">血流量<br />(ml/min)</td>
1808
-                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510">
1808
+                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510 || org_id == 10735">
1809 1809
                           动脉压<br />({{
1810 1810
                             monitors[0] &&
1811 1811
                             monitors[0]["venous_pressure_type"] == 2
@@ -1834,8 +1834,8 @@
1834 1834
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
1835 1835
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
1836 1836
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
1837
-                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
1838
-                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724 "> 电导度<br />(ms/cm)</span>
1837
+                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644 && org_id!=10735">
1838
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724"> 电导度<br />(ms/cm)</span>
1839 1839
                           <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567 || org_id==10724"> 钠浓度<br />(mmol/L)</span>
1840 1840
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
1841 1841
                         </td>
@@ -1880,7 +1880,7 @@
1880 1880
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
1881 1881
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
1882 1882
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
1883
-                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510">
1883
+                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510 || org_id ==10735">
1884 1884
                           {{
1885 1885
                             monitor.arterial_pressure
1886 1886
                               ? monitor.arterial_pressure
@@ -1960,7 +1960,7 @@
1960 1960
                         </td>
1961 1961
 
1962 1962
 
1963
-                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
1963
+                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644 && org_id!=10735">
1964 1964
                           <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567 && org_id!=10724"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
1965 1965
                           <span v-if="org_id==10469 || org_id == 10567 || org_id == 0 || org_id == 10724"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
1966 1966
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
@@ -2873,7 +2873,7 @@
2873 2873
                             : "/"
2874 2874
                            }}
2875 2875
                          </span> -->
2876
-                         <span>
2876
+                         <span v-if="predialysis&&predialysis.weight_before>0&&afterdialysis&&afterdialysis.weight_after>0">
2877 2877
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
2878 2878
                          </span>
2879 2879
 
@@ -4819,13 +4819,7 @@ export default {
4819 4819
          window.open(fileURL);//打开ppf文件
4820 4820
        }
4821 4821
      },
4822
-     compare (property) {
4823
-       return function (a, b) {
4824
-           var value1 = a[property]
4825
-           var value2 = b[property]
4826
-           return value1 - value2
4827
-       }
4828
-     },
4822
+   
4829 4823
 
4830 4824
      openPdf(blob) {
4831 4825
        const objectUrl = URL.createObjectURL(blob);
@@ -5624,7 +5618,14 @@ export default {
5624 5618
               newHisArr[i].advice_name_str = ""
5625 5619
               newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
5626 5620
             }
5627
-            console.log("newHisArr===================================",newHisArr)
5621
+            // console.log("newHisArr===================================",newHisArr)
5622
+
5623
+
5624
+            // newHisArr.sort(this.compareOne('id'))
5625
+            // newHisArr.map((item, index) => {
5626
+            //   console.log("item=----------------",item)
5627
+            //   // item.sort(this.compare('execution_time'))
5628
+            // })
5628 5629
 
5629 5630
             var ordHisArr = this.getQuChong(newHisArr)
5630 5631
 
@@ -5738,7 +5739,7 @@ export default {
5738 5739
         console.log("this.totollength",this.totollength)
5739 5740
 
5740 5741
 
5741
-        if (this.totollength > 18) {
5742
+        if (this.totollength > 20) {
5742 5743
           var temp_advice_length = this.doctor_advices.length
5743 5744
           var doctor_advices_1 = [];
5744 5745
           var doctor_advices_2 = [];
@@ -5763,6 +5764,21 @@ export default {
5763 5764
       }
5764 5765
       // })
5765 5766
     },
5767
+    compare (property) {
5768
+      return function (a, b) {
5769
+          var value1 = a[property]
5770
+          var value2 = b[property]
5771
+          return value1 - value2
5772
+      }
5773
+     },
5774
+
5775
+     compareOne (property) {
5776
+      return function (a, b) {
5777
+          var value1 = a[property]
5778
+          var value2 = b[property]
5779
+          return value1 - value2
5780
+      }
5781
+     },
5766 5782
      getQuChong(tempArr) {
5767 5783
       let result = [];
5768 5784
         let obj = {};

+ 12 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue View File

@@ -217,7 +217,10 @@
217 217
               <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
218 218
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
219 219
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
220
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
220
+              <span v-if="prescription.anticoagulant == '普通肝素'">
221
+                <span v-if="org_id == 10028">iu</span>
222
+                <span v-if="org_id != 10028">mg</span>
223
+              </span>
221 224
               <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
222 225
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
223 226
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
@@ -230,7 +233,10 @@
230 233
               <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
231 234
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
232 235
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
233
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
236
+              <span v-if="prescription.anticoagulant == '普通肝素'">
237
+                <span v-if="org_id == 10028">iu/h</span>
238
+                <span v-if="org_id != 10028">mg/h</span>
239
+              </span>
234 240
               <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
235 241
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
236 242
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>&nbsp;
@@ -243,7 +249,10 @@
243 249
               <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
244 250
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
245 251
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
246
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
252
+              <span v-if="prescription.anticoagulant == '普通肝素'">
253
+                <span v-if="org_id == 10028">iu</span>
254
+                <span v-if="org_id != 10028">mg</span>
255
+              </span>
247 256
               <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
248 257
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
249 258
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>

+ 7 - 5
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -138,12 +138,12 @@
138 138
                        type="primary">查询备案信息
139 139
             </el-button>
140 140
 
141
-            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
141
+            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10028 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10610 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)  || (org_id == 9504 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
142 142
                         @click="openZF(1)"
143 143
                         type="primary">自费门诊就医上传(4205)
144 144
             </el-button>
145 145
 
146
-            <el-button  size="small" v-if="(org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) "
146
+            <el-button  size="small" v-if="(org_id == 10138   && this.order.order_status == 2) || (org_id == 10278  && this.order.order_status == 2) || (org_id == 10028 && this.order.order_status == 2) || (org_id == 10610 && this.order.order_status == 2)  || (org_id == 9504 && this.order.order_status == 2)"
147 147
                         @click="openZF(2)"
148 148
                         type="primary">自费上传确认(4203)
149 149
             </el-button>
@@ -1199,6 +1199,7 @@ export default {
1199 1199
         { value: '1111', label: '精一' },
1200 1200
         { value: '1112', label: '精二' },
1201 1201
         { value: '1112', label: '精二' },
1202
+        { value: '999999', label: '自费' },
1202 1203
         { value: '118801', label: '118801' },
1203 1204
 
1204 1205
 
@@ -1249,7 +1250,8 @@ export default {
1249 1250
         { value: '1402', label: '门诊特殊病(1402)' },
1250 1251
         { value: '1401', label: '门诊慢性病(1401)' },
1251 1252
         { value: '2302', label: '异地就医(2302)' },
1252
-        { value: '0', label: '自费' },
1253
+        // { value: '0', label: '自费' },
1254
+        { value: '999999', label: '自费' },
1253 1255
         { value: '118801', label: '118801' },
1254 1256
 
1255 1257
 
@@ -2022,7 +2024,7 @@ export default {
2022 2024
           }
2023 2025
         })
2024 2026
       } else {
2025
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
2027
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610) {
2026 2028
           axios.get('http://127.0.0.1:9532/api/register/get', {
2027 2029
             params: forms,
2028 2030
             headers: {
@@ -3652,7 +3654,7 @@ export default {
3652 3654
           })
3653 3655
         }
3654 3656
       } else if (index == 6) {
3655
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
3657
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610) {
3656 3658
           this.$refs.register9504.show()
3657 3659
         } else {
3658 3660
           if(this.$store.getters.xt_user.org_id == 10721 || this.org_id == 0){

+ 2 - 1
src/xt_pages/outpatientCharges/statementTemplate/printFour.vue View File

@@ -134,7 +134,8 @@
134 134
               </div>
135 135
               <div class="actionBar">
136 136
                   <div>收费员:{{info.charge_admin.user_name}}</div>
137
-                  <div>日期:{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
137
+<!--                  <div>日期:{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>-->
138
+                 <div>日期:{{getTime(info.new_order.settle_accounts_date,"{y}-{m}-{d}")?getTime(info.new_order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
138 139
               </div>
139 140
           </div>
140 141
 

+ 5 - 3
src/xt_pages/outpatientCharges/summary.vue View File

@@ -206,7 +206,7 @@
206 206
         </el-table-column>
207 207
         <el-table-column align="center" width="80" prop="name" label="实收金额">
208 208
           <template slot-scope="scope">{{
209
-              scope.row.medfee_sumamt.toFixed(2)
209
+              scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
210 210
             }}
211 211
           </template>
212 212
         </el-table-column>
@@ -3524,7 +3524,9 @@ export default {
3524 3524
               参保号: order.his_patient.id_card_no,
3525 3525
               属地名称: insuplc_admdvs_name,
3526 3526
               应收金额: order.medfee_sumamt,
3527
-              实收金额: order.medfee_sumamt,
3527
+              // scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
3528
+
3529
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
3528 3530
               医保统筹金额: order.hifp_pay,
3529 3531
               大额基金金额: order.hifob_pay,
3530 3532
               大病基金金额: order.hifmi_pay,
@@ -3557,7 +3559,7 @@ export default {
3557 3559
               参保所属医保区划: order.his_patient.insuplc_admdvs,
3558 3560
               参保号: order.his_patient.id_card_no,
3559 3561
               应收金额: order.medfee_sumamt,
3560
-              实收金额: order.medfee_sumamt,
3562
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
3561 3563
               医保统筹金额: order.hifp_pay,
3562 3564
               大额基金金额: order.hifob_pay,
3563 3565
               大病基金金额: order.hifmi_pay,

+ 6 - 5
src/xt_pages/user/components/PatientSidebar.vue View File

@@ -179,10 +179,10 @@ export default {
179 179
             //   name: '3-3',
180 180
             //   label: '体格检查新'
181 181
             // },
182
-            //  {
183
-            //   name: '3-5',
184
-            //   label: '病程记录新'
185
-            //  },
182
+             {
183
+              name: '3-5',
184
+              label: '病程记录新'
185
+             },
186 186
             {
187 187
               name: '1-11',
188 188
               label: '首次病程记录'
@@ -190,7 +190,8 @@ export default {
190 190
             {
191 191
               name: '1-2',
192 192
               label: '病程记录'
193
-            }, {
193
+            }, 
194
+            {
194 195
               name: '1-5',
195 196
               label: '抢救记录'
196 197
             }, {

+ 464 - 136
src/xt_pages/user/courseOfDisease_new.vue View File

@@ -364,7 +364,7 @@
364 364
           <el-button type="primary" @click="toMonitorPint">应用</el-button>
365 365
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
366 366
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
367
-          <el-button type="primary" @click="toContentPint(2)">应用</el-button>
367
+          <!-- <el-button type="primary" @click="toContentPint(2)">应用</el-button> -->
368 368
           <el-button @click="blood_dialog = false">取消</el-button>
369 369
         </span>
370 370
       </el-dialog>
@@ -424,6 +424,8 @@
424 424
                  @current-change="summaryChange"
425 425
                  @selection-change="selectionchange2"
426 426
                 style="width: 100%">
427
+                <el-table-column type="selection"width="55">
428
+                </el-table-column>
427 429
                 <el-table-column prop="date" label="透析日期"  width="" align="center">
428 430
                   <template slot-scope="scope" a>
429 431
                       {{ getTime(scope.row.schedule_date) }}
@@ -447,7 +449,6 @@
447 449
         <span slot="footer" class="dialog-footer" style="text-align: center;">
448 450
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
449 451
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
450
-          <el-button type="primary" @click="toContentPint(3)">应用</el-button>
451 452
           <el-button type="primary" @click="toSummaryPint">应用</el-button>
452 453
           <el-button @click="summary_dialog = false">取消</el-button>
453 454
         </span>
@@ -558,14 +559,14 @@
558 559
               <div class="Second_title">方案详情</div>
559 560
               <div style="">
560 561
                 <keep-alive>
561
-                  <ueditor ref="editor" id="editors" :content="option_context"></ueditor>
562
+                  <ueditor ref="editorOne" id="editors" :content="option_context"></ueditor>
562 563
                 </keep-alive>
563 564
               </div>
564 565
             </div>
565 566
           </div>
566 567
         </div>
567 568
         <span slot="footer" class="dialog-footer" style="text-align: center;">
568
-          <el-button type="primary" @click="toContentPint">应用</el-button>
569
+          <el-button type="primary" @click="toSystemContentPint">应用</el-button>
569 570
           <el-button @click="option_dialog = false">取消</el-button>
570 571
         </span>
571 572
       </el-dialog>
@@ -583,6 +584,7 @@
583 584
               医嘱类型:
584 585
               <el-select v-model="advice_type" @change="type_chang" placeholder="请选择" style="width: 120px;">
585 586
                 <el-option
587
+                
586 588
                   v-for="item in type_option"
587 589
                   :key="item.value"
588 590
                   :label="item.label"
@@ -607,46 +609,46 @@
607 609
               :data="adviceList"
608 610
               :highlight-current-row="true"
609 611
                 ref="weight_table"
610
-                @selection-change="selectionchange5"
612
+              @selection-change="selectionchange5"
611 613
               style="width: 100%">
612 614
               <el-table-column type="selection"width="55">
613 615
               </el-table-column>
614
-              <el-table-column prop="date" label="开始时间"  width="">
616
+              <el-table-column prop="date" label="开始时间"  width="" align="center">
615 617
                 <template slot-scope="scope">
616 618
                     {{ getTimeThree(scope.row.start_time) }}
617 619
                  </template>
618 620
               </el-table-column>
619
-              <el-table-column prop="name" label="医嘱名称"  width="">
621
+              <el-table-column prop="name" label="医嘱名称"  width="" align="center">
620 622
                 <template slot-scope="scope">
621
-                    {{ getTimeThree(scope.row.advice_name) }}
623
+                    {{scope.row.advice_name }}
622 624
                  </template>
623 625
               </el-table-column>
624
-              <el-table-column prop="guige" label="规格"  width="">
626
+              <el-table-column prop="guige" label="规格"  width="" align="center">
625 627
                 <template slot-scope="scope">
626
-                    {{ getTimeThree(scope.row.advice_desc) }}
628
+                    {{scope.row.advice_desc}}
627 629
                  </template>
628 630
               </el-table-column>
629
-              <el-table-column prop="danci" label="单次用量"  width="">
631
+              <el-table-column prop="danci" label="单次用量"  width="" align="center">
630 632
                 <template slot-scope="scope">
631 633
                   <span v-if="scope.row.single_dose>0">{{ scope.row.single_dose }}</span>
632 634
                  </template>
633 635
               </el-table-column>
634
-              <el-table-column prop="geiyao" label="给药途径"  width="">
636
+              <el-table-column prop="geiyao" label="给药途径"  width="" align="center">
635 637
                 <template slot-scope="scope">
636 638
                     {{scope.row.delivery_way}}
637 639
                  </template>
638 640
               </el-table-column>
639
-              <el-table-column prop="pinlv" label="执行频率"  width="">
641
+              <el-table-column prop="pinlv" label="执行频率"  width="" align="center">
640 642
                 <template slot-scope="scope">
641 643
                     {{scope.row.execution_frequency }}
642 644
                  </template>
643 645
               </el-table-column>
644
-              <el-table-column prop="beizhu" label="备注"  width="">
646
+              <el-table-column prop="beizhu" label="备注"  width="" align="center">
645 647
                 <template slot-scope="scope">
646 648
                     {{scope.row.remark}}
647 649
                  </template>
648 650
               </el-table-column>
649
-              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="">
651
+              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="" align="center">
650 652
                 <template slot-scope="scope">
651 653
                   <span v-if="scope.row.advice_type == 1">
652 654
                     {{ getTimeThree(scope.row.stop_time) }}
@@ -657,7 +659,7 @@
657 659
 
658 660
                  </template>
659 661
               </el-table-column>
660
-              <el-table-column prop="yuanyin" label="停止原因"  width="">
662
+              <el-table-column prop="yuanyin" label="停止原因"  width="" align="center">
661 663
                 <template slot-scope="scope">
662 664
                    <span v-if="scope.row.advice_type == 1">
663 665
                     {{scope.row.remark }}
@@ -665,7 +667,7 @@
665 667
 
666 668
                  </template>
667 669
               </el-table-column>
668
-              <el-table-column prop="yisheng" label="停止医生"  width="">
670
+              <el-table-column prop="yisheng" label="停止医生"  width="" align="center">
669 671
                 <template slot-scope="scope">
670 672
                   <span v-if="scope.row.advice_type == 1">
671 673
                     {{ getDocName(scope.row.advice_doctor) }}
@@ -676,10 +678,8 @@
676 678
             </el-table>
677 679
           </div>
678 680
         </div>
679
-        <span slot="footer" class="dialog-footer" style="text-align: center;">
680
-          <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
681
-          <el-button type="primary" @click="template_save">保存模板</el-button> -->
682
-          <el-button type="primary" @click="toContentPint">应用</el-button>
681
+        <span slot="footer" class="dialog-footer" style="text-align: center;" align="center">
682
+          <el-button type="primary" @click="toAdviceContentPint">应用</el-button>
683 683
           <el-button @click="advice_dialog = false">取消</el-button>
684 684
         </span>
685 685
       </el-dialog>
@@ -724,7 +724,7 @@
724 724
               </el-date-picker>
725 725
             </div>
726 726
             <div style="text-align: right;margin-bottom: 10px;">
727
-              <el-button type="primary" size="small">
727
+              <el-button type="primary" size="small" @click="toInspection">
728 728
                 查询
729 729
               </el-button>
730 730
             </div>
@@ -736,14 +736,14 @@
736 736
                   <div class="Second_title">检验项目</div>
737 737
                 </div>
738 738
                 <div style="flex: 1;text-align: right;">
739
-                  全选<el-checkbox v-model="checked"></el-checkbox>
739
+                  全选<el-checkbox v-model="checked" @change="changeInspetion"></el-checkbox>
740 740
                 </div>
741 741
               </div>
742 742
               <div>
743
-                <el-collapse v-model="activeNames" @change="handleChange" v-for="(item,index) in Inspectlist" :key="item.id">
744
-                  <el-collapse-item :title="item.name" :name="item.id">
743
+                <el-collapse v-model="activeNames" @change="handleChange" v-for="(item,index) in newInspectionList" :key="item.id">
744
+                  <el-collapse-item :title="item.project_name" :name="item.project_id">
745 745
                     <ul>
746
-                      <li v-for="i in item.child" class="inspect" @click="childclick(i.date)">{{ i.date }}</li>
746
+                      <li v-for="i in item.child" class="inspect" @click="childclick(i)">{{getTime(i.inspect_date)}}</li>
747 747
                     </ul>
748 748
                   </el-collapse-item>
749 749
                 </el-collapse>
@@ -752,7 +752,7 @@
752 752
             <div style="width: 72%;margin-left: 10px;">
753 753
               <div class="Second_title">内容</div>
754 754
               <div class="blood_text" style="" >
755
-                <div v-html="weight_context"></div>
755
+                <div v-html="inspect_context"></div>
756 756
                 <!-- {{ blood_context }} -->
757 757
               </div>
758 758
             </div>
@@ -761,7 +761,7 @@
761 761
         <span slot="footer" class="dialog-footer" style="text-align: center;">
762 762
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
763 763
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
764
-          <el-button type="primary" @click="toContentPint">应用</el-button>
764
+          <el-button type="primary" @click="toInpectionContentPint">应用</el-button>
765 765
           <el-button @click="Inspect_dialog = false">取消</el-button>
766 766
         </span>
767 767
       </el-dialog>
@@ -820,7 +820,10 @@
820 820
     getSummarySearchList,
821 821
     getPatientDryWeightList,
822 822
     getDilaysisSystemList,
823
-    getPatientAdviceList
823
+    getPatientAdviceList,
824
+    getPatientInspectionList,
825
+    getInspectionByProjectId,
826
+    
824 827
   } from '@/api/patient'
825 828
   import { fetchMoibleAllDoctorAndNurse } from "@/api/doctor";
826 829
   import { parseTime } from '@/utils'
@@ -965,7 +968,15 @@
965 968
         monitor_blood_context:"",
966 969
         summaryList:[],
967 970
         dryWeightList:[],
968
-        adviceList:[]
971
+        adviceList:[],
972
+        newInspectionList:[],
973
+        newInspectionListOne:[],
974
+        inspect_context:"",
975
+        inspectionList:[],
976
+        newIds:[],
977
+        adviceNewList:[],
978
+        all_select:0,
979
+        systemPrescritpionList:[]
969 980
       }
970 981
     },
971 982
     created() {
@@ -1263,15 +1274,14 @@
1263 1274
 
1264 1275
         }
1265 1276
       },
1266
-      toContentPint(val){
1267
-
1268
-
1277
+      toAdviceContentPint(val){
1278
+       
1269 1279
         console.log('blood_context',this.blood_context,this.template_content);
1270
-        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context
1280
+        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context+'<br/>'+this.option_context
1271 1281
         this.$refs.editor.contents = this.template_content
1272 1282
         const iframe = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('body')[0]
1273 1283
         console.log('document.getElementsByClassName',);
1274
-        if(val == 6){
1284
+       
1275 1285
             this.$nextTick(()=>{
1276 1286
                 const new_list=document.createElement('table')
1277 1287
                 new_list.style.cssText='border:1px solid black;border-collapse:collapse;width:100%';
@@ -1307,52 +1317,99 @@
1307 1317
                 newListItem1.appendChild(new_td9);
1308 1318
                 newListItem1.appendChild(new_td10);
1309 1319
                 new_list.appendChild(newListItem1)
1310
-              for(let i in this.adviceRows){
1311
-                let newListItem2 = document.createElement('tr');
1312
-                let new_td1 = document.createElement('td');
1313
-                let new_td2 = document.createElement('td');
1314
-                let new_td3 = document.createElement('td');
1315
-                let new_td4 = document.createElement('td');
1316
-                let new_td5 = document.createElement('td');
1317
-                let new_td6 = document.createElement('td');
1318
-                let new_td7 = document.createElement('td');
1319
-                let new_td8 = document.createElement('td');
1320
-                let new_td9 = document.createElement('td');
1321
-                let new_td10 = document.createElement('td');
1322
-                new_td1.textContent =this.adviceRows[i].date
1323
-                new_td2.textContent =this.adviceRows[i].name
1324
-                new_td3.textContent =this.adviceRows[i].guige
1325
-                new_td4.textContent =this.adviceRows[i].danci
1326
-                new_td5.textContent =this.adviceRows[i].geiyao
1327
-                new_td6.textContent =this.adviceRows[i].pinlv
1328
-                new_td7.textContent =this.adviceRows[i].beizhu
1329
-                new_td8.textContent =this.adviceRows[i].tingzhi
1330
-                new_td9.textContent =this.adviceRows[i].yuanyin
1331
-                new_td10.textContent =this.adviceRows[i].yisheng
1332
-                newListItem2.appendChild(new_td1);
1333
-                newListItem2.appendChild(new_td2);
1334
-                newListItem2.appendChild(new_td3);
1335
-                newListItem2.appendChild(new_td4);
1336
-                newListItem2.appendChild(new_td5);
1337
-                newListItem2.appendChild(new_td6);
1338
-                newListItem2.appendChild(new_td7);
1339
-                newListItem2.appendChild(new_td8);
1340
-                newListItem2.appendChild(new_td9);
1341
-                newListItem2.appendChild(new_td10);
1342
-                new_list.appendChild(newListItem2)
1343
-              }
1320
+
1321
+               if(this.adviceList!=null && this.adviceList.length>0 && this.all_select == 0){
1322
+                for(let i in this.adviceList){
1323
+                    let newListItem2 = document.createElement('tr');
1324
+                    let new_td1 = document.createElement('td');
1325
+                    let new_td2 = document.createElement('td');
1326
+                    let new_td3 = document.createElement('td');
1327
+                    let new_td4 = document.createElement('td');
1328
+                    let new_td5 = document.createElement('td');
1329
+                    let new_td6 = document.createElement('td');
1330
+                    let new_td7 = document.createElement('td');
1331
+                    let new_td8 = document.createElement('td');
1332
+                    let new_td9 = document.createElement('td');
1333
+                    let new_td10 = document.createElement('td');
1334
+                    new_td1.textContent =this.getTimeThree(this.adviceList[i].start_time) 
1335
+                    new_td2.textContent =this.adviceList[i].advice_name
1336
+                    new_td3.textContent =this.adviceList[i].advice_desc
1337
+                    new_td4.textContent =this.adviceList[i].single_dose
1338
+                    new_td5.textContent =this.adviceList[i].delivery_way
1339
+                    new_td6.textContent =this.adviceList[i].execution_frequency
1340
+                    new_td7.textContent =this.adviceList[i].remark
1341
+                    if(this.adviceList[i].advice_type == 1){
1342
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].stop_time) 
1343
+                    }else{
1344
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].execution_time) 
1345
+                    }
1346
+                    new_td9.textContent =this.adviceList[i].stop_reason
1347
+                    new_td10.textContent =this.getDocName(this.adviceList[i].advice_doctor) 
1348
+                    newListItem2.appendChild(new_td1);
1349
+                    newListItem2.appendChild(new_td2);
1350
+                    newListItem2.appendChild(new_td3);
1351
+                    newListItem2.appendChild(new_td4);
1352
+                    newListItem2.appendChild(new_td5);
1353
+                    newListItem2.appendChild(new_td6);
1354
+                    newListItem2.appendChild(new_td7);
1355
+                    newListItem2.appendChild(new_td8);
1356
+                    newListItem2.appendChild(new_td9);
1357
+                    newListItem2.appendChild(new_td10);
1358
+                    new_list.appendChild(newListItem2)
1359
+                 }
1360
+               } 
1361
+
1362
+               if(this.adviceNewList!=null && this.adviceNewList.length>0 && this.all_select == 1){
1363
+                for(let i in this.adviceNewList){
1364
+                    let newListItem2 = document.createElement('tr');
1365
+                    let new_td1 = document.createElement('td');
1366
+                    let new_td2 = document.createElement('td');
1367
+                    let new_td3 = document.createElement('td');
1368
+                    let new_td4 = document.createElement('td');
1369
+                    let new_td5 = document.createElement('td');
1370
+                    let new_td6 = document.createElement('td');
1371
+                    let new_td7 = document.createElement('td');
1372
+                    let new_td8 = document.createElement('td');
1373
+                    let new_td9 = document.createElement('td');
1374
+                    let new_td10 = document.createElement('td');
1375
+                    new_td1.textContent =this.getTimeThree(this.adviceNewList[i].start_time) 
1376
+                    new_td2.textContent =this.adviceNewList[i].advice_name
1377
+                    new_td3.textContent =this.adviceNewList[i].advice_desc
1378
+                    new_td4.textContent =this.adviceNewList[i].single_dose
1379
+                    new_td5.textContent =this.adviceNewList[i].delivery_way
1380
+                    new_td6.textContent =this.adviceNewList[i].execution_frequency
1381
+                    new_td7.textContent =this.adviceNewList[i].remark
1382
+                    if(this.adviceNewList[i].advice_type == 1){
1383
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].stop_time) 
1384
+                    }else{
1385
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].execution_time) 
1386
+                    }
1387
+                    new_td9.textContent =this.adviceNewList[i].stop_reason
1388
+                    new_td10.textContent =this.getDocName(this.adviceNewList[i].advice_doctor) 
1389
+                    newListItem2.appendChild(new_td1);
1390
+                    newListItem2.appendChild(new_td2);
1391
+                    newListItem2.appendChild(new_td3);
1392
+                    newListItem2.appendChild(new_td4);
1393
+                    newListItem2.appendChild(new_td5);
1394
+                    newListItem2.appendChild(new_td6);
1395
+                    newListItem2.appendChild(new_td7);
1396
+                    newListItem2.appendChild(new_td8);
1397
+                    newListItem2.appendChild(new_td9);
1398
+                    newListItem2.appendChild(new_td10);
1399
+                    new_list.appendChild(newListItem2)
1400
+                 }
1401
+               }
1402
+            
1344 1403
               const cont = iframe.getElementsByClassName('advice_table')[0]
1345 1404
               cont.appendChild(new_list)
1346
-              // iframe.appendChild(new_list)
1347 1405
               console.log('iframe.appendChild(new_list)',cont);
1348 1406
               console.log('this.advice_context',this.advice_context);
1349 1407
             })
1350 1408
 
1351
-        }
1352
-        this.library_dialog = false
1409
+        
1410
+        this.advice_dialog = false
1353 1411
       },
1354 1412
       getCurrentChangeOne(val){
1355
-        console.log("val================",val)
1356 1413
         this.$refs.editor.contents = val.content
1357 1414
         this.record_date = this.getTime(val.record_time)
1358 1415
         this.admin_user_id = val.recorder
@@ -1360,6 +1417,7 @@
1360 1417
            this.admin_user_id = ""
1361 1418
         }
1362 1419
         this.id = val.id
1420
+        this.ids = val.id
1363 1421
       },
1364 1422
       getCurrentChangeTwo(val){
1365 1423
 
@@ -1384,9 +1442,7 @@
1384 1442
      rowclick(){
1385 1443
 
1386 1444
       },
1387
-      prints(){
1388
-
1389
-      },
1445
+     
1390 1446
       saveTemplate(){
1391 1447
 
1392 1448
         var params = {
@@ -1627,7 +1683,7 @@
1627 1683
 
1628 1684
       },
1629 1685
 
1630
-      getAutoPatientContent(){
1686
+      autotext_click(){
1631 1687
         if(this.start_date == ""){
1632 1688
           this.$message.error("请选择开始时间")
1633 1689
         }
@@ -2295,6 +2351,7 @@
2295 2351
 
2296 2352
           dialysisIrrigationStr =  JSON.stringify(dialysisIrrigationObj).replace(/^{|}$/g, '')
2297 2353
 
2354
+      
2298 2355
 
2299 2356
         //  医嘱
2300 2357
         if(this.longAdvice!=null && this.longAdvice.length>0){
@@ -2303,6 +2360,9 @@
2303 2360
                 if(this.longAdvice[i].advice_type == 1){
2304 2361
                   this.longAdvice[i].advice_type_name = "长期医嘱"
2305 2362
                 }
2363
+                if(this.longAdvice[i].advice_type == 2){
2364
+                  this.longAdvice[i].advice_type_name = "长期医嘱"
2365
+                }
2306 2366
                 if(this.longAdvice[i].stop_state == 1){
2307 2367
                   this.longAdvice[i].stop_state_name = "停用"
2308 2368
                 }
@@ -2312,6 +2372,103 @@
2312 2372
             }
2313 2373
         }
2314 2374
 
2375
+         
2376
+        //抗凝剂
2377
+
2378
+        var anticoagulant_str =""
2379
+        if(this.groupPrescriptionList!=null && this.groupPrescriptionList.length>0){
2380
+           
2381
+            for(let i=0;i<this.groupPrescriptionList.length;i++){
2382
+               anticoagulant_str += this.getAnticoagulantName(this.groupPrescriptionList[i].anticoagulant) +"," + "剂量:" +this.groupPrescriptionList[i].MinZongLiang +this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)+ "~" +this.groupPrescriptionList[i].MaxZongLiang + this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)
2383
+            }
2384
+        }
2385
+
2386
+
2387
+          //透前
2388
+          var befor_total =0
2389
+        var cha_weight = 0
2390
+        var pingjun_weight = 0
2391
+        if(this.berforList!=null){
2392
+          befor_total = this.berforList.length
2393
+          for(let i=0;i<this.berforList.length;i++){
2394
+             cha_weight += this.berforList[i].weight_before - this.berforList[i].WeightAfter
2395
+          }
2396
+        }
2397
+        
2398
+        pingjun_weight = (cha_weight/befor_total).toFixed(2)
2399
+       
2400
+        //透后凝血
2401
+        var cruorNewArr = []
2402
+        if(this.afterList!=null && this.afterList.length>0){
2403
+           for(let i=0;i<this.afterList.length;i++){
2404
+            cruorNewArr.push(this.afterList[i].cruor)
2405
+           }
2406
+        }
2407
+      
2408
+       let dialysisCrruorObj = {}
2409
+        let dialysisCrruorStr = ""
2410
+        if(cruorNewArr!=null && cruorNewArr.length>0){
2411
+          cruorNewArr.forEach(item => {
2412
+            dialysisCrruorObj[item] = (dialysisCrruorObj[item] + 1) || 1
2413
+            })
2414
+          }
2415
+      
2416
+
2417
+        dialysisCrruorStr =  JSON.stringify(dialysisCrruorObj).replace(/^{|}$/g, '')
2418
+       
2419
+        //监测
2420
+        var blood_flow_volume_total = 0
2421
+        var ultrafiltration_volume_total = 0
2422
+        var ultrafiltration_rate_total = 0
2423
+        var total_length = 0
2424
+        var pingjun_blood_flow_volume = 0
2425
+        var pingjun_ultrafiltration_volume_total = 0
2426
+        var pingjun_ultrafiltration_rate_total = 0
2427
+        if(this.monitorList!=null && this.monitorList.length>0){
2428
+          for(let i=0;i<this.monitorList.length;i++){
2429
+            blood_flow_volume_total+=this.monitorList[i].blood_flow_volume
2430
+            ultrafiltration_volume_total+=this.monitorList[i].ultrafiltration_volume
2431
+            ultrafiltration_rate_total += this.monitorList[i].ultrafiltration_rate
2432
+            total_length = this.monitorList.length
2433
+          }
2434
+        }
2435
+        pingjun_blood_flow_volume =  (blood_flow_volume_total/total_length).toFixed(2)
2436
+        if(pingjun_blood_flow_volume=="NaN"){
2437
+          pingjun_blood_flow_volume = ""
2438
+        }
2439
+        pingjun_ultrafiltration_volume_total = (ultrafiltration_volume_total/total_length).toFixed(2)
2440
+        if(pingjun_ultrafiltration_volume_total=="NaN"){
2441
+          pingjun_ultrafiltration_volume_total = ""
2442
+        }
2443
+        pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
2444
+        if(pingjun_ultrafiltration_rate_total == "NaN"){ 
2445
+          pingjun_ultrafiltration_rate_total = ""
2446
+        }
2447
+        var dry_weight_str = ""
2448
+        //干体重
2449
+        if(this.dryweightList!=null && this.dryweightList.length>0){
2450
+           for(let i=0;i<this.dryweightList.length;i++){
2451
+            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime)+" " +this.dryweightList[i].adjusted_value.slice(4,6)+ this.dryweightList[i].adjusted_value.slice(0,3)+"kg" + "调整到" +" "+ this.dryweightList[i].dry_weight+"kg"+","
2452
+           }
2453
+        } 
2454
+
2455
+        //血管通路
2456
+        var vascularAccess_str = ""
2457
+        var created_time = ""
2458
+      
2459
+        if(this.patientVascularAccess!=undefined){
2460
+          vascularAccess_str  = this.patientVascularAccess.blood_access_part_id + this.patientVascularAccess.blood_access_part_opera_id
2461
+          created_time  = this.getTime(this.patientVascularAccess.first_start_time)
2462
+        }
2463
+
2464
+        //并发症
2465
+        var complication = ""
2466
+        if(this.lastBefor!=undefined){
2467
+            complication = this.lastBefor.complication
2468
+        }
2469
+
2470
+
2471
+
2315 2472
         if(this.inpectionList!=null&& this.inpectionList.length>0){
2316 2473
            for(let i=0;i<this.inpectionList.length;i++){
2317 2474
             this.inpectionList[i].group_no = ""
@@ -2711,7 +2868,7 @@
2711 2868
                 newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
2712 2869
                 newListItem1.textContent = this.longAdvice[i].advice_name;
2713 2870
                 newListItem2.textContent = this.longAdvice[i].advice_type_name;
2714
-                newListItem3.textContent = this.getTime(this.longAdvice[i].start_time)
2871
+                newListItem3.textContent = this.getTime(this.longAdvice[i].created_time)
2715 2872
                 newListItem4.textContent = this.longAdvice[i].single_dose +this.longAdvice[i].single_dose_unit ;
2716 2873
                 newListItem5.textContent = this.longAdvice[i].execution_frequency;
2717 2874
                 newListItem6.textContent = this.longAdvice[i].stop_state_name;
@@ -2727,8 +2884,9 @@
2727 2884
           }
2728 2885
         })
2729 2886
          this.AuToShow = true
2730
-
2731
-
2887
+      
2888
+       }
2889
+       })
2732 2890
       },
2733 2891
       blood_chang(val){
2734 2892
         if(val == 1){
@@ -3167,7 +3325,7 @@
3167 3325
       }, onRowClick(row, event, column) {
3168 3326
         this.table_current_index = row.index
3169 3327
       },
3170
-      print(){
3328
+      prints(){
3171 3329
         if(this.ids.length == 0){
3172 3330
           this.$message.error('请选择要打印的病程')
3173 3331
           return
@@ -3277,9 +3435,11 @@
3277 3435
       },
3278 3436
       type_chang(val){
3279 3437
         this.advice_type = val
3438
+        this.getPatientAdviceList()
3280 3439
       },
3281 3440
       status_chang(val){
3282 3441
         this.advice_status = val
3442
+        this.getPatientAdviceList()
3283 3443
       },
3284 3444
       selectionchange(val){
3285 3445
         this.bloodRows = val
@@ -3287,9 +3447,21 @@
3287 3447
         console.log('血压',this.bloodRows);
3288 3448
       },
3289 3449
       selectionchange2(val){
3450
+       
3290 3451
         this.summaryRows = val
3291
-        this.getsummary(val)
3292
-        console.log('透析小结',this.summaryRows);
3452
+        this.summary_context=""
3453
+        if(val!=null){
3454
+          // if(val.summary!=null && val.summary!=undefined){
3455
+          //   this.summary_context = val.summary.dialysis_summary
3456
+          // }
3457
+          for(let i=0;i<val.length;i++){
3458
+            this.summary_context += val[i].summary.dialysis_summary+"</br>"
3459
+          }
3460
+         this.summary_context = this.summary_context
3461
+
3462
+        }
3463
+        // this.getsummary(val)
3464
+        // console.log('透析小结',this.summaryRows);
3293 3465
       },
3294 3466
       selectionchange3(val){
3295 3467
         this.weightRows = val
@@ -3297,12 +3469,15 @@
3297 3469
         console.log('透析小结',this.weightRows);
3298 3470
       },
3299 3471
       selectionchange4(val){
3472
+        
3300 3473
         this.optionRows = val
3301 3474
         this.getoption(val)
3302 3475
         console.log('透析小结',this.weightRows);
3303 3476
       },
3304 3477
       selectionchange5(val){
3478
+       
3305 3479
         this.adviceRows = val
3480
+        this.getNewPatientAdviceList(val)
3306 3481
       },
3307 3482
       gettext(val){
3308 3483
         const arr= []
@@ -3339,44 +3514,54 @@
3339 3514
         this.weight_context = `${arr.join('<br/>')}`
3340 3515
       },
3341 3516
       getoption(val){
3517
+       
3518
+        var newArr = []
3519
+        for(let i=0;i<this.systemPrescritpionList.length;i++){
3520
+          for(let j=0;j<val.length;j++){
3521
+            if(val[j].mode == this.systemPrescritpionList[i].mode_name){
3522
+              newArr.push(this.systemPrescritpionList[i])
3523
+            }
3524
+          }
3525
+         
3526
+        }
3342 3527
         const arr= []
3343
-        if(val.length>0){
3344
-          for(let i in val){
3528
+       
3529
+        if(newArr.length>0){
3530
+          for(let i=0;i<newArr.length;i++){
3345 3531
             const text = `<table border="1" style="border-collapse: collapse;width: 100%;">
3346
-      <tr><td colspan="4">HD,每周3次,启用</td></tr>
3532
+      <tr><td colspan="4">${newArr[i].mode_name},启用</td></tr>
3347 3533
       <tr>
3348
-        <td>透析时长(h):4</td>
3349
-        <td>置换方式:</td>
3350
-        <td>血流量(ml/min):250</td>
3534
+        <td>透析时长:${newArr[i].dialysis_duration_hour}时${newArr[i].dialysis_duration_minute}分</td>
3535
+        <td>置换方式:${newArr[i].displace_name}</td>
3536
+        <td>血流量(ml/min):${newArr[i].blood_flow_volume}</td>
3351 3537
         <td></td>
3352 3538
       </tr>
3353 3539
       <tr>
3354
-        <td>血透器:空心纤维血液透析器B-18BHF(B-18BHF)</td>
3355
-        <td>血滤器:</td>
3356
-        <td>灌流器:</td>
3357
-        <td>透析液流量(ml/min):500</td>
3540
+        <td>透析器:${newArr[i].dialysis_dialyszers}</td>
3541
+        <td>灌流器:${newArr[i].dialysis_irrigation}</td>
3542
+        <td>透析液流量(ml/min):${newArr[i].dialysate_flow}</td>
3358 3543
       </tr>
3359 3544
       <tr>
3360
-        <td>钾(mmol/L):2.0</td>
3361
-        <td>钠(mmol/L):138</td>
3362
-        <td>钙(mmol/L):1.5</td>
3363
-        <td>碳酸氢根(mmol/L):32</td>
3545
+        <td>钾(mmol/L):${newArr[i].kalium}</td>
3546
+        <td>钠(mmol/L):${newArr[i].sodium}</td>
3547
+        <td>钙(mmol/L):${newArr[i].calcium}</td>
3548
+        <td>碳酸氢根(mmol/L):${newArr[i].bicarbonates}</td>
3364 3549
       </tr>
3365 3550
       <tr>
3366
-        <td>抗凝剂:低分子肝素</td>
3367
-        <td>首剂(iu):4500</td>
3368
-        <td>维持(iu): 0</td>
3369
-        <td>总量(iu):4500</td>
3551
+        <td>抗凝剂:${newArr[i].anticoagulant_name}</td>
3552
+        <td>首剂(iu):${newArr[i].anticoagulant_shouji}</td>
3553
+        <td>维持(iu):${newArr[i].anticoagulant_weichi}</td>
3554
+        <td>总量(iu):${newArr[i].anticoagulant_zongliang}</td>
3370 3555
       </tr>
3371
-      <tr><td colspan="4">抗凝剂公式:自定义维持时长(H)</td></tr>
3556
+      <tr><td colspan="4"></td></tr>
3372 3557
             </table>`
3373 3558
             arr.push(text)
3374 3559
           }
3375 3560
         }
3376 3561
         const contenttext = `${arr.join('<br/>')}`
3377 3562
         this.option_context = contenttext
3378
-        console.log('option_context',this.option_context);
3379
-        this.$refs.editor.contents = this.option_context
3563
+        // console.log('option_context',this.option_context);
3564
+        this.$refs.editorOne.contents = this.option_context
3380 3565
       },
3381 3566
       // 血压搜索
3382 3567
       bloodsearch(val){
@@ -3408,7 +3593,7 @@
3408 3593
         })
3409 3594
       },
3410 3595
       option_click(val){
3411
-        console.log("valoo00000000000",val)
3596
+   
3412 3597
         this.option_dialog =true
3413 3598
         // this.start_date1 = this.timeForMat(7)
3414 3599
         // this.end_date1 = this.getTime(new Date())
@@ -3429,14 +3614,14 @@
3429 3614
           <tr><td>1</td><td>高尿酸血症</td></tr>
3430 3615
           <tr><td>2</td><td>继发性甲状旁腺功能亢进</td></tr>
3431 3616
         </table>`
3432
-        this.new_content = text
3433
-        this.$refs.editor.contents = this.new_content
3617
+        // this.$refs.editor.contents = this.new_content
3618
+        this.$refs.editor.contents = this.$refs.editor.contents +text
3434 3619
       },
3435 3620
       hospital_click(){
3436 3621
         const text = `<p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">住院日期:</span><span style="display: inline-block;flex: 1;">出院日期:</span></p>
3437 3622
     <p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">入院诊断:</span><span style="display: inline-block;flex: 1;">出院诊断:</span></p>`
3438
-        this.new_content = text
3439
-        this.$refs.editor.contents = this.new_content
3623
+       
3624
+        this.$refs.editor.contents =  this.$refs.editor.contents + text
3440 3625
       },
3441 3626
       Inspect_click(){
3442 3627
         this.Inspect_dialog = true
@@ -3449,21 +3634,47 @@
3449 3634
       handleChange(val){
3450 3635
 
3451 3636
       },
3452
-      childclick(eve){
3453
-        console.log('eve',eve);
3454
-        // const inspect_arr = []
3455
-        if(this.InspectRows.length ==0){
3456
-          this.InspectRows.push(eve)
3457
-        }else{
3458
-          let index = this.InspectRows.findIndex((obj) => obj.c_id === eve.c_id && obj.pater_id == eve.pater_id);
3459
-          if (index === -1) {
3460
-            this.InspectRows.push(eve);
3461
-          } else {
3462
-            this.InspectRows.splice(index, 1);
3637
+      childclick(i){
3638
+      
3639
+          var params = {
3640
+            patient_id:i.patient_id,
3641
+            project_id:i.project_id,
3642
+            inspect_date:i.inspect_date,
3643
+
3463 3644
           }
3464
-        }
3465
-        this.getinspect(this.InspectRows)
3466
-        console.log('检查',this.InspectRows.includes(eve));
3645
+        getInspectionByProjectId(params).then(response=>{
3646
+          if(response.data.state == 1){
3647
+            var inspection =  response.data.data.inspection
3648
+            var inspection_str = i.project_name + "-"+"检验日期:"+this.getTime(i.inspect_date)+";"
3649
+            if(inspection!=null && inspection.length>0){
3650
+              for(let i=0;i<inspection.length;i++){
3651
+                if(inspection[i].inspect_value!=""){
3652
+                  inspection_str += inspection[i].item_name+":" + inspection[i].inspect_value+","
3653
+                }
3654
+               
3655
+              }
3656
+            }
3657
+            this.inspect_context = inspection_str
3658
+            
3659
+          }
3660
+        })
3661
+        // // const inspect_arr = []
3662
+        // if(this.InspectRows.length ==0){
3663
+        //   this.InspectRows.push(eve)
3664
+        // }else{
3665
+        //   let index = this.InspectRows.findIndex((obj) => obj.c_id === eve.c_id && obj.pater_id == eve.pater_id);
3666
+        //   if (index === -1) {
3667
+        //     this.InspectRows.push(eve);
3668
+        //   } else {
3669
+        //     this.InspectRows.splice(index, 1);
3670
+        //   }
3671
+        // }
3672
+        // this.getinspect(this.InspectRows)
3673
+        // console.log('检查',this.InspectRows.includes(eve));
3674
+      },
3675
+      toInpectionContentPint(){
3676
+        this.$refs.editor.contents = this.$refs.editor.contents +this.inspect_context
3677
+        this.Inspect_dialog = false
3467 3678
       },
3468 3679
       getinspect(val){
3469 3680
         const arr = []
@@ -3478,7 +3689,7 @@
3478 3689
         }
3479 3690
       },
3480 3691
       check_change(){
3481
-        console.log('this',this.checked);
3692
+
3482 3693
         const arr = []
3483 3694
         if(this.checked==true){
3484 3695
           for(let i in this.Inspectlist){
@@ -3504,16 +3715,8 @@
3504 3715
           this.InspectRows = []
3505 3716
         }
3506 3717
         this.getinspect(this.InspectRows)
3507
-        console.log('this',this.InspectRows);
3508
-      }
3509
-
3510
-        // if(val != ''){
3511
-        //   for(let i in this.Inspectlist){
3512
-        //   }
3513
-        // }
3718
+        // console.log('this',this.InspectRows);
3514 3719
       },
3515
-
3516
-
3517 3720
     //血压
3518 3721
     getMonitorSearchList(){
3519 3722
 
@@ -3565,15 +3768,42 @@
3565 3768
           patient_id:this.patient_id,
3566 3769
         }
3567 3770
         getDilaysisSystemList(params).then(response=>{
3771
+           if(response.data.state == 1){
3772
+              this.systemPrescritpionList = []
3773
+              var systemPrescritpionList =  response.data.data.prescription
3774
+              
3775
+              if(systemPrescritpionList!=null && systemPrescritpionList.length>0){
3776
+                 for(let i=0;i<systemPrescritpionList.length;i++){
3777
+                   systemPrescritpionList[i].mode_name = ""
3778
+                   systemPrescritpionList[i].mode_name = this.getModeId(systemPrescritpionList[i].mode_id)
3779
+                   systemPrescritpionList[i].displace_name = this.getDisplaceLiqu(systemPrescritpionList[i].displace_liqui)
3780
+                   systemPrescritpionList[i].anticoagulant_name = this.getAnticoagulantName(systemPrescritpionList[i].anticoagulant)
3781
+                 }
3782
+              }
3783
+              this.systemPrescritpionList = systemPrescritpionList
3568 3784
 
3785
+           }
3569 3786
         })
3570 3787
       },
3788
+      getDisplaceLiqu(id){
3789
+        var  displace_liqui_List = this.$store.getters.displace_liqui
3790
+
3791
+        var name = ""
3792
+        for(let i=0;i<displace_liqui_List.length;i++){
3793
+          if(id == displace_liqui_List[i].id){
3794
+            name = displace_liqui_List[i].name
3795
+          }
3796
+        }
3797
+        return name
3798
+      },
3571 3799
       getPatientAdviceList(){
3800
+        var ids = this.newIds.join()  
3572 3801
         var params = {
3573 3802
           start_time:this.start_date1,
3574 3803
           end_time:this.end_date1,
3575 3804
           patient_id:this.patient_id,
3576 3805
           advice_type:this.advice_type,
3806
+          advice_status:this.advice_status,
3577 3807
         }
3578 3808
         getPatientAdviceList(params).then(response=>{
3579 3809
           if(response.data.state == 1){
@@ -3583,6 +3813,23 @@
3583 3813
           }
3584 3814
         })
3585 3815
       },
3816
+      getNewPatientAdviceList(val){
3817
+        
3818
+         var newArr= []
3819
+         for(let i=0;i<val.length;i++){
3820
+           for(let j=0;j<this.adviceList.length;j++){
3821
+             if(val[i].id == this.adviceList[j].id){
3822
+                newArr.push(this.adviceList[j])
3823
+             }
3824
+           }
3825
+         }
3826
+         
3827
+         
3828
+         this.adviceNewList = []
3829
+         this.adviceNewList = newArr
3830
+         this.all_select = 1
3831
+
3832
+      },
3586 3833
       handleMonitorChange(val){
3587 3834
 
3588 3835
          var str = ""
@@ -3603,8 +3850,88 @@
3603 3850
       toMonitorPint(){
3604 3851
         this.$refs.editor.contents = this.$refs.editor.contents+this.monitor_blood_context
3605 3852
         this.blood_dialog = false
3606
-      }
3607
-
3853
+      },
3854
+      toInspection(){
3855
+          var params = {
3856
+            start_time:this.start_date1,
3857
+            end_time:this.end_date1,
3858
+            patient_id:this.patient_id,
3859
+          }
3860
+        getPatientInspectionList(params).then(response=>{
3861
+           if(response.data.state == 1){
3862
+             
3863
+             var groupList = response.data.data.groupList
3864
+             var inspection = response.data.data.inspection
3865
+             this.inspectionList = inspection
3866
+            
3867
+             if(groupList.length!=null && groupList.length>0){
3868
+                for(let i=0;i<groupList.length;i++){
3869
+                  groupList[i].child = []
3870
+                  for(let j=0;j<inspection.length;j++){
3871
+                    if(groupList[i].project_id == inspection[j].project_id && groupList[i].inspect_date == inspection[j].inspect_date){
3872
+                      groupList[i].child.push(inspection[j])
3873
+                    }
3874
+                  }
3875
+                }
3876
+             }
3877
+        
3878
+             for(let i=0;i<groupList.length;i++){
3879
+               for(let j=0;j<groupList[i].child.length;j++){
3880
+                  groupList[i].child =this.getInspection(groupList[i].child) 
3881
+               }
3882
+             }
3883
+      
3884
+             this.newInspectionList = groupList 
3885
+          
3886
+           }
3887
+        })
3888
+      },
3889
+      getInspection(tempArr) {
3890
+          let newArr = [];
3891
+          for (let i = 0; i < tempArr.length; i++) {
3892
+              if (newArr.indexOf(tempArr[i].inspect_date) == -1) {
3893
+                  newArr.push(tempArr[i].inspect_date);
3894
+              } else {
3895
+                  tempArr.splice(i, 1);
3896
+                  i--;
3897
+              };
3898
+          };
3899
+          return tempArr;
3900
+      },
3901
+      changeInspetion(){
3902
+      
3903
+        for(let i=0;i<this.newInspectionList.length;i++){
3904
+           this.newInspectionList[i].childOne =[]
3905
+          for(let j=0;j<this.inspectionList.length;j++){
3906
+            if(this.newInspectionList[i].project_id == this.inspectionList[j].project_id &&this.newInspectionList[i].inspect_date== this.inspectionList[j].inspect_date ){
3907
+                this.newInspectionList[i].childOne.push(this.inspectionList[j])
3908
+            }
3909
+          }
3910
+        }
3911
+       
3912
+         var new_inspection_str =""
3913
+        if(this.newInspectionList!=null&& this.newInspectionList.length>0){
3914
+           for(let i=0;i<this.newInspectionList.length;i++){
3915
+            if(this.newInspectionList[i].childOne!=null && this.newInspectionList[i].childOne.length>0){
3916
+              new_inspection_str += "<br/>"+ this.newInspectionList[i].project_name +"-" +"检验日期:"+ this.getTime(this.newInspectionList[i].childOne[0].inspect_date) +" "
3917
+              for(let j=0;j<this.newInspectionList[i].childOne.length;j++){
3918
+                if(this.newInspectionList[i].childOne[j].inspect_value!=""){
3919
+                  new_inspection_str+= this.newInspectionList[i].childOne[j].item_name+":" + this.newInspectionList[i].childOne[j].inspect_value+","+" "
3920
+                }
3921
+                
3922
+              }
3923
+            }
3924
+              
3925
+           } 
3926
+        }
3927
+         this.inspect_context = new_inspection_str
3928
+      },
3929
+      toSystemContentPint(){
3930
+       
3931
+        this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
3932
+        this.option_dialog = false
3933
+      },
3934
+    
3608 3935
 
3609 3936
     },
3610 3937
     beforeMount(){
@@ -3612,7 +3939,8 @@
3612 3939
     },
3613 3940
     mounted(){
3614 3941
 
3615
-    }
3942
+    },
3943
+  
3616 3944
 
3617 3945
   }
3618 3946
 </script>

+ 34 - 3
src/xt_pages/user/rescueRecord.vue View File

@@ -124,7 +124,19 @@
124 124
       >
125 125
         <div>
126 126
           <div class="new_record_form">
127
-            <diV>
127
+            <div style="margin-bottom: 10px;">
128
+              <span class="filter_title">抢救时间:</span>
129
+              <el-date-picker
130
+                size="small"
131
+                type="date"
132
+                format="yyyy-MM-dd"
133
+                value-format="yyyy-MM-dd"
134
+                placeholder="选择开始时间"
135
+                style="width:150px"
136
+                v-model="record_date"
137
+              ></el-date-picker>
138
+            </div>
139
+            <div>
128 140
               <span class="filter_title">日常抢救:</span>
129 141
               <el-select
130 142
                 v-model="select_template"
@@ -176,6 +188,18 @@
176 188
         <div>
177 189
           <div class="new_record_form">
178 190
             <diV>
191
+              <div style="margin-bottom: 10px;">
192
+              <span class="filter_title">抢救时间:</span>
193
+              <el-date-picker
194
+                size="small"
195
+                type="date"
196
+                format="yyyy-MM-dd"
197
+                value-format="yyyy-MM-dd"
198
+                placeholder="选择开始时间"
199
+                style="width:150px"
200
+                v-model="record_date"
201
+              ></el-date-picker>
202
+            </div>
179 203
               <span class="filter_title">日常抢救:</span>
180 204
               <el-select
181 205
                 v-model="select_template"
@@ -230,6 +254,7 @@ import {
230 254
   modifyCoursePrint
231 255
 } from "@/api/patient";
232 256
 import { parseTime } from "@/utils";
257
+import { uParseTime } from '@/utils/tools'
233 258
 const moment = require('moment')
234 259
 export default {
235 260
   name: "RescueRecord",
@@ -256,6 +281,7 @@ export default {
256 281
 
257 282
       selectingRows: [],
258 283
       id:0,
284
+      record_date:""
259 285
     };
260 286
   },
261 287
   created() {
@@ -343,7 +369,7 @@ export default {
343 369
         return;
344 370
       }
345 371
       this.uploading_new_record = true;
346
-      createRescueRecord(this.patient_id, this.new_content)
372
+      createRescueRecord(this.patient_id, this.new_content,this.record_date)
347 373
         .then(rs => {
348 374
           this.uploading_new_record = false;
349 375
           var resp = rs.data;
@@ -368,6 +394,7 @@ export default {
368 394
          if(response.data.state == 1){
369 395
             var rescueRecord =  response.data.data.rescueRecord
370 396
             console.log("rescueRecord",rescueRecord)
397
+            this.record_date = this.getTime(rescueRecord.record_time)
371 398
             this.new_content = rescueRecord.content
372 399
             this.edit_show_dialog = true
373 400
          }
@@ -433,6 +460,7 @@ export default {
433 460
       var params = {
434 461
         id:this.id,
435 462
         content:this.new_content,
463
+        record_date:this.record_date,
436 464
       }
437 465
       modifyCoursePrint(params).then(response=>{
438 466
          if(response.data.state == 1){
@@ -451,7 +479,10 @@ export default {
451 479
           return
452 480
        }
453 481
        this.$router.push({ path: "/rescue/record/print?id="+this.id+"&patient_id="+this.patient_id});
454
-    }
482
+    },
483
+    getTime (time) {
484
+      return uParseTime(time, '{y}-{m}-{d}')
485
+    },
455 486
 
456 487
   }
457 488
 };