huangyw 1 year ago
parent
commit
09a632b0ad

+ 1 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

1740
                 </div>
1740
                 </div>
1741
               </div>
1741
               </div>
1742
             </div>
1742
             </div>
1743
+            
1743
             <div class="row">
1744
             <div class="row">
1744
               <div class="inline_block">
1745
               <div class="inline_block">
1745
                 入科方式:
1746
                 入科方式:

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

1377
                                     monitor_record.operate_time ==
1377
                                     monitor_record.operate_time ==
1378
                                       record.dialysis_order.start_time
1378
                                       record.dialysis_order.start_time
1379
                                   "
1379
                                   "
1380
-                                  >【开始透析】</template
1380
+                                  >【开始透析】引血100ml/min</template
1381
                                 >
1381
                                 >
1382
                                 <template
1382
                                 <template
1383
                                   v-if="
1383
                                   v-if="

+ 31 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue View File

568
                         </td>
568
                         </td>
569
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
569
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
570
                           <span v-if="advice.parent_id > 0">---></span>
570
                           <span v-if="advice.parent_id > 0">---></span>
571
-                          <span>{{ advice.advice_name }}</span>
571
+                          <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
572
+                          <span
573
+                            v-else-if="
574
+                              advice.project && advice.project.project_name
575
+                            "
576
+                            >{{ advice.project.project_name }}</span
577
+                          >
578
+
572
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
579
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
573
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
580
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
574
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
581
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
575
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
582
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
583
+                          <span v-if="advice && advice.project">{{
584
+                            advice.project.unit
585
+                          }}</span>
576
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
586
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
577
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
587
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
578
                           
588
                           
685
                         {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
695
                         {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
686
                       </div>
696
                       </div>
687
                       min
697
                       min
688
-                    </div>
698
+                    </div> 
689
                   </div>
699
                   </div>
690
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
700
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
691
                     <div class="inline_block" style="flex:1">
701
                     <div class="inline_block" style="flex:1">
1389
 
1399
 
1390
         var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
1400
         var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
1391
         this.tableAdvice = doctorAdevieInfo;
1401
         this.tableAdvice = doctorAdevieInfo;
1402
+
1403
+
1404
+        let project_arr = response.data.data.projects
1405
+        // console.log(project_arr,'ppooo')
1406
+        // if(project_arr.length > 0){
1407
+        //   this.tableAdvice.concat(project_arr)
1408
+        //  }
1409
+      let flag = this.tableAdvice.findIndex(o => {
1410
+        return !o.advice_name
1411
+      })
1412
+        console.log(flag,'flag')
1413
+        for(let i=0;i<project_arr.length;i++){
1414
+          this.tableAdvice.splice(flag, 0, project_arr[i]);
1415
+          flag++
1416
+        }
1417
+        
1418
+        console.log(this.tableAdvice,'新的心得')
1419
+
1392
         if (this.tableAdvice.length < 7) {
1420
         if (this.tableAdvice.length < 7) {
1393
           var nl = 6 - this.tableAdvice.length;
1421
           var nl = 6 - this.tableAdvice.length;
1394
           for (let index = 0; index < nl; index++) {
1422
           for (let index = 0; index < nl; index++) {
1395
             this.tableAdvice.push([]);
1423
             this.tableAdvice.push([]);
1396
           }
1424
           }
1397
         }
1425
         }
1398
-         
1426
+        // console.log(project_arr,'project_arr')
1399
         this.monitors = response.data.data.monitors
1427
         this.monitors = response.data.data.monitors
1400
         this.summary = response.data.data.summary
1428
         this.summary = response.data.data.summary
1401
         this.org_template_info = response.data.data.org_template_info
1429
         this.org_template_info = response.data.data.org_template_info

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

1493
                                 advice.prescribing_number_unit
1493
                                 advice.prescribing_number_unit
1494
                               "
1494
                               "
1495
                               >{{ advice.prescribing_number
1495
                               >{{ advice.prescribing_number
1496
-                              }}{{ advice.prescribing_number_unit }}</span
1496
+                              }}{{ advice.prescribing_number_unit }}
1497
+                              </span
1497
                             >
1498
                             >
1498
                             <span v-if="advice.single_dose"
1499
                             <span v-if="advice.single_dose"
1499
                               ><span v-if="!advice.project">单次用量</span>
1500
                               ><span v-if="!advice.project">单次用量</span>

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

25
               font-weight: 600;
25
               font-weight: 600;
26
               font-size: 22px;
26
               font-size: 22px;
27
               display: inline-block;
27
               display: inline-block;
28
-            "
28
+            " 
29
           >
29
           >
30
             血液净化治疗记录单
30
             血液净化治疗记录单
31
           </div>
31
           </div>

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

1402
                                 v-if="
1402
                                 v-if="
1403
                                   (dialysisOrder &&
1403
                                   (dialysisOrder &&
1404
                                   monitor.operate_time ==
1404
                                   monitor.operate_time ==
1405
-                                    dialysisOrder.start_time)&&(org_id!=10414)
1405
+                                    dialysisOrder.start_time)
1406
                                 "
1406
                                 "
1407
                                 >【开始透析】引血100ml/min
1407
                                 >【开始透析】引血100ml/min
1408
                                 </template>
1408
                                 </template>