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

src/router/modules/dialysis.js

@@ -68,17 +68,17 @@ export default {
       }
     },
 
-    {
-      path: '/dialysis/doctorAdviceStaticPrint',
-      component: () => import('@/xt_pages/dialysis/doctorAdviceStaticPrint'),
-      name: '透析医嘱统计打印',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: '透析医嘱统计打印',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/doctorAdviceStaticPrint',
+    //   component: () => import('@/xt_pages/dialysis/doctorAdviceStaticPrint'),
+    //   name: '透析医嘱统计打印',
+    //   hidden: true,
+    //   is_menu: false,
+    //   meta: {
+    //     title: '透析医嘱统计打印',
+    //     noCache: true
+    //   }
+    // },
 
     {
       path: '/dialysis/signPrint',
@@ -503,18 +503,18 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/dialysis/print/batch/twentySeven',
-    //   component: () =>
-    //   import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysis_batch_twentySeven',
-    //   meta: {
-    //     title: '批量打印',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/print/batch/twentySeven',
+      component: () =>
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentySeven',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyEight',
       component: () =>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1885,6 +1885,7 @@
                 </div>
               </div>
             </div>
+            
             <div class="row">
               <div class="inline_block">
                 入科方式：

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyOne.vue

@@ -1377,7 +1377,7 @@
                                     monitor_record.operate_time ==
                                       record.dialysis_order.start_time
                                   "
-                                  >【开始透析】</template
+                                  >【开始透析】引血100ml/min</template
                                 >
                                 <template
                                   v-if="

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -11,7 +11,7 @@
           @click="batchPrintAction"
           type="primary"
           >打印</el-button
-        >
+        > 
       </template>
       <template v-if="this.template_id == 2 || this.template_id == 0 || this.template_id == 33">
         <div>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -568,11 +568,21 @@
                         </td>
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                           <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
+                          <span
+                            v-else-if="
+                              advice.project && advice.project.project_name
+                            "
+                            >{{ advice.project.project_name }}</span
+                          >
+
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                          <span v-if="advice && advice.project">{{
+                            advice.project.unit
+                          }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                           
@@ -685,7 +695,7 @@
                         {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                       </div>
                       min
-                    </div>
+                    </div> 
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1">
@@ -1389,13 +1399,31 @@ export default {
 
         var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
         this.tableAdvice = doctorAdevieInfo;
+
+
+        let project_arr = response.data.data.projects
+        // console.log(project_arr,'ppooo')
+        // if(project_arr.length > 0){
+        //   this.tableAdvice.concat(project_arr)
+        //  }
+      let flag = this.tableAdvice.findIndex(o => {
+        return !o.advice_name
+      })
+        console.log(flag,'flag')
+        for(let i=0;i<project_arr.length;i++){
+          this.tableAdvice.splice(flag, 0, project_arr[i]);
+          flag++
+        }
+        
+        console.log(this.tableAdvice,'新的心得')
+
         if (this.tableAdvice.length < 7) {
           var nl = 6 - this.tableAdvice.length;
           for (let index = 0; index < nl; index++) {
             this.tableAdvice.push([]);
           }
         }
-         
+        // console.log(project_arr,'project_arr')
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1493,7 +1493,8 @@
                                 advice.prescribing_number_unit
                               "
                               >{{ advice.prescribing_number
-                              }}{{ advice.prescribing_number_unit }}</span
+                              }}{{ advice.prescribing_number_unit }}
+                              </span
                             >
                             <span v-if="advice.single_dose"
                               ><span v-if="!advice.project">单次用量</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -25,7 +25,7 @@
               font-weight: 600;
               font-size: 22px;
               display: inline-block;
-            "
+            " 
           >
             血液净化治疗记录单
           </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyOne.vue

@@ -1402,7 +1402,7 @@
                                 v-if="
                                   (dialysisOrder &&
                                   monitor.operate_time ==
-                                    dialysisOrder.start_time)&&(org_id!=10414)
+                                    dialysisOrder.start_time)
                                 "
                                 >【开始透析】引血100ml/min
                                 </template>