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

src/xt_pages/dialysis/batch_print/batch_print_order_seventyeight.vue

@@ -564,7 +564,7 @@
                       <div class="inline_block" style=" flex: 1">
                         处方脱水量：
                           <div class="under_line" style="width: 60px; text-align: center" >
-                            {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "/" }}
+                            {{ record.prescription.prescription_water ? record.prescription.prescription_water : "/" }}
                           </div>L
                       </div>             
                       <div class="inline_block" style=" flex: 1">
@@ -615,6 +615,20 @@
                           <span v-if="record.prescription.mode_id == 25">HD高通</span>
                           <span v-if="record.prescription.mode_id == 29">PE</span>
                           <span v-if="record.prescription.mode_id == 30">血浆胆红素吸附+HP</span>
+                          <span v-if="record.prescription.mode_id == 31">HPD</span>
+                          <span v-if="record.prescription.mode_id == 32">HDP</span>
+                          <span v-if="record.prescription.mode_id == 33">HFD</span>
+                          <span v-if="record.prescription.mode_id == 34">HDF100</span>
+                          <span v-if="record.prescription.mode_id == 35">HDF600</span>
+                          <span v-if="record.prescription.mode_id == 36">HDF800</span>
+                          <span v-if="record.prescription.mode_id == 37">HDF1000</span>
+                          <span v-if="record.prescription.mode_id == 38">HDF80</span>
+                          <span v-if="record.prescription.mode_id == 39">HF16</span>
+                          <span v-if="record.prescription.mode_id == 40">HD(无肝素)</span>
+                          <span v-if="record.prescription.mode_id == 41">HDF17H</span>
+                          <span v-if="record.prescription.mode_id == 42">HD.</span>
+                          <span v-if="record.prescription.mode_id == 43">HD(2)</span>
+                          <span v-if="record.prescription.mode_id == 44">导管溶栓</span>
                         </div>
                       </div>             
                       <div class="inline_block" style=" flex: 1">
@@ -1146,7 +1160,7 @@
                           </td>
                           <td>
                             {{monitor_record.sodium_concentration ? monitor_record.sodium_concentration : '0'}} /
-                            {{ monitor_record.temperature ? monitor_record.temperature : '0' }}
+                            {{ monitor_record.dialysate_temperature ? monitor_record.dialysate_temperature : '0' }}
                           </td>
                           <td>
                             {{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "/" }}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1714,7 +1714,8 @@
                               org_id!=10600 &&
                               org_id!=10644 &&
                               org_id!=0&&
-                              org_id!=10567
+                              org_id!=10567 &&
+                              org_id!=10724
                             "
                           >
                             电导度<br />(ms/cm)
@@ -1730,7 +1731,7 @@
                           <td
                             width="50"
                             v-if="
-                              org_id ==  10469 || org_id == 0 || org_id ==10567
+                              org_id ==  10469 || org_id == 0 || org_id ==10567 || org_id ==10724
                             "
                           >
                             钠浓度<br />(mmol/L)
@@ -1749,7 +1750,7 @@
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567 || org_id ==10724">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1762,11 +1763,11 @@
                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
                           <span v-if="org_id ==0||org_id==10683">置换液速度</span>
                             <br />
-                            <span v-if="org_id!=10598 && org_id!=10567">
+                            <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
                               <span v-if="org_id ==0||org_id==10683">(ml/h)</span>
                             </span>
-                            <span v-if="org_id==10598 || org_id == 10567">L</span>
+                            <span v-if="org_id==10598 || org_id == 10567 || org_id ==10724">L</span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
@@ -1781,7 +1782,8 @@
                               org_id == 10510 ||
                               org_id == 0 ||
                               org_id == 10598 ||
-                              org_id == 10567
+                              org_id == 10567 ||
+                              org_id == 10724
 
                             "
                           >
@@ -1918,7 +1920,8 @@
                               org_id!=10600 &&
                               org_id!=10644 &&
                               org_id!=0 &&
-                              org_id!=10567
+                              org_id!=10567 &&
+                              org_id!=10724
 
 
                             "
@@ -1944,7 +1947,7 @@
 
                           <td
                             v-if="
-                              org_id == 10469 || org_id ==0 || org_id == 10567
+                              org_id == 10469 || org_id ==0 || org_id == 10567 || org_id==10724
                             "
                           >
                             {{
@@ -2002,7 +2005,7 @@
 
                           </td>
 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567"><br />
+                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567 || org_id == 10724"><br />
 
                                     {{
                                       monitor_record.ultrafiltration_rate
@@ -2052,7 +2055,8 @@
                               org_id ==10510 ||
                               org_id== 0 ||
                               org_id ==10598 ||
-                              org_id == 10567
+                              org_id == 10567 ||
+                              org_id == 10724
                             "
                           >
                             {{ monitor_record.ktv }}

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206 || this.org_id == 0){
+          if(this.org_id ==10206){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -829,7 +829,7 @@
                    }
 
                  }
-                 console.log("list--------------------",list)
+                 console.log("透析参数list--------------------",list)
                  this.list = list
                }
              }

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

@@ -2842,6 +2842,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10353){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '12:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
+            }
            }else if (this.$store.getters.xt_user.org.id == 10551){
             var date = new Date()
             var year = date.getFullYear()
@@ -3226,17 +3234,15 @@ mu
           }
         }
 
-        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0){
-          // console.log("中国====================",this.dialysisPrescription.target_ultrafiltration)
-          // console.log("predialysis",this.predialysis)
+        if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702){
+         
           if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
-            //  console.log("进货哈哈好哈哈哈哈")
+          
              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
-            //  console.log("日本====================", this.dialysisPrescription.target_ultrafiltration)
+          
           }
         }
-        // console.log("---------",this.targetAdvices)
-        // console.log("admin_user_+id2332323223332", this.adminRoles)
+      
       },
       hide() {
         this.isVisibility = false

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2694,9 +2694,7 @@ export default {
             this.org_template_info.template_id= 80
           }
 
-          if(this.org_id == 0){
-            this.org_template_info.template_id= 80
-          }
+
           console.log('kkkkkkk222222',this.org_template_info);
           this.loading = false;
           //   this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -512,7 +512,7 @@
                     <div class="inline_block" style="flex: 1">
                       处方脱水量：
                       <div class="under_line" style="width: 50px; text-align: center">
-                        {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
+                        {{ prescription.prescription_water ? prescription.prescription_water : "/" }}
                       </div>L
                     </div>
                      <div class="inline_block" style="flex: 1">
@@ -589,8 +589,9 @@
                     <div class="inline_block" style="flex: 1">
                       机号：
                       <div class="under_line" style="width: 70px; text-align: center">
-                        {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
+                       <span v-if="dialysisOrder!=null">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
                         ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+                        </span> 
                       </div>
                     </div>
                   </div>
@@ -992,7 +993,7 @@
                         <!-- 钠浓度(mmol/L)/温度°C -->
                         <td>
                           {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} /
-                          {{ monitor.temperature ? monitor.temperature : '0' }}
+                          {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '0' }}
                         </td>
 
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
@@ -2428,8 +2429,11 @@ export default {
         }
 
         this.jilurow = this.monitors.length + 1;
-
-        this.advice_jilurow = this.advices.length + 1;
+        
+        if(this.advices!=null && this.advices.length>0){
+          this.advice_jilurow = this.advices.length + 1;
+        }
+       
 
         var childMap = {};
         for (const index in this.advices) {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -33,7 +33,7 @@
                   </div>
                   <div style="flex: 1;">
                     透析机号:
-                    {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+                    <span v-if="dialysisOrder!=null">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span> 
                   </div>
                   <div style="flex: 1;">
                     透析次数：  {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ?
@@ -1060,7 +1060,10 @@ export default {
           }
           this.jilurow = this.monitors.length + 1;
 
-          this.advice_jilurow = this.advices.length + 1;
+          if(this.advices!=null && this.advices.length>0){
+            this.advice_jilurow = this.advices.length + 1;
+          }
+        
 
           var childMap = {};
           for (const index in this.advices) {
@@ -1213,13 +1216,16 @@ export default {
           var newDocArr= []
           var projectarr = []
           var projectArrs = []
-          for(let i=0;i<advices.length;i++){
+          if(advices!=null && advices.length>0){
+            for(let i=0;i<advices.length;i++){
             // console.log("hhahahahh",advices[i].advice_name.indexOf("0.9%氯化钠注射液"))
             // console.log("jjjjjjjjj",advices[i].delivery_way.indexOf("管路预冲"))
-           if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
-              newDocArr.push(advices[i])
-           }
+              if(advices[i].advice_name.indexOf("0.9%氯化钠注射液") ==-1 && advices[i].delivery_way.indexOf("管路预冲")==-1){
+                  newDocArr.push(advices[i])
+              }
+            }
           }
+        
           for(let i in projects){
             if(projects[i].type ==2){
               if(projects[i].project.project_name == '血糖监测'){
@@ -1232,6 +1238,7 @@ export default {
           console.log("血透监测 != -1",projects)
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
           var tableAdvice = newDocArr.concat(doctorAdevieInfo);
+          console.log("医嘱红红火火恍恍惚惚哈哈哈哈哈哈哈哈哈哈哈哈哈哈",tableAdvice)
           if(projectarr.length>0){
             for(let i in projectarr){
               if(projectarr[i].team!= "undefined" && projectarr[i].team.id >0){
@@ -1358,7 +1365,7 @@ export default {
             this.tableAdvice = tableAdvice;
 
           }
-          console.log('医嘱',this.tableAdvice);
+          console.log('医嘱9999999999999',this.tableAdvice);
         } else {
           this.loading = false;
           this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1839,8 +1839,8 @@
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 "> 电导度<br />(ms/cm)</span>
-                          <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567"> 钠浓度<br />(mmol/L)</span>
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724 "> 电导度<br />(ms/cm)</span>
+                          <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567 || org_id==10724"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
@@ -1851,20 +1851,20 @@
                          <span v-if="org_id == 10471">L</span>
                          <span v-if="org_id != 10471"> (ml)</span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0 || org_id ==10724">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           <span v-if="org_id == 10683">置换液速度</span>
                           <span v-if="org_id!=0&&org_id!=10683">置换量</span>
                           <br />
-                          <span v-if="org_id!=10598 && org_id!=10567">
+                          <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724">
                             <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
                             <span v-if="org_id==10683">(ml/h)</span>
                           </span>
-                          <span v-if="org_id==10598 || org_id == 10567">(L)</span>
+                          <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0 || org_id == 10724">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1962,8 +1962,8 @@
 
 
                         <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
-                          <span v-if="org_id==10469 || org_id == 10567 || org_id == 0"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
+                          <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567 && org_id!=10724"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
+                          <span v-if="org_id==10469 || org_id == 10567 || org_id == 0 || org_id == 10724"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                         </td>
 
@@ -1983,7 +1983,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0"><br/>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0 || org_id == 10724"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 ">
                               <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -2018,7 +2018,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0 || org_id ==10724">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -5517,7 +5517,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id ==10644 || this.org_id == 0){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id ==10644 || this.org_id == 0 || this.org_id ==10724){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

src/xt_pages/user/Informed/components/Medicalhistory.vue

@@ -29,35 +29,35 @@
           </div>
           <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 2;">
-              身份证号
+              身份证号：
               <span class="unile2">{{ patient.id_card_no }}</span>
             </div>
           </div>
           <div style='padding: 0 5px 10px 5px'>
             <div>
-              现住址(详填) <span class="unile2">{{ patient.home_address }}</span>
+              现住址(详填)： <span class="unile2">{{ patient.home_address }}</span>
             </div>
             <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
           <div style='padding: 0 5px 10px 5px'>
             <div>
-              家庭住址<span class="unile2">{{ patient.home_address }}</span>
+              家庭住址：<span class="unile2">{{ patient.home_address }}</span>
             </div>
             <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
           <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 1;">
-              本人电话<span class="unile">{{ patient.home_telephone }}</span>
+              本人电话：<span class="unile">{{ patient.phone }}</span>
             </div>
             <!-- <div style="flex: 1;">
               手机<span class="unile">{{ patient.phone }}</span>
             </div> -->
             <div style="flex: 1.5;">
-              亲属联系方式<span class="unile">{{ patient.relative_phone }}</span>
+              亲属联系方式：<span class="unile">{{ patient.home_telephone }}</span>
             </div>
           </div>
           <div style="padding: 0 5px 10px 5px">
-            工作单位<span class="unile2">{{ patient.work_unit }}</span>
+            工作单位：<span class="unile2">{{ patient.work_unit }}</span>
           </div>
           <!-- <div style="padding: 10px 5px">
             地址<span class="unile2"></span> 省(市)<span class="unile2"></span>路<span class="unile2"></span>号

src/xt_pages/user/components/PatientDetail.vue

@@ -971,26 +971,46 @@
           ></el-button>
         </el-form-item>
       </el-col> -->
+      
+      <el-row>
+        <el-col :span="24" style="height:100%;">
+          <el-form-item label="家族史 : " prop="famality_record" style="height:100%;">
+            <el-input
+              style="height:100%;"
+              type="textarea"
+              :rows="3"
+              v-model="form.famality_record"
+              resize="none"
+              placeholder=""
+              readonly
+            ></el-input>
+          </el-form-item>
+       </el-col>
+      </el-row>
+      
+      <el-row>
+        <el-col :span="24" style="height:100%;">
+          <el-form-item label="登记人员 : " style="height:100%;">
+            <span>{{ form.registrars }} </span>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-      <el-col :span="24">
-        <el-form-item label="登记人员 : ">
-          <span>{{ form.registrars }} </span>
-        </el-form-item>
-      </el-col>
-
-       <el-col :span="6">
-        <el-form-item label="医生 : ">
-
-           <el-select v-model="form.doctor"    disabled>
-              <el-option
-                v-for="item in adminUserOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-        </el-form-item>
-      </el-col>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="医生 : ">
+            <el-select v-model="form.doctor"    disabled>
+                <el-option
+                  v-for="item in adminUserOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+          </el-form-item>
+       </el-col>
+      </el-row>
+      
     </el-form>
     <!-- 打印预览 style="display: none"-->
     <div style="display: none">
@@ -1359,7 +1379,7 @@
                     血管通路
                   </td>
                   <td colspan="3" style="padding: 5px 0px;font-size: 22px;">
-                     <!-- {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }} -->
+                     {{ patientVascularAccessOne.blood_access_part_id }} {{ patientVascularAccessOne.blood_access_part_opera_id }}
                   </td>
                 </tr>
 
@@ -1406,7 +1426,7 @@
                   </td>
                   <td colspan="3">
                     <div class="td_proj_content td_align_left">
-
+                         {{ patientPrint.famality_record }}
                     </div>
                   </td>
                 </tr>
@@ -1626,6 +1646,7 @@ const defaultForm = {
   infectious_remark:"",
   allergic_history:"",
   print_date:"",
+  famality_record:"",
 };
 
 export default {
@@ -1806,7 +1827,7 @@ export default {
         "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content table { width: 100%; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 22px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 22px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 22px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
       if(this.org_id != 10206 && this.org_id !=0){
         console.log('1111111');
-        
+
         setTimeout(() => {
           printJS({
             printable: "print-info-box",
@@ -1817,7 +1838,7 @@ export default {
         }, 1);
       }else{
         console.log('121212','10206');
-        
+
         setTimeout(() => {
           printJS({
             printable: "print-info-box",
@@ -1827,7 +1848,7 @@ export default {
           });
         }, 1);
       }
-      
+
     },
     getZones() {
       getZones().then((response) => {
@@ -2015,6 +2036,7 @@ export default {
             this.form.patient_address = patietInfo.patient_address
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
+            this.form.famality_record  = patietInfo.famality_record
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;

src/xt_pages/user/components/PatientForm.vue

@@ -1052,6 +1052,21 @@
             </el-form-item>
           </el-col> -->
 
+          <el-row>
+            <el-col :span="24" style="height:100%;">
+              <el-form-item label="家族史 : " prop="famality_record" style="height:100%;">
+                <el-input
+                  style="height:100%;"
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.famality_record"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+         </el-col>
+        </el-row>
+
           <el-col :span="24">
             <el-form-item label="登记人员 : ">
               <span>{{ adminusername }}</span>
@@ -1197,6 +1212,7 @@ const defaultForm = {
   infectious_remark:"",
   allergic_history:"",
   print_date:"",
+  famality_record:"",
   formItem: [
     {
       id: 0,
@@ -2044,6 +2060,10 @@ export default {
               "{y}-{m}-{d}"
             );
 
+            this.form.famality_record  = patietInfo.famality_record
+
+            console.log("家族史", this.form.famality_record)
+
             if (patietInfo.age == 0) {
               this.form.age = jsGetAge(this.form.birth, "-");
             } else {
@@ -2121,7 +2141,7 @@ export default {
             this.form.patient_address = patietInfo.patient_address
             this.form.allergic_history = patietInfo.allergic_history
             this.form.infectious_remark = patietInfo.infectious_remark
-
+          
 
             // this.checkIdCardNo();
           } else {