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

src/api/schedule.js

@@ -306,11 +306,19 @@ export function CreateScheduleTwo(id, schedule,id_two) {
 
 
 export function ChangeScheduleTen(id,schedule){
-  
-  console.log('schedule', schedule)
+
   return request({
     url: '/api/schedule/changeschedule?id=' + id+"&bed_id="+schedule.bed_id+"&mode_id="+schedule.mode_id+"&schedule_type="+schedule.schedule_type,
     method: 'Put',
     data: schedule
   })
 }
+
+export function getNumberList(id,params){
+  
+  return request({
+    url:"/api/schedule/getordernumber?id="+id,
+    method:"Get",
+    params:params
+  })
+}

src/router/modules/Dialysisanalysis.js

@@ -11,15 +11,7 @@ export default {
     icon: 'statistics'
   },
   children: [
-    {
-      path: '/Dialysisanalysis/qualitycontrol/summary',
-      component: () => import('@/xt_pages/Dialysisanalysis/summary/index'),
-      name: 'summary',
-      meta: {
-        title: '指标汇总',
-        noCache: true
-      }
-    },
+
     {
       path: '/Dialysisanalysis/qualitycontrol/thyroidGland',
       component: () => import('@/xt_pages/Dialysisanalysis/qualitycontrol/thyroidGland'),
@@ -79,6 +71,14 @@ export default {
         title: 'KTV/URR',
         noCache: true
       }
+    },{
+      path: '/Dialysisanalysis/qualitycontrol/summary',
+      component: () => import('@/xt_pages/Dialysisanalysis/summary/index'),
+      name: 'index_summary',
+      meta: {
+        title: '指标汇总',
+        noCache: true
+      }
     },{
       path: '/Dialysisanalysis/qualitycontrol/print',
       component: () => import('@/xt_pages/Dialysisanalysis/print/print'),

src/xt_pages/device/objectRegistration.vue

@@ -676,7 +676,7 @@
                    var objectDisinfect =  response.data.data.objectDisinfect
                    this.$message.success("保存成功!")
                    this.dialogFormVisible = false
-                   this.getObjectTableDisInfectList()
+                   this.getlist()
                  }
               })
             }
@@ -847,11 +847,11 @@
 
        handleSizeChange(val) {
         this.limit = val;
-        this.getObjectTableDisInfectList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val;
-        this.getObjectTableDisInfectList()
+        this.getlist()
       },
 
       saveObjectRegistration(formName){

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -900,7 +900,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0 && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -926,7 +926,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id==10440 && org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495">
+                        v-if="org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -959,7 +959,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10469">
+                      <div class="inline_block" style="flex: 1" v-if=" org_id!=10469">
                         计划超滤量：
                         <div
                           class="under_line"
@@ -976,7 +976,7 @@
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id==0 || org_id == 10469">
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10469">
                         处方脱水量：
                         <div
                           class="under_line"
@@ -1258,7 +1258,7 @@
                       </div>
                     </div>
 
-                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 ||org_id == 3877 || org_id == 10449">
+                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id == 3877 || org_id == 10449">
                       <div class="inline_block">
                         置换速度：
                         <div
@@ -1336,7 +1336,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
-                          <td width="50" v-if="org_id == 10478 || org_id == 0">动脉压<br />(mmHg)</td>
+                          <td width="50" v-if="org_id == 10478">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836">
@@ -1349,7 +1349,6 @@
                               org_id != 9538 &&
                               org_id != 10121 &&
                               org_id != 9675 &&
-                              org_id != 0 &&
                               org_id!=10490
                             "
                           >
@@ -1374,19 +1373,19 @@
                           <td
                             width="50"
                             v-if="
-                              org_id ==  10490 || org_id == 0
+                              org_id ==  10490
                             "
                           >
                           置换液的速度<br />(ml/h)
                           </td>
-                          <td width="50" v-if="org_id == 0 || org_id == 10375">置换率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
                              (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12) && org_id!=0&&org_id!=10478
+                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478
                             "
                             width="50"
                           >
@@ -1416,7 +1415,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10490 || org_id == 0
+                              org_id == 10490
                             "
                           >
                           碳酸氢钠<br />(ml)
@@ -1467,7 +1466,7 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id==0 || org_id == 10478">
+                          <td v-if="org_id == 10478">
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure
@@ -1509,7 +1508,7 @@
                               org_id != 9538 &&
                               org_id != 10121 &&
                               org_id != 9675 && 
-                              org_id!=0 && org_id!=10490
+                              org_id!=10490
                              
                             "
                           >
@@ -1546,7 +1545,7 @@
 
                           <td
                             v-if="
-                              org_id == 10490 || org_id == 0 
+                              org_id == 10490
                             "
                           >
                             {{
@@ -1563,7 +1562,7 @@
                                 : ""
                             }}
                           </td>
-                          <td width="50" v-if="org_id == 0 || org_id == 10375"><br />
+                          <td width="50" v-if="org_id == 10375"><br />
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
                           <td>
@@ -1587,8 +1586,8 @@
                             v-if="
                               (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12)
-                              && org_id!=0&&org_id!=10478
+                              record.prescription.mode_id == 12 || org_id == 0)
+                              && org_id!=10478
                             "
                             style="width: 50px"
                           >
@@ -1627,7 +1626,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id == 10490 || org_id == 0
+                              org_id == 10490
                             "
                           >
                            {{ monitor_record.dicarbonate  }}<br />
@@ -1769,7 +1768,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id ==0">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -1799,8 +1798,8 @@
                                   advice[0].advice_desc != undefined
                                 "
                               >
-                                ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} )
+                                <!-- ({{ advice[0].advice_desc
+                                }}{{ advice[0].drug_spec_unit }} ) -->
                               </span>
 
                               <span v-if="advice[0].prescribing_number"
@@ -1877,7 +1876,7 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375 || org_id == 0">
+                            <td height="35px" v-if="org_id == 10375">
                               <span
                                 v-if="
                                   setAdminUserES(
@@ -2571,7 +2570,7 @@
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 10223 || org_id == 0 || org_id ==9538"
+                      v-if="org_id == 10223 || org_id ==9538 || org_id ==0"
                     >
                       <div class="inline_block" style="flex: 1">
                         穿刺处血肿：
@@ -3293,9 +3292,9 @@ export default {
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 12
+              this.records[recordIndex].advices.length < 20
             ) {
-              delghTwo = 12 - this.records[recordIndex].advices.length;
+              delghTwo = 20 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -476,32 +476,34 @@ export default {
             modify_other_url: "/api/dialysis/treatmentsummary?mode=3",
             module: 9,
           },
-        })
-        .then((res) => {
+        }).then((res) => {
           if (res.data.state == 0) {
             this.hasPermission = false;
           } else if (res.data.state == 1) {
-            if (this.record.id != "" && this.record.creater != 0) {
-              // 有数据
-              if (this.record.creater == this.$store.getters.user.admin.id) {
-                // 创建人是自己
-                if (res.data.data.is_has_modify == false) {
-                  this.hasPermission = false;
-                  this.showTxt = "你没有修改治疗小结权限";
+            if(this.org_id!=10340){
+                if (this.record.id != "" && this.record.creater != 0) {
+                // 有数据
+                if (this.record.creater == this.$store.getters.user.admin.id) {
+                  // 创建人是自己
+                  if (res.data.data.is_has_modify == false) {
+                    this.hasPermission = false;
+                    this.showTxt = "你没有修改治疗小结权限";
+                  }
+                } else {
+                  // 创建人不是自己
+                  if (res.data.data.is_has_modify_other == false) {
+                    this.hasPermission = false;
+                    this.showTxt = "你没有修改他人治疗小结权限";
+                  }
                 }
-              } else {
-                // 创建人不是自己
-                if (res.data.data.is_has_modify_other == false) {
+              } else if (this.record.id == "" || this.record.creater == 0) {
+                if (res.data.data.is_has_create == false) {
                   this.hasPermission = false;
-                  this.showTxt = "你没有修改他人治疗小结权限";
+                  this.showTxt = "你没有新增治疗小结权限";
                 }
               }
-            } else if (this.record.id == "" || this.record.creater == 0) {
-              if (res.data.data.is_has_create == false) {
-                this.hasPermission = false;
-                this.showTxt = "你没有新增治疗小结权限";
-              }
             }
+           
           }
         });
     },
@@ -587,10 +589,10 @@ export default {
 
        if(this.org_id ==10090){
           var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
-        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
-        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
-        ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
-        +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
+        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus +
+        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
+        ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
+        +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
 
         console.log("str000000000000000000222o2o2",str)
         this.treatmentSummary.dialysis_summary = ""

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3057,13 +3057,13 @@
                       >
                         <span
                           style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                          v-if="setAdminUserES(prescription.creater) == ''"
                         >
-                          {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                          {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img
                           style="height: 40px"
-                          :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                          :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""
                           v-else
@@ -3849,7 +3849,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-    
+   
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -45,13 +45,24 @@
                   }}</td>
               </tr>
               <tr>
-                <td>病床床号：</td>
-                <td>治疗时间：</td>
-                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}</td>
+                <td>病床床号：
+                  <span>
+                  {{
+                    dialysisOrder &&
+                    dialysisOrder.DeviceNumber &&
+                    dialysisOrder.DeviceNumber.number.length > 0
+                      ? dialysisOrder.DeviceNumber.number
+                      : patientInfo.DialysisSchedule.device_number.number
+                    }}
+                  </span>
+                </td>
+                <td>治疗时间：
+                  {{afterdialysis.actual_treatment_hour }}<span v-if="afterdialysis.actual_treatment_hour>0">时</span>
+                  <span v-if="afterdialysis.actual_treatment_minute>0">{{afterdialysis.actual_treatment_minute>0}}</span> {{afterdialysis.actual_treatment_minute }}<span v-if="afterdialysis.actual_treatment_minute>0">分</span>
+                </td>
+                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
-                  {{predialysis.weight_after_last_transparency
-                      ? predialysis.weight_after_last_transparency
-                      : "未称重"}}
+                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
                 </td>
               </tr>
               <tr>
@@ -60,23 +71,34 @@
                     predialysis.weight_before ? predialysis.weight_before : "/"
                   }}kg
                 </td>
-                <td>透析总次数：</td>
-                <td colspan="2">患者评估：</td>
+                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
+                <td colspan="2">患者评估：
+                  {{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}
+                </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">血管通路：</span>
-                  <span style="width: 14%;">部位：</span>
-                  <span style="width: 14%;">通路评估：</span>
-                  <span style="width: 14%;">震颤：</span>
-                  <span style="width: 14%;">外观：</span>
+                  <span style="width: 14%;">血管通路：
+                    {{ predialysis.blood_access_part_opera_name }}
+                  </span>
+                  <span style="width: 14%;">部位：
+                    {{ predialysis.blood_access_part_id }}
+                 </span>
+                  <span style="width: 14%;">通路评估：
+                     <span v-if="predialysis.internal_fistula.indexOf('震颤-存在') >-1">震颤-存在</span>
+                     <span v-if="predialysis.internal_fistula.indexOf('震颤-减弱') >-1">震颤-减弱</span>
+                     <span v-if="predialysis.internal_fistula.indexOf('震颤-无') >-1">震颤-无</span>
+
+                  </span>
+                  <!-- <span style="width: 14%;">震颤：</span> -->
+                  <!-- <span style="width: 14%;">外观：</span> -->
                   <span style="width: 14%;">置换方式：
                     {{
                       getDisplaceLiquiPart(prescription.displace_liqui_part)
                     }}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
                   </span>
                 </td>
               </tr>
@@ -84,28 +106,31 @@
                 <td colspan="4">
                   <div>
                     透前生命体征：
-                    T <span>
+                    T： <span>
                         {{predialysis.temperature
                         ? predialysis.temperature : "/"
-                          }}
+                          }} ℃
                       </span>&nbsp;
-                    P <span>
+                    P： <span>
                         {{
                           predialysis.pulse_frequency
                             ? predialysis.pulse_frequency
                             : "/"
+
                         }}
+                         次/分
                       </span>&nbsp;
-                    R <span>
+                    R： <span>
                         {{
                           predialysis.breathing_rate
                             ? predialysis.breathing_rate
                             : "/"
                         }}
+                         次/分
                       </span>&nbsp;
-                    BP <span>
-                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} /
-                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}
+                    BP： <span>
+                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} mmHg/
+                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }} mmHg
                       </span>&nbsp;
                   </div>
                 </td>
@@ -119,33 +144,85 @@
               style="border-collapse: collapse;text-align: left;width: 100%;
             ">
               <tr>
-                <td>治疗模式：</td>
+                <td>治疗模式：
+                  <span v-if="prescription.mode_id == 1">HD</span>
+                  <span v-if="prescription.mode_id == 2">HDF</span>
+                  <span v-if="prescription.mode_id == 3">HD+HP</span>
+                  <span v-if="prescription.mode_id == 4">HP</span>
+                  <span v-if="prescription.mode_id == 5">HF</span>
+                  <span v-if="prescription.mode_id == 6">SCUF</span>
+                  <span v-if="prescription.mode_id == 7">IUF</span>
+                  <span v-if="prescription.mode_id == 8">HFHD</span>
+                  <span v-if="prescription.mode_id == 9"> HFHD+HP</span>
+                  <span v-if="prescription.mode_id == 10">PHF</span>
+                  <span v-if="prescription.mode_id == 11">HFR</span>
+                  <span v-if="prescription.mode_id == 12">HDF+HP</span>
+                  <span v-if="prescription.mode_id == 13">CRRT</span>
+                  <span v-if="prescription.mode_id == 14">腹水回输</span>
+                  <span v-if="prescription.mode_id == 15">HD前置换</span>
+                  <span v-if="prescription.mode_id == 16">HD后置换</span>
+                  <span v-if="prescription.mode_id == 17">HDF前置换</span>
+                  <span v-if="prescription.mode_id == 18">HDF后置换</span>
+                  <span v-if="prescription.mode_id == 19"> IUF+HD</span>
+                  <span v-if="prescription.mode_id == 22"> 血浆胆红素吸附+HDF</span>
+                  <span v-if="prescription.mode_id == 23"> 血浆胆红素吸附</span>
+                  <span v-if="prescription.mode_id == 24">I-HDF</span>
+                  <span v-if="prescription.mode_id == 25"> HD高通</span>
+                  <span v-if="prescription.mode_id == 29"> PE</span>
+                  <span v-if="prescription.mode_id == 30">血浆胆红素吸附+HP</span>
+                </td>
                 <td>
                   透析时长：
                   {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }} h
                   {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }} min
                 </td>
-                <td>预超：</td>
+                <td>预超：{{prescription.target_ultrafiltration }}L</td>
                 <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}</td>
               </tr>
               <tr>
-                <td colspan="4">抗凝剂：</td>
+                <td colspan="4">抗凝剂：
+                  {{prescription.anticoagulant_name?prescription.anticoagulant_name : "/"}}
+                </td>
               </tr>
               <tr>
-                <td colspan="2">透析机：</td>
-                <td colspan="2">透析器：
+                <td colspan="2">透析机：
+                  {{predialysis.machine_type ? predialysis.machine_type : ""}}
+                </td>
+                <td colspan="2">透析器/灌流器：
                   {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
+
+                  {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">透析液：</span>
+                  <span style="width: 14%;">透析液：
+                   流量： {{prescription.dialysate_flow?prescription.dialysate_flow:"" }} ml/min
+                   温度: {{ prescription.dialysate_temperature }} ℃
+                   钾：{{ prescription.kalium }} mmol/L
+                   钠：{{ prescription.sodium }} mmol/L
+                   钙:{{ prescription.calcium }} mmol/L
+                   碳酸氢盐: {{ prescription.bicarbonate }} mmol/L
+                  </span>
                 </td>
               </tr>
               <tr>
                 <td colspan="2"></td>
                 <td colspan="2">
                   处方医生：
+                  <span
+                    style="height: 30px; display: inline-block"
+                      v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                      >
+                     {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                  </span>
+                  <img
+                    style="height: 40px"
+                    :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
                 </td>
               </tr>
             </table>
@@ -175,20 +252,37 @@
                 <th width="50">超滤率<br>ml/h</th>
                 <th width="50">电导率<br>ms/cm</th>
               </tr>
-              <tr>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
+              <tr v-for="(monitor, monindex) in monitors" :key="monindex">
+                <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
+                {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
+                <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                <td>{{monitor.venous_pressure? monitor.venous_pressure: ""}}</td>
+                <td>{{monitor.dialysate_temperature? monitor.dialysate_temperature: ""}}</td>
+                <td>{{monitor.replacement_rate? monitor.replacement_rate: ""}}</td>
+                <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
+                <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
+                <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
+                <td>{{monitor.dispose? monitor.dispose: ""}}
+                  {{monitor.result? monitor.result: ""}}
+                </td>
+                <td>
+                  <span
+                    style="height: 30px; display: inline-block"
+                      v-if="setAdminUserES(monitor.creater) == ''"
+                      >
+                     {{ getAdminUser(monitor.creater) }}
+                  </span>
+                  <img
+                    style="height: 40px"
+                    :src="setAdminUserES(monitor.creater)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </td>
               </tr>
             </table>
           </div>
@@ -297,7 +391,9 @@
                       : "/"
                   }}
                 </td>
-                <td>实超：</td>
+                <td>实超：
+                  {{ afterdialysis.actual_ultrafiltration }}ml
+                </td>
                 <td>实际治疗时长：
                   {{
                     afterdialysis.actual_treatment_hour
@@ -310,25 +406,42 @@
                   }}分钟
                 </td>
                 <td>下机时间：
-                  <!-- {{ getTime(Order.end_time, "{y}-{m}-{d} {h}:{i}") ? getTime(Order.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }} -->
+                  {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ? getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }}
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
                   <div>
                     透后生命体征：
-                    T <span>36.5 ℃</span>&nbsp;
-                    P <span>36.5 ℃</span>&nbsp;
-                    R <span>36.5 ℃</span>&nbsp;
-                    BP <span>36.5 ℃</span>&nbsp;
+                    T: <span>
+                      {{ afterdialysis.temperature }}  ℃
+                    </span>&nbsp;
+                    P: <span>
+                     {{ afterdialysis.pulse_frequency }} 次/分
+                    </span>&nbsp;
+                    R: <span>
+                      {{ afterdialysis.breathing_rate }} 次/分
+                    </span>&nbsp;
+                    BP: <span>
+                      {{ afterdialysis.systolic_blood_pressure }} mmHg / {{ afterdialysis.diastolic_blood_pressure }}mmHg
+                    </span>&nbsp;
                   </div>
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">通路评估：</span>
-                  <span style="width: 14%;">震颤：</span>
-                  <span style="width: 14%;">外观：</span>
+                  <span style="width: 14%;">通路评估：
+                    {{
+                      afterdialysis.internal_fistula
+                        ? afterdialysis.internal_fistula
+                        : ""
+                     }}
+
+                     {{
+                        afterdialysis.catheter ? afterdialysis.catheter : ""
+                    }}
+                  </span>
+
                 </td>
               </tr>
             </table>
@@ -336,7 +449,9 @@
 
           <div class="infoTitle">治疗小结</div>
           <div style="height: 80px;margin: 10px 0px;text-align: left;">
-            <span>治疗小结：</span>
+            <span>治疗小结：
+            {{summary.dialysis_summary?summary.dialysis_summary:'/'}}
+            </span>
           </div>
           <div style="text-align: left;width: 100%;">
             <table>
@@ -373,18 +488,28 @@
                       srcset=""
                       v-else
                     />
-                    
+
                   </span>
                 </td>
-                <td width="10%">核对护士：</td>
+                <td width="18%">核对护士：
+
+                 <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                </td>
                 <td width="10%"></td>
-                <td width="10%">下机护士：</td>
+                <td width="15%">下机护士：
+                 <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                                      <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                </td>
                 <td width="10%"></td>
-                <td width="10%">医生：</td>
+                <td width="10%">医生：
+                 <span v-if="setAdminUserES(prescription.creater) == ''">{{getAdminUser(prescription.creater)}}</span>
+                                      <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else>
+                </td>
                 <td width="10%"></td>
               </tr>
             </table>
-          
+
           </div>
         </div>
       </div>
@@ -1407,7 +1532,7 @@ export default {
   .table tr td{
     padding: 5px;
   }
-  
+
 
 }
 </style>

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -10,7 +10,7 @@
           <span>保险</span>
           <span>其他</span>
         </div>
-        <div>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+        <div>就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
       </div>
 
       <div class="printTitle">{{orgname}}</div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div id='invoice-print' >
     <div v-for='(i,index) in pageArr.length' :key="index" >

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -206,7 +206,7 @@
                               <div>
 
                                 <el-button
-                                    v-if="(hisPatientInfo.id_card_type == 4 && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
+                                    v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
                                     size="small"
                                     @click="open(50,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"
@@ -220,6 +220,15 @@
                                     type="primary"
                                 >预结算
                                 </el-button>
+
+                                <el-button
+                                  v-if="hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
+                                  size="small"
+                                  @click="open(60,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  type="primary"
+                                >撤销就诊信息
+                                </el-button>
+
                                 <el-button
                                     v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
                                     size="small"
@@ -227,6 +236,9 @@
                                     type="primary"
                                 >撤销明细
                                 </el-button>
+
+
+
                                 <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
                                 <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
                                 <el-button v-loading="loadingtwo"
@@ -3763,6 +3775,74 @@ export default {
             .catch(function(error) {
             })
         }
+      }else if(index == 60){
+        var that = this
+        var ids = []
+        for (let i = 0; i < prescriptions.length; i++) {
+          ids.push(prescriptions[i].id)
+        }
+        var ids_str = ids.join(',')
+        this.temp_ids = ids_str
+        this.newLoading = true
+        var that = this
+        let form = {}
+        form['id'] = this.patientInfo.id
+        form['his_patient_id'] = this.hisPatientInfo.id
+        form['record_time'] = this.record_date
+        form['ids'] = this.temp_ids
+        form['begin_time'] = this.form.diagnosis_time
+        form['p_type'] = med_type
+        form['diagnosis'] = this.form.diagnosis.join(',')
+        form['sick_type'] = this.form.sick_type
+        form['admin_user_id'] = this.$store.getters.xt_user.user.id
+        form['org_id'] = this.$store.getters.xt_user.org_id
+        if (this.activeName == 'first') {
+          form['settle_accounts_type'] = 1
+        } else if (this.activeName == 'second') {
+          form['start_time'] = this.other_start_time
+          form['end_time'] = this.other_end_time
+          form['settle_accounts_type'] = 2
+        } else {
+          form['start_time'] = this.other_start_time_two
+          form['end_time'] = this.other_end_time_two
+          form['settle_accounts_type'] = 2
+        }
+        axios.get('http://127.0.0.1:9532/api/cancledia/get', {
+          params: form,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                }).catch(() => {
+                  that.changeRadioAndPatient(1)
+                  that.newLoading = false
+                })
+              } else {
+                that.changeRadioAndPatient(1)
+                that.$message({ message: '取消成功', type: 'success', duration: 5000 })
+                that.newLoading = false
+              }
+            }
+          })
+          .catch(function(error) {
+            that.newLoading = false
+          })
+
+
+
+
       }
     },
      getName(admin_user_id) {

src/xt_pages/outpatientCharges/summary.vue

@@ -1280,7 +1280,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "04",
+                month: "07",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,7 +13,9 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
+        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
+        <printTwo v-if="this.$store.getters.xt_user.org_id == 10402 || this.$store.getters.xt_user.org_id == 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
+<!--      <print-two></print-two>-->
       </div>
 
   </div>
@@ -26,9 +28,11 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./checkTemplate/printOne"
 import { getAllDoctorList,getAllHisPatientList } from "@/api/project/project"
+import printTwo from './checkTemplate/printTwo.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
+    printTwo,
     BreadCrumb,
     printOne,
   },

src/xt_pages/outpatientDoctorStation/checkTemplate/printTwo.vue

@@ -0,0 +1,656 @@
+<template>
+  <div>
+    <div id="prescription-print3" class="prescription-print">
+      <img
+        style="width: 100%; height: 80px"
+        v-if="org_id == 10138"
+        src="https://kuyi.shengws.com/bailin/bltotle.jpg"
+        alt=""
+      />
+      <img
+        style="width: 100%; height: 80px"
+        v-if="org_id == 10278 || org_id == 0"
+        src="https://kuyi.shengws.com/beierlog.png"
+        alt=""
+      />
+      <div class="printTitle">检验申请单</div>
+
+      <div style="border: 1px solid #000;margin-bottom: 10px;">
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>是否急诊：否</div>
+          <div>
+            结算方式：{{
+              faber && faber.transBody
+                ? getName(faber.transBody.outputlist1)
+                : ""
+            }}
+          </div>
+          <div>金额：{{ total }}</div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>
+            姓名：{{
+              advicePrint[0].patient.name
+                ? advicePrint[0].patient.name.indexOf("（") > -1
+                  ? advicePrint[0].patient.name.substring(
+                    0,
+                    advicePrint[0].patient.name.indexOf("（")
+                  )
+                  : advicePrint[0].patient.name
+                : ""
+            }}
+          </div>
+          <div>
+            性别：
+            <span v-if="advicePrint[0].patient.gender == 1">男</span>
+            <span v-if="advicePrint[0].patient.gender == 2">女</span>
+          </div>
+          <!--          <div>-->
+          <!--            年龄：{{-->
+          <!--              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""-->
+          <!--            }}岁-->
+          <!--          </div>-->
+          <div>年龄：{{getAge(advicePrint[0].patient)?getAge(advicePrint[0].patient):""}}岁</div>
+
+        </div>
+        <div style="margin-bottom: 20px; padding: 10px 10px 0" v-if="org_id!=10278 && org_id!=10138 && org_id!=0">
+          病史摘要：{{
+            history.history_of_present_illness
+              ? history.history_of_present_illness
+              : ""
+          }}
+        </div>
+        <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
+                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                </div> -->
+        <div style="margin-bottom: 20px; padding: 0 10px">
+          临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}
+        </div>
+        <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
+          <div>检验项目：</div>
+          <div>
+<!--            <div v-for="item in projectPrint" style="margin-bottom: 10px">-->
+<!--              {{ item.team.project_team }}-->
+<!--            </div>-->
+            <div v-for="item in singleProjectPrint" style="margin-bottom: 10px">
+              {{ item.project.project_name }}
+            </div>
+          </div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-top: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>开单医生：{{ doctor ? doctor : "" }}</div>
+          <div>
+            开单日期：
+            {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
+          </div>
+          <div>
+            医生签字：
+
+            <img
+              v-if="setAdminUserES(advicePrint[0].creator)"
+              style="height: 30px"
+              :src="setAdminUserES(advicePrint[0].creator)"
+              alt=""
+              srcset=""
+            />
+            <span
+              style="width: 100px; display: inline-block"
+              v-else-if="advicePrint[0].doctor != ''"
+            >
+              {{ advicePrint[0].doctor ? advicePrint[0].doctor : "" }}
+            </span>
+            <span v-else>
+
+            </span>
+          </div>
+        </div>
+      </div>
+      <img
+        style="width: 100%"
+        v-if="org_id == 10138 "
+        src="https://kuyi.shengws.com/bailin/blend.jpg"
+        alt=""
+      />
+      <img
+        style="width: 100%"
+        v-if="org_id == 10278 || org_id == 0"
+        src="https://kuyi.shengws.com/bailinbeier.png"
+        alt=""
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import {
+  getAllDoctorList,
+  getPrescriptionPrint,
+  getHisPatientDetail,
+  getPatientCaseHistory,
+} from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
+export default {
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String,
+  },
+  data() {
+    return {
+      doctorList_1: [],
+      doctorList: [],
+      advicePrint: {},
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      doc_name: "",
+      orgname: "",
+      diagnoses: [],
+      pageArr: [],
+      faber: {},
+      total: 0,
+      projectPrint: [],
+      time: "",
+      doctor: "",
+      org_id: "",
+      singleProjectPrint: [],
+      operatorMaps: {},
+    };
+  },
+  methods: {
+    getAge(patient){
+      // 将时间戳转换为 Date 对象
+      const birthday = new Date(patient.birthday* 1000);
+
+      // 获取当前日期
+      const now = new Date();
+      // 计算年龄差
+      const ageDiffMs = now - birthday;
+      const ageDate = new Date(ageDiffMs); // 不需要减掉 1970 年的时间戳
+      // 提取年份
+      const age = ageDate.getUTCFullYear() - 1970;
+      return age
+    },
+    getPatientCaseHistory() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getPatientCaseHistory(params).then((response) => {
+        if (response.data.state == 1) {
+          var history = response.data.data.history;
+          // console.log("中国history222222", history);
+          this.history = history;
+        }
+      });
+    },
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+        }
+      });
+    },
+
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
+      }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+        p_type: 2,
+      };
+      // console.log("params", params);
+      getPrescriptionPrint(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint;
+          // console.log("adviceprint9999", advicePrint);
+          this.advicePrint = advicePrint;
+          this.prescriptions = advicePrint;
+          // console.log("处方222222", this.prescriptions);
+          var hisPatient = response.data.data.hisPatient;
+          // console.log("hisPatient", hisPatient);
+          this.hisPatient = hisPatient;
+          let projectPrint = [];
+          let total = 0;
+          this.advicePrint.map((item) => {
+            // console.log("imte233232323232323223", item.project);
+            if (item.project.length > 0) {
+              item.project.map((it) => {
+                if (it.type == 2) {
+                  if (it.project.cost_classify == 3) {
+                    projectPrint.push(it);
+                    total += it.project.price * parseInt(it.count);
+                  }
+                }
+              });
+            }
+          });
+          this.doctorList_1 = response.data.data.eles;
+          // console.log(this.doctorList_1, "医生列表");
+          if (this.doctorList_1.length > 0) {
+            var operatorsLen = this.doctorList_1.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.doctorList_1[index].creator,
+                this.doctorList_1[index]
+              );
+            }
+          }
+          let data = [];
+          let data2 = [];
+          projectPrint.map((item) => {
+              data2.push(item);
+          });
+          this.projectPrint = data;
+          console.log("列表", this.projectPrint);
+          this.total = total.toFixed(2);
+          this.pre_time = this.advicePrint[0].pre_time;
+          this.doctor = this.advicePrint[0].doctor;
+
+          this.singleProjectPrint = data2;
+
+          var projectlist = response.data.data.projectlist;
+
+          var projectlist = response.data.data.projectlist;
+          // console.log("所有项目列表", projectlist);
+          this.projectList = projectlist;
+          this.getPage();
+          let outputlist1Name = response.data.data.his.patient_info
+            ? JSON.parse(response.data.data.his.patient_info)
+            : {};
+          this.faber = outputlist1Name;
+        }
+      });
+    },
+    // 电子签名
+    setAdminUserES(id) {
+      // console.log(id, "id");
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        // console.log(this.operatorMaps, "this.operatorMaps");
+        return this.operatorMaps[id].url;
+      } else {
+        // console.log("po");
+        return "";
+      }
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getHisPatientDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisPatient;
+          // console.log("挂号病人", hisPatient);
+          this.hisPatient = hisPatient;
+        }
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose.sort(this.compare("id"));
+          // console.log("争端", this.diagnoses);
+        }
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
+    getTotalOne(id) {
+      var total = 0;
+      var addtotal = 0;
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].project[a].price *
+                this.prescriptions[i].project[a].count;
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                this.prescriptions[i].additionalcharge[a].count;
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
+        }
+      }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].advices[a].price *
+                this.prescriptions[i].advices[a].prescribing_number;
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                this.prescriptions[i].additionalcharge[a].count;
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
+        }
+      }
+
+      return total + addtotal;
+    },
+
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
+        }
+      }
+      return project_name;
+    },
+
+    getDiagnosis(ids) {
+      let newIds = ids.split(",").sort(function (a, b) {
+        return a - b;
+      });
+
+      var name = "";
+      let nameArr = [];
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        // if(id == this.diagnoses[i].id){
+        //    name = this.diagnoses[i].class_name
+        // }
+
+        if (newIds.indexOf(this.diagnoses[i].id.toString()) > -1) {
+          // name += diagnoses[i].class_name + ' '
+          nameArr.push(this.diagnoses[i].class_name);
+        }
+      }
+      let newNameArr = [];
+      nameArr.map((item, index) => {
+        if (item == "尿毒症") {
+          newNameArr.push(item);
+          nameArr.splice(index, 1, "");
+        }
+      });
+      newNameArr.push(...nameArr);
+      return newNameArr.join(" ");
+    },
+    compare(property) {
+      return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2; //升序排序
+      };
+    },
+    getPage() {
+      this.page = 1;
+      this.pageArr = [];
+
+      this.advicePrint.map((item) => {
+        let arr = [];
+        item.pageArr = [];
+        if (item.advices.length <= 5) {
+          this.page = 1;
+          arr.push(item.advices.length);
+          item.pageArr.push(arr);
+        } else if (item.advices.length > 5) {
+          this.page = parseInt(item.advices.length / 5);
+          let num = item.advices.length % 5;
+          for (var i = 0; i < this.page; i++) {
+            item.pageArr.push([5]);
+          }
+          if (num != 0) {
+            item.pageArr.push([num]);
+          }
+        }
+      });
+      // console.log('this.pageArr',this.pageArr)
+    },
+    getName(list) {
+      console.log("list", list);
+      let new_list = [];
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].aac031 == "1") {
+          new_list.push(list[i]);
+        }
+      }
+
+      switch (new_list[0].bcc334) {
+        case "A31001":
+          return "深圳医保1档";
+          break;
+        case "A31002":
+          return "深圳医保2档";
+
+          break;
+        case "A31003":
+          return "深圳医保3档";
+
+          break;
+        case "A31004":
+          return "二档（少儿）";
+
+          break;
+        case "A31005":
+          return "学生二档";
+
+          break;
+        case "A31006":
+          return "大学生二档";
+
+          break;
+        case "A32001":
+          return "在职公务员";
+          break;
+        case "A32002":
+          return "在职驻深公务员";
+
+          break;
+        case "A39301":
+          return "家属统筹医疗";
+
+          break;
+        case "A41001":
+          return "工伤在职";
+
+          break;
+        case "A51001":
+          return "生育在职";
+
+          break;
+        case "A52001":
+          return "生育医疗一档";
+
+          break;
+        case "A52002":
+          return "生育医疗一档";
+
+          break;
+        case "C31001":
+          return "一档医疗退休";
+
+          break;
+        case "C31002":
+          return "二档医疗退休";
+          break;
+      }
+    },
+  },
+  created() {
+    this.getAllDoctorList();
+    this.getInitData();
+    this.getPrescriptionPrint();
+    this.getHisPatientDetail();
+    this.getPatientCaseHistory();
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    this.org_id = this.$store.getters.xt_user.org_id;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
+      this.getPrescriptionPrint();
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+.infoTitle {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+}
+.infoTitle div {
+  width: 200px;
+}
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+}
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
+}
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 400px;
+}
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
+}
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
+}
+.drugsBox div {
+  line-height: 20px;
+}
+.drugsOne {
+  line-height: 24px;
+}
+.drugsOne span {
+  margin-right: 20px;
+}
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
+}
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.actionBar p {
+  width: 150px;
+}
+.under_line {
+  display: inline-block;
+  border-bottom: 1px solid #000;
+  flex: 1;
+}
+</style>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -535,7 +535,7 @@ export default {
 
       tableHeight: '',
       saveloading: false,
-      
+
       fullHeight: document.documentElement.clientHeight,
       month_prescriptions: [],
       isloading: false,
@@ -668,20 +668,28 @@ export default {
           style: style,
           scanStyles: false
         })
-      }
-      else {
+      } else if(this.org_id == 10188 || this.org_id == 0){
         const style =
-            '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;} .doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .doctorBox p {margin-left: auto} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         printJS({
           printable: 'printMain',
           type: 'html',
           style: style,
           scanStyles: false
         })
-        
+      } else {
+        const style =
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+        printJS({
+          printable: 'printMain',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+
       }
       this.innerVisible = false
-      
+
       // this.$nextTick(() => {
       //   this.$refs.print.printThisPage()
       //   this.$refs.treatPrint.printThisPage()
@@ -1472,7 +1480,7 @@ export default {
         'type': this.radio,
         'sch_type': this.schedule_type
       }
-      
+
       this.un_cure_data = []
       this.cure_data = []
       this.all_data = []

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,11 +3,21 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id !=0 " v-bind:childResponse="childResponse" 
-        :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" 
-        :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" 
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188" v-bind:childResponse="childResponse"
+        :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
+        :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
-        <prinSeven v-if="org_id == 10375 ||org_id ==0" 
+
+
+        <print-ten-one
+          v-if="org_id == 10188" v-bind:childResponse="childResponse"
+          :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
+          :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
+          :prescription_id="prescription_id"
+        ></print-ten-one>
+
+
+        <prinSeven v-if="org_id == 10375"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -91,9 +101,13 @@ import {
   getAllDoctorList,
   getAllHisPatientList,
 } from "@/api/project/project";
+import PrintTen from '../outpatientCharges/invoiceTemplate/printTen.vue'
+import PrintTenOne from './template/printTenOne.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
+    PrintTenOne,
+    PrintTen,
     BreadCrumb,
     printOne,
     printThree,
@@ -144,10 +158,10 @@ export default {
             scanStyles: false,
           });
         }, 500);
-      } 
+      }
        else {
         const style =
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}";
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -17,7 +17,6 @@
           org_id != 10217 && org_id != 10188 &&org_id != 10318&&
           org_id != 9675 &&
           org_id != 9671 &&
-          org_id != 0 &&
           org_id != 10164 && org_id != 10341 && 
           org_id != 10342 && org_id != 10138 &&
           org_id != 10278
@@ -48,7 +47,7 @@
       ></printTwo>
       
       <printThree
-        v-if="org_id == 10318 || org_id == 0 "
+        v-if="org_id == 10318"
         ref="printThree"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -59,7 +58,7 @@
       <!-- || org_id == 0-->
       </printThree>
       <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="otherInfo">
             <div>药物过敏史：</div>
-            <div style="flex:1;">{{patient.past_history?patient.past_history:''}}</div>
+            <div style="flex:1;">{{history.allergic_history?history.allergic_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div>病历编号：</div>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -21,35 +21,36 @@
         >
           {{ orgname }}处方笺
         </div>
-        <!--<div class="printTitle">{{orgname}}处方笺</div>-->
-        <div class="infoTitle">
-          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-          <p>
-            性别：
-            <span v-if="item.patient.gender == 1">男</span>
-            <span v-if="item.patient.gender == 2">女</span>
-          </p>
-          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
-        </div>
-        <div class="infoMain">
-          <div style="margin-bottom: 10px">
-            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
-          </div>
-          <div style="margin-bottom: 10px">
-            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
-          </div>
-          <div style="margin-bottom: 10px">
-            医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
-          </div>
-          <div style="margin-bottom: 10px" v-if="org_id != 10188">
-            电话：{{ item.patient.phone }}
-          </div>
-          <div style="margin-bottom: 10px" v-else>
-            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+        <div >
+          <div class="infoTitle">
+            <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+            <p>
+              性别：
+              <span v-if="item.patient.gender == 1">男</span>
+              <span v-if="item.patient.gender == 2">女</span>
+            </p>
+            <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
           </div>
-          <div>地址：{{ item.patient.home_address }}</div>
-          <div style="display: flex; width: 50%">
-            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+          <div class="infoMain">
+            <div style="margin-bottom: 10px">
+              门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+            </div>
+            <div style="margin-bottom: 10px">
+              科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+            </div>
+            <div style="margin-bottom: 10px">
+              医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+            </div>
+            <div style="margin-bottom: 10px" v-if="org_id != 10188">
+              电话：{{ item.patient.phone }}
+            </div>
+            <div style="margin-bottom: 10px" v-else>
+              日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+            </div>
+            <div>地址：{{ item.patient.home_address }}</div>
+            <div style="display: flex; width: 50%">
+              临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+            </div>
           </div>
         </div>
         <div class="prescriptionBox" >
@@ -60,14 +61,14 @@
             :key="index"
             :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
           >
-          <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
+            <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
             <div class="drugsOne">
               <span style="font-weight: bold">{{ index + 1 + "." }}</span
               >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
-                v-if="it.drug.min_unit != it.drug.dose_unit"
-                >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+              v-if="it.drug.min_unit != it.drug.dose_unit"
+            >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+            >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
                 it.drug.max_unit
               }}&nbsp;×&nbsp; {{ it.prescribing_number
               }}{{ it.prescribing_number_unit }}
@@ -75,10 +76,10 @@
             <div style="margin-left: 100px">
               <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
               >&nbsp;&nbsp;<span
-                >{{ it.execution_frequency }}&nbsp;{{
-                  it.delivery_way
-                }}&nbsp;</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            >{{ it.execution_frequency }}&nbsp;{{
+                it.delivery_way
+              }}&nbsp;</span
+            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
 
@@ -113,10 +114,10 @@
             <div style="margin-left: 100px">
               <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
               >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
           </div>
-          
+
           <div
             class="drugsBox"
             v-for="(it, i) in item.additionalcharge"
@@ -130,21 +131,223 @@
           </div>
           <div style="text-align: center">(以下空白)</div>
         </div>
-        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
-          <p v-if="org_id == 10217 || org_id == 0">
+<!--        <div class="prescriptionBox" >-->
+<!--          <div class="Rp">Rp:</div>-->
+<!--          <div-->
+<!--            class="drugsBox"-->
+<!--            v-for="(it, index) in advicess" :key="index"-->
+<!--            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"-->
+<!--          >-->
+<!--            &lt;!&ndash; class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"&ndash;&gt;-->
+<!--            &lt;!&ndash; <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> &ndash;&gt;-->
+<!--            <template v-if="index==yi+1&&item.advices.length>5">-->
+<!--              <div style="margin: 20px 0px;">-->
+<!--                <div class="infoTitle">-->
+<!--                  <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>-->
+<!--                  <p>-->
+<!--                    性别：-->
+<!--                    <span v-if="item.patient.gender == 1">男</span>-->
+<!--                    <span v-if="item.patient.gender == 2">女</span>-->
+<!--                  </p>-->
+<!--                  <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>-->
+<!--                </div>-->
+<!--                <div class="infoMain">-->
+<!--                  <div style="margin-bottom: 10px">-->
+<!--                    门诊号：{{ hisPatient.number ? hisPatient.number : "" }}-->
+<!--                  </div>-->
+<!--                  <div style="margin-bottom: 10px">-->
+<!--                    科室：{{ item.info ? getDepart(item.info.departments) : "" }}-->
+<!--                  </div>-->
+<!--                  <div style="margin-bottom: 10px">-->
+<!--                    医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}-->
+<!--                  </div>-->
+<!--                  <div style="margin-bottom: 10px" v-if="org_id != 10188">-->
+<!--                    电话：{{ item.patient.phone }}-->
+<!--                  </div>-->
+<!--                  <div style="margin-bottom: 10px" v-else>-->
+<!--                    日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}-->
+<!--                  </div>-->
+<!--                  <div>地址：{{ item.patient.home_address }}</div>-->
+<!--                  <div style="display: flex; width: 50%">-->
+<!--                    临床诊断：{{ getDiagnosis(item.info.diagnosis) }}-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--            <div style="position: relative;">-->
+<!--              <div class="drugsOne" style="border-right: 1px solid black; width: 80%;">-->
+<!--                  <span style="font-weight: bold" >-->
+<!--                    {{ index + 1 + "." }}-->
+<!--                  </span>-->
+<!--                {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;-->
+<!--                <span v-if="it.drug.min_unit != it.drug.dose_unit">-->
+<!--                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/-->
+<!--                    {{it.drug.max_unit}}-->
+<!--                  </span>&nbsp;-->
+<!--                <div>-->
+<!--                  <template v-if="arr.length>0 && arr[0][0].groupno==it.groupno">-->
+<!--                    <div >-->
+<!--                      &lt;!&ndash;  v-for="(its,indexs) in arr" :key="indexs" &ndash;&gt;-->
+<!--                      <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;-->
+<!--                      <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">-->
+<!--                          {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }}&nbsp;* {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/-->
+<!--                          {{arr[0][0].drug.max_unit}}-->
+<!--                        </span>&nbsp;-->
+<!--                    </div>-->
+<!--                  </template>-->
+<!--                </div>-->
+
+<!--                <div style="margin-left: 70px">-->
+<!--                    <span >用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span-->
+<!--                    >&nbsp;&nbsp;<span-->
+<!--                >{{ it.execution_frequency }}&nbsp;{{-->
+<!--                    it.delivery_way-->
+<!--                  }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>-->
+<!--                </div>-->
+
+<!--              </div>-->
+<!--              <div style="display: inline-block;position: absolute;left:85%;top:10px;margin-left: 10px;">-->
+<!--                ×&nbsp;{{ it.prescribing_number}}{{ it.prescribing_number_unit }}-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <template v-if="index==yi&&item.advices.length>5">-->
+<!--              <div style="margin: 20px 0px;">-->
+<!--                <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">-->
+<!--                  <p v-if="org_id == 10217 || org_id == 0">-->
+<!--                    医师：-->
+<!--                    <span-->
+<!--                      style="width: 100px; display: inline-block"-->
+<!--                      v-if="item.creator == ''"-->
+<!--                    >-->
+<!--                        {{ item.doctor }}-->
+<!--                      </span>-->
+<!--                    <span-->
+<!--                      style="width: 100px; display: inline-block"-->
+<!--                      v-else-if="doc_name != ''"-->
+<!--                    >-->
+<!--                        {{ doc_name }}-->
+<!--                      </span>-->
+<!--                    <img-->
+<!--                      style="height: 50px;"-->
+<!--                      :src="setAdminUserES(item.creator,item.doctor)"-->
+<!--                      alt=""-->
+<!--                      srcset=""-->
+
+<!--                    />-->
+<!--                  </p>-->
+<!--                  <p v-else>-->
+<!--                    医师： {{ item.doctor ? item.doctor : "" }}-->
+<!--                  </p>-->
+<!--                  <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>-->
+<!--                </div>-->
+
+<!--                <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">-->
+<!--                  <p>医师：{{ item.doctor ? item.doctor : "" }}</p>-->
+<!--                </div>-->
+<!--                <div class="actionBar" v-if="org_id != 10188 && org_id != 0">-->
+
+<!--                  <p>审核：</p>-->
+<!--                  <p>配对：</p>-->
+<!--                  <p>核对：</p>-->
+<!--                  <p>发药：</p>-->
+<!--                  <p>-->
+<!--                    药费：{{-->
+<!--                      getTotalOne(item.id).toFixed(2)-->
+<!--                        ? getTotalOne(item.id).toFixed(2)-->
+<!--                        : 0-->
+<!--                    }}元-->
+<!--                  </p>-->
+<!--                  &lt;!&ndash;            <p>药费：466.2元</p>&ndash;&gt;-->
+<!--                </div>-->
+<!--                <div class="actionBar" v-else>-->
+<!--                  <p >审核、调配：</p>-->
+<!--                  <p >核对、发药：</p>-->
+<!--                  <p >-->
+<!--                    药费：{{-->
+<!--                      getTotalOne(item.id).toFixed(2)-->
+<!--                        ? getTotalOne(item.id).toFixed(2)-->
+<!--                        : 0-->
+<!--                    }}元-->
+<!--                  </p>-->
+<!--                  &lt;!&ndash;            <p>药费：551.2元</p>&ndash;&gt;-->
+<!--                  &lt;!&ndash;            <p>药费：466.2元</p>&ndash;&gt;-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </template>-->
+<!--          </div>-->
+
+<!--          <div-->
+<!--            class="drugsBox"-->
+<!--            v-for="(it, i) in item.additionalcharge"-->
+<!--            :key="i"-->
+<!--          >-->
+<!--            <div class="drugsOne">-->
+<!--              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{-->
+<!--                it.count-->
+<!--              }}次-->
+<!--            </div>-->
+<!--          </div>-->
+
+<!--          <div-->
+<!--            class="drugsBox"-->
+<!--            v-for="(it, index) in item.project"-->
+<!--            :key="index"-->
+<!--          >-->
+<!--            <div class="drugsOne">-->
+<!--                <span style="font-weight: bold">{{ index + 1 + "." }}</span-->
+<!--                >{{-->
+<!--                it.type == 2-->
+<!--                  ? getProjectName(it.project_id)-->
+<!--                    ? getProjectName(it.project_id)-->
+<!--                    : ""-->
+<!--                  : it.good_info.good_name-->
+<!--              }}&nbsp;&nbsp;{{ it.single_dose-->
+<!--              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}-->
+<!--            </div>-->
+<!--            <div style="margin-left: 100px">-->
+<!--                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span-->
+<!--                >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span-->
+<!--            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>-->
+<!--            </div>-->
+<!--          </div>-->
+
+<!--          <div-->
+<!--            class="drugsBox"-->
+<!--            v-for="(it, i) in item.additionalcharge"-->
+<!--            :key="i"-->
+<!--          >-->
+<!--            <div class="drugsOne">-->
+<!--              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{-->
+<!--                it.price.toFixed(2)-->
+<!--              }}元/{{ it.count }}次-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <div style="text-align: center">(以下空白)</div>-->
+<!--        </div>-->
+
+
+
+
+
+
+
+
+
+        <div class="doctorBox">
+          <p v-if="org_id == 10217">
             医师：
             <span
               style="width: 100px; display: inline-block"
               v-if="item.creator == ''"
             >
-              {{ item.doctor }}
-            </span>
+                {{ item.doctor }}
+              </span>
             <span
               style="width: 100px; display: inline-block"
               v-else-if="doc_name != ''"
             >
-              {{ doc_name }}
-            </span>
+                {{ doc_name }}
+              </span>
             <img
               style="height: 50px;"
               :src="setAdminUserES(item.creator,item.doctor)"
@@ -159,22 +362,7 @@
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
 
-        <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
-          <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
-        </div>
-        <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
-          <p >审核、调配：</p>
-          <p >核对、发药：</p>
-          <p style="margin-right: 43px">药师：</p>
-        </div> -->
-
-        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
-          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>配对：</p>
-                 <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
-                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
-
+        <div class="actionBar">
           <p>审核：</p>
           <p>配对：</p>
           <p>核对：</p>
@@ -186,22 +374,8 @@
                 : 0
             }}元
           </p>
-          <!--            <p>药费：466.2元</p>-->
         </div>
-        <div class="actionBar" v-else>
-          <p >审核、调配：</p>
-          <p >核对、发药：</p>
-          <p >
-            药费：{{
-              getTotalOne(item.id).toFixed(2)
-                ? getTotalOne(item.id).toFixed(2)
-                : 0
-            }}元
-          </p>
-          <!--            <p>药费：551.2元</p>-->
-          <!--            <p>药费：466.2元</p>-->
-        </div>
-        <!-- <div style="page-break-after: always"></div> -->
+
       </div>
     </div>
   </div>
@@ -227,6 +401,10 @@ export default{
       doctorList: [],
       advicePrint: {},
       yi:4,
+      arr:[],
+      arrs:{},
+      advicess:[],
+      page:sessionStorage.getItem('dayin'),
       patient: {},
       tableData: [],
       prescriptionInfo: [],
@@ -328,6 +506,21 @@ export default{
           this.prescriptions = advicePrint;
 
           this.doctorList_1 = response.data.data.eles;
+          for(let i=0;i<this.advicePrint.length;i++){
+            this.advicess=advicePrint[i].advices
+          }
+          for(let j=0;j<this.advicess.length;j++){
+            for(let x=j+1;x<this.advicess.length;x++){
+              if(this.advicess[j].groupno == this.advicess[x].groupno){
+                this.arr.push(this.advicess.splice(x,1))
+                // this.arrs=this.advicess.splice(x,1)
+              }
+            }
+          }
+          // this.merge(this.advicess)
+          // console.log('4444444',this.arrs);
+          console.log('55555555',this.arr);
+          console.log('6666666',this.advicess);
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
@@ -390,7 +583,7 @@ export default{
               total =
                 total +
                 this.prescriptions[i].project[a].price *
-                  this.prescriptions[i].project[a].count;
+                this.prescriptions[i].project[a].count;
             }
           }
 
@@ -403,7 +596,7 @@ export default{
               addtotal =
                 addtotal +
                 this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                this.prescriptions[i].additionalcharge[a].count;
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
@@ -417,7 +610,7 @@ export default{
               total =
                 total +
                 this.prescriptions[i].advices[a].price *
-                  this.prescriptions[i].advices[a].prescribing_number;
+                this.prescriptions[i].advices[a].prescribing_number;
             }
           }
 
@@ -430,7 +623,7 @@ export default{
               addtotal =
                 addtotal +
                 this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                this.prescriptions[i].additionalcharge[a].count;
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
@@ -460,6 +653,26 @@ export default{
       }
       return name;
     },
+    merge(arrA){
+      var len=arrA.lenfth
+      // for(let j=0;j<this.advicess.length;j++){
+      //   for(let x=j+1;x<this.advicess.length;x++){
+      //     if(this.advicess[j].groupno == this.advicess[x].groupno){
+      //       // this.arr.push(this.advicess.splice(x,1))
+      //       this.arrs=this.advicess.splice(x,1)
+      //     }
+      //   }
+      // }
+      for(let j=0;j<len;j++){
+        for(let x=j+1;x<len;x++){
+          if(arrA[j].groupno == arrA[x].groupno){
+            this.arr.push(arrA.splice(x,1))
+          }
+        }
+      }
+      console.log('777777777',this.arr);
+      return this.arr
+    }
   },
   created() {
     this.getAllDoctorList();
@@ -469,7 +682,20 @@ export default{
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.org_id = xtuser.org.id;
+
+    // for(let j=0;j<this.advicess.length;j++){
+    //   console.log('44444444');
+    //   for(let x=j+1;x<this.advicess.length;x++){
+    //     if(this.advicess[j].groupno == this.advicess[x].groupno){
+    //       this.arr.push(this.advicess.splice(x,1))
+    //     }
+    //   }
+    // }
+    // console.log('777777777',this.arr[0].advice_name);
+    // return this.arr
+
   },
+
   watch: {
     ids: function (val) {
       this.ids = val;
@@ -483,9 +709,9 @@ export default{
 <style lang="scss" scoped>
 .prescription-print {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-    0 0 60px rgba(0, 0, 0, 0.06) inset;
+  0 0 60px rgba(0, 0, 0, 0.06) inset;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-    0 0 40px rgba(0, 0, 0, 0.06) inset;
+  0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;
@@ -526,12 +752,14 @@ export default{
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
+  position: relative;
 }
 .drugsBox div {
   line-height: 20px;
 }
 .drugsOne {
   line-height: 24px;
+  display: inline-block;
 }
 .drugsOne span {
   margin-right: 20px;

src/xt_pages/outpatientDoctorStation/template/printTenOne.vue

@@ -0,0 +1,536 @@
+<template>
+  <div id="prescriptionPrint">
+    <div v-for="(item, index) in advicePrint" :key="index">
+      <div
+        id="prescription-print"
+        class="prescription-print"
+        style="page-break-after: always"
+      >
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
+          {{ orgname }}第一类精神处方笺
+        </div>
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
+          {{ orgname }}第二类精神处方笺
+        </div>
+        <div
+          class="printTitle"
+          v-if="
+            prescriptions[index].med_type != '1111' &&
+            prescriptions[index].med_type != '1112'
+          "
+        >
+          {{ orgname }}处方笺
+        </div>
+        <!--<div class="printTitle">{{orgname}}处方笺</div>-->
+        <div class="infoTitle">
+          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+          <p>
+            性别：
+            <span v-if="item.patient.gender == 1">男</span>
+            <span v-if="item.patient.gender == 2">女</span>
+          </p>
+          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+        </div>
+        <div class="infoMain">
+          <div style="margin-bottom: 10px">
+            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+          </div>
+          <div style="margin-bottom: 10px">
+            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+          </div>
+          <div style="margin-bottom: 10px">
+            医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+          </div>
+          <div style="margin-bottom: 10px" v-if="org_id != 10188">
+            电话：{{ item.patient.phone }}
+          </div>
+          <div style="margin-bottom: 10px" v-else>
+            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+          </div>
+          <div>地址：{{ item.patient.home_address }}</div>
+          <div style="display: flex; width: 50%">
+            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+          </div>
+        </div>
+        <div class="prescriptionBox" >
+          <div class="Rp">Rp:</div>
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.advices"
+            :key="index"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+          >
+            <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
+            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
+              v-if="it.drug.min_unit != it.drug.dose_unit"
+            >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+            >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                it.drug.max_unit
+              }}&nbsp;×&nbsp; {{ it.prescribing_number
+              }}{{ it.prescribing_number_unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span
+            >{{ it.execution_frequency }}&nbsp;{{
+                it.delivery_way
+              }}&nbsp;</span
+            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
+
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                it.count
+              }}次
+            </div>
+          </div>
+
+          <div
+            class="drugsBox"
+            v-for="(it, index) in item.project"
+            :key="index"
+          >
+            <div class="drugsOne">
+              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              >{{
+                it.type == 2
+                  ? getProjectName(it.project_id)
+                    ? getProjectName(it.project_id)
+                    : ""
+                  : it.good_info.good_name
+              }}&nbsp;&nbsp;{{ it.single_dose
+              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
+            </div>
+            <div style="margin-left: 100px">
+              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            </div>
+          </div>
+          <div
+            class="drugsBox"
+            v-for="(it, i) in item.additionalcharge"
+            :key="i"
+          >
+            <div class="drugsOne">
+              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
+                it.price.toFixed(2)
+              }}元/{{ it.count }}次
+            </div>
+          </div>
+          <div style="text-align: center">(以下空白)</div>
+        </div>
+        <div class="doctorBox" style="border-bottom: 2px solid #000;" >
+          <p>
+            医师：
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
+            >
+              {{ item.doctor }}
+            </span>
+            <span
+              style="width: 100px; display: inline-block"
+              v-else-if="doc_name != ''"
+            >
+              {{ doc_name }}
+            </span>
+            <img
+              style="height: 50px;"
+              :src="setAdminUserES(item.creator,item.doctor)"
+              alt=""
+              srcset=""
+            />
+          </p>
+
+        </div>
+        <div class="actionBar">
+          <p >审核、调配：</p>
+          <p >核对、发药：</p>
+          <p >
+            药费：{{
+              getTotalOne(item.id).toFixed(2)
+                ? getTotalOne(item.id).toFixed(2)
+                : 0
+            }}元
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import {
+  getAllDoctorList,
+  getPrescriptionPrint,
+  getHisPatientDetail,
+} from "@/api/project/project";
+import { getInitData } from "@/api/his/his";
+export default{
+  props: {
+    patient_id: Number,
+    record_date: String,
+    prescription_id: Number,
+    ids: String,
+  },
+  data() {
+    return {
+      doc_name:"",
+      doctorList: [],
+      advicePrint: {},
+      yi:4,
+      patient: {},
+      tableData: [],
+      prescriptionInfo: [],
+      hisPatient: {},
+      department: [],
+      prescriptions: [],
+      projectList: [],
+      orgname: "",
+      diagnoses: [],
+      org_id: 0,
+      operatorMaps: {},
+      operators: [],
+      doctorList_1: [],
+    };
+  },
+  methods: {
+    // 电子签名
+    setAdminUserES(id,name) {
+      console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url;
+      } else {
+        this.doc_name = name
+        return "";
+      }
+    },
+    getAge(patient) {
+      if(patient.id_card_no == "TWN001836483"){
+        return patient.age
+      }else{
+        var thisLen = patient.id_card_no.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + patient.id_card_no.substr(6, 6);
+        } else {
+          birth = patient.id_card_no.substr(6, 8);
+        }
+        var births =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+        return jsGetAge(births, "-");
+
+      }
+
+    },
+
+    getAllDoctorList() {
+      getAllDoctorList().then((response) => {
+        if (response.data.state == 1) {
+          var doctor = response.data.data.doctor;
+
+          this.doctorList = doctor;
+        }
+      });
+    },
+
+    getDoctor(id) {
+      var name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          name = this.doctorList[i].user_name;
+        }
+      }
+      return name;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
+    getPrescriptionPrint() {
+      var params = {
+        // patient_id:this.patient_id,
+        // record_date:this.record_date,
+        // prescription_id:this.prescription_id,
+        patient_id: this.patient_id,
+        record_date: this.record_date,
+        prescription_id: this.prescription_id,
+        ids: this.ids,
+        p_type: 2,
+      };
+      console.log("params", params);
+      getPrescriptionPrint(params).then((response) => {
+        if (response.data.state == 1) {
+          var advicePrint = response.data.data.advicePrint;
+          console.log("adviceprint9999", advicePrint);
+          this.advicePrint = advicePrint;
+          this.prescriptions = advicePrint;
+
+          this.doctorList_1 = response.data.data.eles;
+          console.log(this.doctorList_1, "医生列表");
+          if (this.doctorList_1.length > 0) {
+            var operatorsLen = this.doctorList_1.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.doctorList_1[index].creator,
+                this.doctorList_1[index]
+              );
+            }
+          }
+
+          console.log("处方222222", this.prescriptions);
+          var hisPatient = response.data.data.hisPatient;
+          console.log("hisPatient", hisPatient);
+          this.hisPatient = hisPatient;
+          var projectlist = response.data.data.projectlist;
+          console.log("所有项目列表", projectlist);
+          this.projectList = projectlist;
+        }
+      });
+    },
+    getHisPatientDetail() {
+      const params = {
+        patient_id: this.patient_id,
+      };
+      getHisPatientDetail(params).then((response) => {
+        if (response.data.state == 1) {
+          var hisPatient = response.data.data.hisPatient;
+          console.log("挂号病人", hisPatient);
+          this.hisPatient = hisPatient;
+        }
+      });
+    },
+    getInitData() {
+      getInitData().then((response) => {
+        if (response.data.state == 1) {
+          this.department = response.data.data.department;
+          this.diagnoses = response.data.data.diagnose;
+          console.log("争端", this.diagnoses);
+        }
+      });
+    },
+    getDepart(id) {
+      var name = "";
+      for (let i = 0; i < this.department.length; i++) {
+        if (id == this.department[i].id) {
+          name = this.department[i].name;
+        }
+      }
+      return name;
+    },
+    getTotalOne(id) {
+      var total = 0;
+      var addtotal = 0;
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].project != null) {
+            for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].project[a].price *
+                this.prescriptions[i].project[a].count;
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                this.prescriptions[i].additionalcharge[a].count;
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
+        }
+      }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if (id == this.prescriptions[i].id) {
+          if (this.prescriptions[i].advices != null) {
+            for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+              total =
+                total +
+                this.prescriptions[i].advices[a].price *
+                this.prescriptions[i].advices[a].prescribing_number;
+            }
+          }
+
+          if (this.prescriptions[i].additionalcharge != null) {
+            for (
+              let a = 0;
+              a < this.prescriptions[i].additionalcharge.length;
+              a++
+            ) {
+              addtotal =
+                addtotal +
+                this.prescriptions[i].additionalcharge[a].price *
+                this.prescriptions[i].additionalcharge[a].count;
+            }
+          }
+          addtotal = Math.floor(addtotal * 100) / 100;
+        }
+      }
+
+      return total + addtotal;
+    },
+
+    getProjectName(id) {
+      var project_name = "";
+      for (let i = 0; i < this.projectList.length; i++) {
+        if (id == this.projectList[i].id) {
+          project_name = this.projectList[i].project_name;
+        }
+      }
+      return project_name;
+    },
+
+    getDiagnosis(id) {
+      let arr = id.split(",");
+      var name = "";
+      for (let i = 0; i < this.diagnoses.length; i++) {
+        if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+          name += this.diagnoses[i].class_name + " ";
+        }
+      }
+      return name;
+    },
+  },
+  created() {
+    this.getAllDoctorList();
+    this.getInitData();
+    this.getPrescriptionPrint();
+    this.getHisPatientDetail();
+    var xtuser = this.$store.getters.xt_user;
+    this.orgname = xtuser.org.org_name;
+    this.org_id = xtuser.org.id;
+  },
+  watch: {
+    ids: function (val) {
+      this.ids = val;
+      this.getPrescriptionPrint();
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
+  0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+.printTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+}
+.infoTitle {
+  display: flex;
+  border-bottom: 2px solid #000;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.infoTitle p {
+  width: 200px;
+}
+.infoMain {
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 2px solid #000;
+  padding: 0 10px;
+}
+.infoMain div {
+  width: 50%;
+  line-height: 24px;
+}
+.prescriptionBox {
+  padding: 0 10px;
+  min-height: 450px;
+}
+.Rp {
+  font-size: 22px;
+  font-weight: bold;
+}
+.drugsBox {
+  padding-left: 40px;
+  margin-bottom: 10px;
+}
+.drugsBox div {
+  line-height: 20px;
+}
+.drugsOne {
+  line-height: 24px;
+}
+.drugsOne span {
+  margin-right: 20px;
+}
+.doctorBox {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+  border-bottom: 2px solid #000;
+}
+.doctorBox p{
+  margin-left: auto
+}
+
+.doctorBoxs{
+  width: 100%;
+  margin-right: 30px;
+  text-align: right;
+  padding: 0 10px;
+  line-height: 24px;
+
+}
+.doctorBoxtwo {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+
+}
+.actionBar {
+  display: flex;
+  justify-content: space-between;
+  line-height: 24px;
+  padding: 0 10px;
+}
+.actionBar p {
+  width: 150px;
+}
+</style>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -11,7 +11,7 @@
                     <span>其他</span>
                 </div>
                 <div v-if="org_id == 10460">就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
-                <div v-else>就诊日期：{{getTime(item.ctime,'{y}-{m}-{d}')}}</div>
+                <div v-else>就诊日期：{{getTime(item.pre_time,'{y}-{m}-{d}')}}</div>
             </div>
 
             <div class="printTitle">{{orgname}}</div>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -278,6 +278,7 @@ export default {
               list[i].overMoney = "/"
              
             }
+            console.log("listwowowoowowowow",list)
             this.tableList = list
             this.total = response.data.data.total
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -856,13 +856,13 @@
               this.recordInfo.recordData[i].license_number = val.number
               this.recordInfo.recordData[i].register_number = val.register_number
               if(val.buy_price == 0){
-               this.recordInfo.recordData[i].price = ""
+               this.recordInfo.recordData[i].price = "0"
               }else{
                 this.recordInfo.recordData[i].price = val.buy_price
               }
 
               if(val.packing_price == 0){
-               this.recordInfo.recordData[i].packing_price = ""
+               this.recordInfo.recordData[i].packing_price = "0"
               }else{
                 this.recordInfo.recordData[i].packing_price = val.packing_price
               }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -900,12 +900,12 @@ export default {
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             if(val.buy_price == 0){
-               this.recordInfo.recordData[i].price= ""
+               this.recordInfo.recordData[i].price= "0"
             }else{
                this.recordInfo.recordData[i].price = val.buy_price
             }
             if(val.packing_price == 0){
-              this.recordInfo.recordData[i].packing_price = ""
+              this.recordInfo.recordData[i].packing_price = "0"
             }else{
               this.recordInfo.recordData[i].packing_price = val.packing_price
             }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -879,7 +879,7 @@ export default {
             this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].register_number = val.register_number
             if(val.packing_price == 0){
-              this.recordInfo.recordData[i].price =""
+              this.recordInfo.recordData[i].price ="0"
             }else{
               this.recordInfo.recordData[i].price = val.packing_price
             }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -825,7 +825,7 @@
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
             if(val.packing_price == 0){
-               this.recordInfo.recordData[i].price = ""
+               this.recordInfo.recordData[i].price = "0"
             }else{
                this.recordInfo.recordData[i].price = val.packing_price
             }

src/xt_pages/user/components/PatientForm.vue

@@ -393,7 +393,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-
+      
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
@@ -409,10 +409,29 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+           
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+            
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="流转地址: "
+                >
+                <el-select v-model="form.patient_address" placeholder="请选择">
+                    <el-option
+                      v-for="item in liuAddresslist"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name">
+                    </el-option>
+                 </el-select>
+                </el-form-item>
+              </el-col> -->
+           
+ 
+             
+                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
-                  label="患者去向时间 : "
+                  label="流转开始时间 : "
                 >
                 <el-date-picker
                   size="small"
@@ -430,6 +449,28 @@
                 </el-form-item>
               </el-col>
 
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="流转结束时间 : "
+                >
+                <el-date-picker
+                  size="small"
+                  v-model="form.patient_end_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  @change="startTimeChange"
+                 ></el-date-picker>
+                </el-form-item>
+              </el-col> -->
+           
+             
+
               <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
@@ -487,6 +528,12 @@
 
               </el-col>
 
+              <!-- <el-col :span="24">
+                 <el-form-item label="传染病细分:" v-if="form.is_infectious == '2'">
+                    <el-input v-model="form.infectious_remark"></el-input>
+                 </el-form-item>
+              </el-col> -->
+
               <el-col :span="8">
                 <el-form-item label="疑难内瘘 : " prop="contagions">
                  <el-radio-group v-model="form.troble_shoot">
@@ -849,6 +896,19 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <!-- <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="过敏史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.allergic_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="体格检查">
@@ -1099,6 +1159,10 @@ const defaultForm = {
   doctor:"",
   patient_source:0,
   patient_start_time:"",
+  patient_end_time:"",
+  patient_address:"",
+  infectious_remark:"",
+  allergic_history:"",
   formItem: [
     {
       id: 0,
@@ -1249,7 +1313,6 @@ const defaultForm = {
   dbp: "",
   showOne:true,
   treatment_plan:"",
-
 };
 
 export default {
@@ -1349,7 +1412,7 @@ export default {
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
         {value:3,label:"请假"},
-        {value:4,label:"备注"}
+        {value:4,label:"流转"}
       ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
@@ -1436,6 +1499,7 @@ export default {
       },
       adminUserOptions:[],
       org_id:0,
+      liuAddresslist:[]
     };
   },
   components: {
@@ -1450,9 +1514,10 @@ export default {
     }
   },
   created() {
-
+  // this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
+  // console.log("liuAddresslist",this.liuAddresslist)
    this.fetchAllAdminUsers();
-
+ 
 
     if(this.isEdit == true){
        this.showLapseto = false
@@ -1465,6 +1530,8 @@ export default {
     // this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
     this.professionOptions = getDataConfig("patient", "profession_options");
+
+  
     // this.inductionOptions = this.$store.getters.induction_options;
     this.contagionList = this.$store.getters.contagions;
     this.checkDisease = this.$store.getters.disease;

src/xt_pages/workforce/components/editTableData.vue

@@ -1396,7 +1396,7 @@
             </el-select>
           </el-form-item>
           
-          <el-form-item>
+          <!-- <el-form-item>
             <span>透析班次:</span>
             <el-select
                 filterable 
@@ -1422,13 +1422,13 @@
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
-              @change="changePartition"
+              @change="changePartitionOne"
               >
               <el-option
-                  v-for="(item, index) in zone_names"
+                  v-for="(item, index) in zones"
                   :key="index"
-                  :label="item"
-                  :value="item"
+                  :label="item.name"
+                  :value="item.id"
               >
               </el-option>
               </el-select>
@@ -1450,7 +1450,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -1765,6 +1765,7 @@ import {
   ExchangeSch,
   getPatientSmartSch,
   BatchSmartSch,
+
 } from "@/api/schedule_template/sch_template";
 import {
   CancelScheduleTwo,
@@ -1778,7 +1779,8 @@ import {
   getUrgentScheduleInitData,
   getWeekPanelsOne,
   getAllZones,
-  ChangeScheduleTen
+  ChangeScheduleTen,
+  getNumberList
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
 
@@ -5017,13 +5019,13 @@ export default {
         console.log("WOOWOWOWOWOW",this.zones)
         console.log("numberowowow",this.numberList)
         this.changeSchedule.mode_id = row[column.property].mode_id
-        var zone_names = ""
-        for(let i=0;i<this.zones.length;i++){
-          if(row.zone_id == this.zones[i].id){
-           zone_names = this.zones[i].name
-          }
-        }
-        this.changeSchedule.partition_id = zone_names
+        // var zone_names = ""
+        // for(let i=0;i<this.zones.length;i++){
+        //   if(row.zone_id == this.zones[i].id){
+        //    zone_names = this.zones[i].name
+        //   }
+        // }
+        this.changeSchedule.partition_id = row.zone_id
         this.changeSchedule.schedule_type = week[1];
         this.changeSchedule.bed_id = row.jihao_id;
         console.log("床位id",this.changeSchedule.bed_id)
@@ -5076,7 +5078,7 @@ export default {
       this.changing_mode = true;
       this.changeSchedule.change_action = "change_mode";
 
-      ChangeScheduleTen(this.currentData.id, this.changeSchedule).then((response) => {
+      ChangeSchedule(this.currentData.id, this.changeSchedule).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
             } else {
@@ -5084,32 +5086,32 @@ export default {
                 type: "success",
                 message: "修改成功!",
               });
-              // var that = this;
-              // var schedule = response.data.data.schedule;
-              // this.msDialogVisible = false
-              // this.scheduleZone.forEach(function (zone, index) {
-              //   if (
-              //       zone.zone_id == schedule.partition_id &&
-              //       zone.jihao_id == schedule.bed_id
-              //   ) {
-              //     var weekPath = that.weekPath(
-              //         schedule.schedule_week,
-              //         schedule.schedule_type
-              //     );
-              //     if (weekPath.length == 2) {
-              //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
-              //       that.scheduleZone[index][weekPathKey].dialysis_machine_name =
-              //           schedule.dialysis_machine_name;
-              //       that.scheduleZone[index][weekPathKey].mode_id =
-              //           schedule.mode_id;
-              //       that.scheduleZone[index][weekPathKey].mode_name = typeof that.modeOptions[schedule.mode_id] === "undefined"
-              //               ? ""
-              //               : that.modeOptions[schedule.mode_id].name;
-              //     }
-              //   }
-              // });
-              this.msDialogVisible = false;
-              this.getAllZones()
+              var that = this;
+              var schedule = response.data.data.schedule;
+              this.msDialogVisible = false
+              this.scheduleZone.forEach(function (zone, index) {
+                if (
+                    zone.zone_id == schedule.partition_id &&
+                    zone.jihao_id == schedule.bed_id
+                ) {
+                  var weekPath = that.weekPath(
+                      schedule.schedule_week,
+                      schedule.schedule_type
+                  );
+                  if (weekPath.length == 2) {
+                    var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                    that.scheduleZone[index][weekPathKey].dialysis_machine_name =
+                        schedule.dialysis_machine_name;
+                    that.scheduleZone[index][weekPathKey].mode_id =
+                        schedule.mode_id;
+                    that.scheduleZone[index][weekPathKey].mode_name = typeof that.modeOptions[schedule.mode_id] === "undefined"
+                            ? ""
+                            : that.modeOptions[schedule.mode_id].name;
+                  }
+                }
+              });
+              // this.msDialogVisible = false;
+              // this.getAllZones()
              
             }
             this.changing_mode = false;
@@ -5177,6 +5179,17 @@ export default {
       this.current_devices = this.zone_device_map[value];
       this.device_id = this.current_devices[0].id;
     },
+    changePartitionOne(val){
+      console.log("valwoowow",val)
+
+      getNumberList(val).then(response=>{
+         if(response.data.state==1){
+           var number = response.data.data.number
+           this.numberList = []
+           this.numberList = number
+         }
+      })
+    },
     // 选择下拉框方法
     changeScheduleType(schedule_type) {
       const params = {
@@ -5782,7 +5795,7 @@ export default {
 
           this.strArr = strArr;
           var device_number =  response.data.data.devicenumber
-
+          this.numberList = []
           this.numberList = device_number
           console.log("所有床位",device_number)
           this.getWeekPanels();