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

src/api/device.js

@@ -324,10 +324,10 @@ export function deleteObjectTableDisinfect(id,params){
   })
 }
 
-export function getAirDisinfectLongTime(params){
+export function getAirDisinfectLongTime(storey,params){
   
   return request({
-    url:"/api/manage/getairdisinfectionlongtime",
+    url:"/api/manage/getairdisinfectionlongtime?storey="+storey,
     method:"get",
     params:params
   })

src/api/role/admin.js

@@ -300,4 +300,13 @@ export function CreateSKDSendInformation(data){
     method:"Post",
     data:data,
   })
+}
+
+export function toSavePDFInformation(params){
+  
+  return request({
+    url:"/api/device/tosavepdfinformation",
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/patient.js

@@ -480,16 +480,16 @@ export default {
   //     noCache: true
   //   }
   // },
-  {//血管通路图
-    path: '/patients/patient/:id/angiogram',
-    component: () => import('@/xt_pages/user/angiogram'),
-    hidden: true,
-    is_menu: false,
-    name: 'angiogram',
-    meta: {
-      title: 'angiogram',
-      noCache: true
-    }
-  },
+  // {//血管通路图
+  //   path: '/patients/patient/:id/angiogram',
+  //   component: () => import('@/xt_pages/user/angiogram'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'angiogram',
+  //   meta: {
+  //     title: 'angiogram',
+  //     noCache: true
+  //   }
+  // },
   ]
 }

src/xt_pages/device/airDisinfectTwo.vue

@@ -24,6 +24,14 @@
               style="width: 150px;"
               @change="changeEndtime">
             </el-date-picker>
+            <el-select v-model="storey" placeholder="请选择" @chang="changeStore" v-if="art_way_one==0||art_way_one == 1">
+                <el-option
+                v-for="(item,index) in storeyList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+                </el-option>
+             </el-select>
             <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
@@ -45,6 +53,11 @@
                         </el-table-column>
                     </el-table-column>
                 </el-table-column>
+                <el-table-column prop="fenopda" label="楼层" align="center" min-width="70">
+                    <template slot-scope="scope">
+                      {{scope.row.storey }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="fenopda" label="透析室" align="center" min-width="70">
                     <template slot-scope="scope">
                       {{getTimeTwo(scope.row.first_start_time)}} - {{ getTimeTwo(scope.row.first_end_time) }}
@@ -218,9 +231,20 @@
                         </el-date-picker>
                     </el-form-item>
                   </div>
+                  <div style="width: 100%;">
+                    <el-form-item label="楼层">
+                        <el-select v-model="form.storey" placeholder="请选择楼层" @change="changeStorey">
+                          <el-option
+                          v-for="(item,index) in storeyList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
                       <el-select v-model="form.first_disinfection_water" placeholder="请选择">
                           <el-option
                           v-for="(item,index) in disInfectionWaterList"
@@ -531,9 +555,20 @@
                         </el-date-picker>
                     </el-form-item>
                   </div>
+                  <div style="width: 100%;">
+                    <el-form-item label="楼层">
+                        <el-select v-model="form.storey" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in storeyList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </div>
                   <div class="form_title"><span >透析室</span></div>
                   <el-form-item label="消毒液" label-width="110px">
-                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
                       <el-select v-model="form.first_disinfection_water" placeholder="请选择">
                           <el-option
                           v-for="(item,index) in disInfectionWaterList"
@@ -844,6 +879,7 @@
                                     transform-origin: top left;"></span>
                                     <span style="position: absolute; left: 6px; bottom: 6px;font-size: 12px;">日期</span>
                                 </td>
+                                <td>楼层</td>
                                 <td>透析室</td>
                                 <td>累计时间</td>
                                 <td>责任人</td>
@@ -857,6 +893,7 @@
                                 <td>负责人</td>
                             </tr>
                             <tr v-for="(item,index) in tableData" :key="index">
+                                <td>{{item.storey}}</td>
                                <td>{{getTimes(item.record_date) }}</td>
                                <td>{{ getTimeTwo(item.first_start_time)}} - {{ getTimeTwo(item.first_end_time) }}</td>
                                <td>{{item.first_total_time }}</td>
@@ -1376,6 +1413,7 @@
             last_modifications:"",//修改标志
             last_creator:this.$store.getters.xt_user.user.id,//第一责任人
             department:"",
+            storey:"",
           },
           docList:[],
           options:[
@@ -1425,25 +1463,33 @@
          disinfectionOfficeList:[],
          tableDataOne:[],
          art_way_one:0,
+         storeyList:[],
+         storey:"",
         }
       },
       created(){
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
-        console.log("disinfection_fluid",disinfection_fluid)
+        
         for(let i=0;i<disinfection_fluid.length;i++){
           this.disInfectionWaterList.push(disinfection_fluid[i])
         }
 
         var  disinfection_methods = getManageMentDataConfig('management', 'disinfection_methods')
-        console.log("disinfection_methods",disinfection_methods)
+       
         for(let i=0;i<disinfection_methods.length;i++){
           this.DisinfectionMode.push(disinfection_methods[i])
         }
         var  disinfection_offices = getManageMentDataConfig('management', 'disinfection_office')
-        console.log("disinfection_offices",disinfection_offices)
+      
         for(let i=0;i<disinfection_offices.length;i++){
           this.disinfectionOfficeList.push(disinfection_offices[i])
         }
+
+        var  storey = getManageMentDataConfig('management', 'storey')
+        
+        for(let i=0;i<storey.length;i++){
+          this.storeyList.push(storey[i])
+        }
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
         this.getNewAirWayDisinfectList()
@@ -1490,8 +1536,12 @@
         }
       },
       methods:{
+        changeStore(val){
+         
+          this.getNewAirDisinfectList()  
+        },  
       AddCard(){
-        getAirDisinfectLongTime().then(response=>{
+        getAirDisinfectLongTime(this.storey).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
            
@@ -1671,6 +1721,7 @@
                 end_time:this.endvalue,
                 limit:this.limit,
                 page:this.page,
+                storey:this.storey,
              }
              console.log("params2332233232w",params)
             getNewAirDisinfectList(params).then(response=>{
@@ -1756,6 +1807,7 @@
               this.form.last_is_check = list.last_is_check.toString()
               this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
+              this.form.storey = list.storey
               this.editDialogFormVisible = true
 
             }
@@ -2023,6 +2075,7 @@
                var airSetting =  response.data.data.airSetting
                this.$message.success("保存成功")
                this.setEditDialog = false
+               this.getSetAirDisInfectById()
              }
           })  
         },

src/xt_pages/device/objectRegistration.vue

@@ -460,7 +460,7 @@
         return {
           crumbs: [
             { path: false, name: '院感管理' },
-            { path: false, name: '透析室空气消毒记录表' }
+            { path: false, name: '透析室医疗器械记录表' }
           ],
 
           dialogFormVisible:false,

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -20,6 +20,14 @@
               style="width: 150px;"
               value-format="yyyy-MM-dd">
             </el-date-picker>
+            <el-select v-model="storey" placeholder="请选择楼层" v-if="art_way_one==0||art_way_one == 1"  @chang="changeStore">
+                <el-option
+                v-for="(item,index) in storeyList"
+                :key="index"
+                :label="item.name"
+                :value="item.name">
+                </el-option>
+             </el-select>
             <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
@@ -31,6 +39,7 @@
           </div>
           <div class="tab_air" v-if="art_way_one == 0 || art_way_one ==1">
             <el-table  :data="tableData" :fit="true" stripe>
+               
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
                         <el-table-column prop="year" label="日期" align="center" width="150">
@@ -41,10 +50,15 @@
                         </el-table-column>
                     </el-table-column>
                 </el-table-column>
+                <el-table-column label="楼层" width="100" align="center">
+                    <template  slot-scope="scope">
+                        {{ scope.row.storey }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{ getTimeTwo(scope.row.first_start_time) }} - {{ getTimeTwo(scope.row.first_end_time) }}
-                        <!-- {{ scope.row.first_disinfection_time }} -->
+                       
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
@@ -222,6 +236,18 @@
                         </el-date-picker>
                     </el-form-item>
                   </div>
+                  <div style="width: 100%;">
+                    <el-form-item label="楼层">
+                        <el-select v-model="form.storey" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in storeyList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </div>
                   <div class="form_title"><span >湿化瓶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
                       <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
@@ -635,6 +661,18 @@
                         </el-date-picker>
                     </el-form-item>
                   </div>
+                  <div style="width: 100%;">
+                    <el-form-item label="楼层">
+                        <el-select v-model="form.storey" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in storeyList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </div>
                   <div class="form_title"><span >湿化瓶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
                       <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
@@ -1053,6 +1091,7 @@
                                     transform-origin: top left;"></span>
                                     <span style="position: absolute; left: 6px; bottom: 6px;font-size: 12px;">日期</span>
                                 </td>
+                                <td>楼层</td>
                                 <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
                                 <td>止血带<br/>500mg/l含氯制剂</td>
@@ -1067,6 +1106,7 @@
                             </tr>
 
                             <tr v-for="(item,index) in tableData" :key="index">
+                                <td>{{item.storey }}</td>
                                 <td>{{getTimes(item.record_date) }}</td>
                                 <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_time)  }}</td>
                                 <td>
@@ -1495,6 +1535,7 @@
             last_modifications:"",//修改标志
             last_creator:this.$store.getters.xt_user.user.id,//第一责任人
             department:"",
+            storey:"",
           },
         //   value1:'',
           docList:[],
@@ -1533,6 +1574,8 @@
          tableDataOne:[],
          hiddenShowOne:false,
          art_way_one:0,
+         storeyList:[],
+         storey:""
         }
 
       },
@@ -1553,6 +1596,12 @@
         for(let i=0;i<disinfection_offices.length;i++){
           this.disinfectionOfficeList.push(disinfection_offices[i])
         }
+
+        var  storey = getManageMentDataConfig('management', 'storey')
+        
+        for(let i=0;i<storey.length;i++){
+          this.storeyList.push(storey[i])
+        }
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
         this.getObjectTableDisInfectWayList()
@@ -1594,6 +1643,9 @@
         },
       },
       methods:{
+        changeStore(val){
+         this.getObjectTableDisInfectList()  
+       },  
       printCard() {
         this.hiddenShow = true;
         var ptime = Math.round(new Date().getTime() / 1000);
@@ -1778,7 +1830,9 @@
                 end_time:this.endvalue,
                 limit:this.limit,
                 page:this.page,
+                storey:this.storey,
              }
+             console.log("storey",params)
             getObjectTableDisInfectList(params).then(response=>{
               if(response.data.state == 1){
                 var list = response.data.data.list
@@ -1841,6 +1895,7 @@
               this.form.last_disinfection_water = list.last_disinfection_water?list.last_disinfection_water:""
               this.form.last_disinfection_methods = list.last_disinfection_methods?list.last_disinfection_methods:""
               this.form.last_disinfection_time = list.last_disinfection_time?list.last_disinfection_time:""
+              this.form.storey = list.storey
               this.editDialogFormVisible = true
             }
           })
@@ -2085,21 +2140,23 @@
       toSetting(){
         getObjectWayDisinfect().then(response=>{
            if(response.data.state==1){
-             var objctSet = response.data.data.objctSet
+             var objctSet = response.data.data.disinfect
              if(objctSet!=undefined){
                 this.art_way_one = objctSet.air_way.toString()
              }
              this.setEditDialog = true
+             
            }
         })
       },
       getObjectWayDisinfect(){
         getObjectWayDisinfect().then(response=>{
            if(response.data.state==1){
-             var objctSet = response.data.data.objctSet
+             var objctSet = response.data.data.disinfect
              if(objctSet!=undefined){
                 this.art_way_one = objctSet.air_way
              }
+             console.log("art_way_one23232322323",this.art_way_one)
             
            }
         })
@@ -2112,6 +2169,7 @@
            if(response.data.state==1){
              var objctSet = response.data.data.objctSet
              this.setEditDialog = false
+             this.getObjectWayDisinfect()
            }
         })
       },

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -504,14 +504,16 @@
                                 <td width="10">)</td>
                                 <td width="50">
                                     <div class="under-line">&nbsp;
-                                        <span v-if="record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7">{{record.prescription.anticoagulant_zongliang}}</span>
+                                        <span v-if="record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7 || record.prescription.anticoagulant==14">{{record.prescription.anticoagulant_zongliang}}</span>
                                     </div>
                                 </td>
                                 <td width="10">iu</td>
                                 <td width="70">
                                     <label-box :isChecked="record.prescription.anticoagulant==1?true:false" showValue='无肝素'></label-box> 
                                 </td>
-                                <td></td>
+                                <td width="70">
+                                  <label-box :isChecked="record.prescription.anticoagulant==14?true:false" showValue='肝素钙'></label-box> 
+                                </td>
                             </tr>
                             </tbody>
                             </table>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -78,13 +78,13 @@
             <div class="inline_block" v-if="record.receive_assessment.condition!=1">
               门特：
               <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="record.patient.source == 1"></check-box>
+                <check-box :checked="record.patient.source == 3"></check-box>
               </div>
             </div>
             <div class="inline_block" v-if="record.receive_assessment.condition==1">
               住院：
               <div class="under_line" style="width: 30px; text-align: center">
-                <check-box :checked="record.patient.source == 1"></check-box>
+                <check-box :checked="record.patient.source == 2"></check-box>
               </div>
             </div>
             <div class="inline_block" v-if="org_id!=10510">
@@ -1293,29 +1293,26 @@
 
                     <div class="row" style="padding: 2px 0; line-height: 23px">
                       <div class="inline_block">
-                        冲洗量：
+                        Ns冲洗量：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.pre_impulse
-                              ? record.prescription.pre_impulse
-                              : "/"
+                        {{
+                           record.prescription.warsh_count
                           }}
                         </div>
                         ml
                       </div>
                       <span>&nbsp;&nbsp;&nbsp;</span>
                       <div class="inline_block">
-                        冲洗时间：
+                       q：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
                         >
                           {{
-                           
+                           record.prescription.washing_time
                           }}
                         </div>
                         h

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -617,6 +617,16 @@
           <span class="content">{{this.prescription.chaptalization}}</span>
         </li>
 
+        <li v-if="isShow('冲洗时间')">
+          <label>q(h): </label>
+          <span class="content">{{this.prescription.washing_time}}</span>
+        </li>
+
+        <li v-if="isShow('冲洗量')">
+          <label>Ns冲洗量(ml): </label>
+          <span class="content">{{this.prescription.chaptalization}}</span>
+        </li>
+
        
       </ul>
     </div>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -426,6 +426,18 @@
           <span class="content">{{this.record.befor_symptoms}}</span>
           <span class="unit"></span>
         </li>
+      
+        <li v-if="isShow('冲洗量')">
+          <label>冲洗量: </label>
+          <span class="content">{{this.record.warsh_count}}</span>
+          <span class="unit"></span>
+        </li>
+
+        <li v-if="isShow('冲洗时间')">
+          <label>冲洗时间: </label>
+          <span class="content">{{this.record.washing_time}}</span>
+          <span class="unit"></span>
+        </li>
 
 
       </ul>

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

@@ -714,6 +714,18 @@
               </el-form-item>
             </el-col>
           
+           <el-col :span="8">
+            <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShow('冲洗量')">
+              <el-input v-model="assessmentBeforeDislysis.warsh_count"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShow('冲洗时间')">
+              <el-input v-model="assessmentBeforeDislysis.washing_time"></el-input>
+            </el-form-item>
+          </el-col>
+
               
             
               <el-col :span="24">
@@ -960,6 +972,8 @@
           pathway_formation_time:"",
           lien_necessary:"",
           befor_symptoms:"",
+          washing_time:"",
+          warsh_count:"",
         },
 
         InnerDialogProps: {

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

@@ -320,7 +320,9 @@
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
                           this.$store.getters.xt_user.template_info.org_id != 10387 &&
                           this.$store.getters.xt_user.template_info.org_id != 10495 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10375 ">
+                          this.$store.getters.xt_user.template_info.org_id != 10375 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10551
+                           ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -366,7 +368,8 @@
                                     this.$store.getters.xt_user.template_info.org_id == 10346 ||
                                     this.$store.getters.xt_user.template_info.org_id == 10387 ||
                                     this.$store.getters.xt_user.template_info.org_id ==10495 ||
-                                    this.$store.getters.xt_user.template_info.org_id ==10375
+                                    this.$store.getters.xt_user.template_info.org_id ==10375 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10551
                                     '
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -429,7 +432,8 @@
                                             this.$store.getters.xt_user.template_info.org_id != 54 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9990 &&
                                             this.$store.getters.xt_user.template_info.org_id != 10495 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 10375" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 10375 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10551" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -446,7 +450,8 @@
                                           this.$store.getters.xt_user.template_info.org_id == 10387  ||
                                           this.$store.getters.xt_user.template_info.org_id == 9990 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10495 ||
-                                          this.$store.getters.xt_user.template_info.org_id == 10375
+                                          this.$store.getters.xt_user.template_info.org_id == 10375 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10551
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -502,10 +507,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -513,7 +518,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 '
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 '
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -1109,6 +1114,20 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                  <el-col :span="8">
+                  <el-form-item label="Ns冲洗量(ml):" :prop="isName('冲洗量')" v-if="isShow('冲洗量') && dialysisPrescription.anticoagulant == 1">
+                    <el-input v-model="dialysisPrescription.warsh_count"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="q(h):" :prop="isName('冲洗时间')" v-if="isShow('冲洗时间') && dialysisPrescription.anticoagulant == 1">
+                    <el-input v-model="dialysisPrescription.washing_time"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                </el-row>
 
               <el-row :gutter="20">
                     <el-col :span="24"  v-if="isShows('病情处理')">
@@ -1693,6 +1712,8 @@
           prescription_water:"",
           dialysis_strainer:"",
           chaptalization:"",
+          warsh_count:"",
+          washing_time:"",
         },
 
         anticoagulant: {
@@ -2514,6 +2535,8 @@ mu
           if (minites < 10) {
             minites = '0' + minites
           }
+
+
           if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ||  this.$store.getters.xt_user.org.id == 9970) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
           }else if(this.$store.getters.xt_user.org.id == 9990 || this.$store.getters.xt_user.org.id==10432){
@@ -2588,6 +2611,28 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if (this.$store.getters.xt_user.org.id == 10551){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

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

@@ -245,7 +245,8 @@
                 org_id == 10375 ||
                 org_id == 10485 ||
                 org_id == 10375 ||
-                org_id == 10480) &&
+                org_id == 10480 ||
+                org_id == 10551) &&
                 org_id!=10387
             "
           >
@@ -316,7 +317,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480 )
+               && org_id!=10480  && org_id!=10551 )
               || org_id == 10387
             "
           >
@@ -372,8 +373,8 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480)
-                && org_id!=10387
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551)
+                && org_id!=10387 
             "
           >
             <template slot-scope="scope">
@@ -425,7 +426,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551) ||
               org_id == 10387
             "
           >
@@ -1153,7 +1154,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551) &&
                 org_id!=10387
             "
           >
@@ -1201,7 +1202,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551)
               || org_id == 10387
             "
           >
@@ -1261,7 +1262,8 @@
                 org_id == 10485 ||
                 org_id == 10395 ||
                 org_id == 10375 ||
-                org_id == 10480)
+                org_id == 10480 ||
+                org_id == 10551)
                 && org_id!=10387
             "
           >
@@ -1321,7 +1323,8 @@
               org_id!=10485 &&
               org_id!=10395 &&
               org_id!=10375 &&
-              org_id!=10480
+              org_id!=10480 &&
+              org_id!=10551
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/index.vue

@@ -342,7 +342,7 @@
                   </div>
                   <div class="printCell" style="display:flex;justify-content: space-around;">
                     <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
-                      <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138">ml</span> 
+                      <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138 || $store.getters.xt_user.org.id == 10460">ml</span> 
                       <span v-else>L</span>
                     </span>
                     <span style="display: block;width: 50%;">

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -590,14 +590,16 @@
                   <td width="10">)</td>
                   <td width="50">
                       <div class="under-line">&nbsp;
-                          <span v-if="prescription.anticoagulant==6 || prescription.anticoagulant==7">{{prescription.anticoagulant_zongliang}}</span>
+                          <span v-if="prescription.anticoagulant==6 || prescription.anticoagulant==7 || prescription.anticoagulant==14">{{prescription.anticoagulant_zongliang}}</span>
                       </div>
                   </td>
                   <td width="10">iu</td>
                   <td width="70">
                       <label-box :isChecked="prescription.anticoagulant==1?true:false" showValue='无肝素'></label-box> 
                   </td>
-                  <td></td>
+                  <td  width="100">
+                    <label-box :isChecked="prescription.anticoagulant==14?true:false" showValue='肝素钙'></label-box> 
+                  </td>
                 </tr>
                 </tbody>
               </table>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1127,14 +1127,14 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10460">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1173,7 +1173,7 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -1181,7 +1181,7 @@
                           <span v-if="prescription.anticoagulant == 2">iu/h</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                       </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1246,13 +1246,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -4144,6 +4144,73 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
+
+
+        
+
+        console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
+        if(this.org_id ==10515 || this.org_id == 0){
+          if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+            for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
+              this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
+            }
+         }
+
+
+         let projects = [];
+        response.data.data.projects.map((item) => {
+          if (item.type == 2) {
+            projects.push(item);
+          }
+        });
+        this.projects = projects;
+
+      
+        console.log("this.projects", this.projects);
+
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
+        if(this.projects!=null && this.projects.length >0){
+           for(let i=0;i<this.projects.length;i++){
+             if(this.projects[i].type== 2){
+            
+              this.projects[i].project_team_name = ""
+              this.projects[i].project_team_id = 0
+              console.log("this.projects[i].project.team",this.projects[i].project.team)
+              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                this.projects[i].project_team = this.projects[i].team.project_team
+                this.projects[i].project_team_id = this.projects[i].team.id
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_name =  this.projects[i].team.project_team
+              
+               
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.project[i])
+              }else{
+                this.projects[i].project_team = this.projects[i].project.project_name
+                this.projects[i].advice_name = this.projects[i].project.project_name
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.projects[i])
+              }
+             
+             }
+             
+           }
+        }
+         
+        }
+      
+        console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
@@ -4178,6 +4245,8 @@ export default {
           this.doctor_advices_2 = doctor_advices_2;
         }
         // console.log(this.advice_groups);
+
+       
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -76,7 +76,7 @@
           <div class="inline_block" v-if="receiverTreatmentAccess.condition!=1">
             门特：
             <div class="under_line" style="width: 30px; text-align: center">
-              <check-box :checked="patientInfo_source_1"></check-box>
+              <check-box :checked="patientInfo_source_3"></check-box>
             </div>
           </div>
           <div class="inline_block" v-if="receiverTreatmentAccess.condition==1">
@@ -1349,24 +1349,24 @@
                       <span>ml/h</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      冲洗量：
+                      Ns冲洗量：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{prescription.pre_impulse?prescription.pre_impulse:""}}
+                        {{prescription.warsh_count?prescription.warsh_count:""}}
                       </div>
                       <span>ml</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      冲洗时间：
+                      q：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
                         {{
-                          prescription.sodium_bicarbonate_flow
-                            ? prescription.sodium_bicarbonate_flow
+                          prescription.washing_time
+                            ? prescription.washing_time
                             : ""
                         }}
                       </div>
@@ -3100,7 +3100,14 @@
         <!-- 患者签名 -->
         <div style="position: relative; left: 70%;top: 30px;">
           患者签名：
-          <div class="under_line" style="width: 120px;"></div>
+          <div class="under_line" style="width: 120px;">
+            <img
+              style="height: 30px"
+              :src="dialysisOrder == null? 0: dialysisOrder.url"
+              alt=""
+              srcset=""
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -3356,6 +3363,8 @@ export default {
       patientInfo_gender_2: false,
       patientInfo_source_2: false,
       patientInfo_source_1: false,
+      patientInfo_source_3: false,
+      patientInfo_source_1: false,
       modeOptions: {},
       replacementWays: [],
       perfusionApparatus: [],
@@ -4283,6 +4292,9 @@ export default {
       } else if (this.patientInfo.source == 2) {
         this.patientInfo_source_2 = true;
         this.patientInfo_source_1 = false;
+      } else if (this.patientInfo.source == 3) {
+        this.patientInfo_source_3 = true;
+        this.patientInfo_source_1 = false;
       } else {
         this.patientInfo_source_2 = false;
         this.patientInfo_source_1 = false;

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -33,7 +33,7 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
+    <div class="app-container" style="" v-if="org_id == 10217 ">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

@@ -39,13 +39,13 @@
       <div  style="position: absolute;top:188px;left:120px;">诊疗费</div>
       <div  style="position: absolute;top:188px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:270px;">材料费</div>
-      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div> 
+      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:490px;">护理费</div>
-      <div  style="position: absolute;top:188px;left:570px;">0</div>
+      <div  style="position: absolute;top:188px;left:570px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:225px;left:0px;">注射费</div>
-      <div  style="position: absolute;top:225px;left:60px;">0</div> 
+      <div  style="position: absolute;top:225px;left:60px;">0</div>
       <div  style="position: absolute;top:225px;left:120px;">检查费</div>
       <div  style="position: absolute;top:225px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:225px;left:270px;">输氧费</div>
@@ -160,7 +160,7 @@ export default {
         console.log('res',res)
         this.list = res.data.data
         this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
+          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal + this.list.hiliCostTotal
         if(this.totalPrice == 0){
 
           this.totalPrice = this.list.medfee_sumamt

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -5,7 +5,7 @@
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
           <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
-          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">晁海燕 123456789011234</div>
+          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">{{ doctor_info.user_name }}  {{ doctor_info.doctor_number }} </div>
       </div>
       <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:76+ 'px',}">
           <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
@@ -117,6 +117,7 @@ export default {
           org_name:'',
           page:1,
           pageArr:[],
+          doctor_info:{},
       }
   },
   created(){
@@ -151,6 +152,8 @@ export default {
               this.getPage()
               this.pageArr.push(10)
               console.log('pageArr',this.pageArr.length)
+              this.doctor_info = res.data.data.doctor_info
+              console.log("doc_ON2O2O2O",this.doctor_info)
           })
       },
       smalltoBIG(n) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -437,7 +437,7 @@
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
                   <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
-                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span>
+                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                     <span v-else>L</span>
                     </span>
                   <span style="display: block;width: 50%;">

src/xt_pages/role/admin.vue

@@ -187,6 +187,12 @@
           @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toSendInformaton">生成PDF</el-button> -->
      </div>
     
       
@@ -485,7 +491,7 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
-  ,CreateQianshuUserName,CreateSKDSendInformation} from "@/api/role/admin";
+  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -1047,6 +1053,13 @@ export default {
           var orderId = response.data.data.orderId
         }
       })
+    },
+    toSavePDFInformation(){
+      toSavePDFInformation().then(response=>{
+         if(response.data.data == 1){
+
+         }
+      })
     }
   },
   watch: {

src/xt_pages/user/components/PatientDetail.vue

@@ -1392,6 +1392,7 @@ export default {
       sourceOptions: [
         { value: 1, label: "门诊" },
         { value: 2, label: "住院" },
+        { value: 3, label: "门特" },
       ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
@@ -1631,7 +1632,7 @@ export default {
             if (patietInfo.education_level > 0) {
               this.form.education = patietInfo.education_level;
             }
-            if (patietInfo.source === 1 || patietInfo.source === 2) {
+            if (patietInfo.source === 1 || patietInfo.source === 2 || patietInfo.source === 3) {
               this.form.source = patietInfo.source;
             }
             if (patietInfo.lapseto === 1 || patietInfo.lapseto === 2) {

src/xt_pages/user/components/PatientForm.vue

@@ -1407,7 +1407,7 @@ export default {
       dialogVisible: false,
       // typeOptions: null,
       // styleOptions: null,
-      sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }],
+      sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }, { value: 3, label: "门特" }],
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},

src/xt_pages/user/patients.vue

@@ -404,6 +404,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.source == 1">门诊</span>
             <span v-else-if="scope.row.source == 2">住院</span>
+            <span v-else-if="scope.row.source == 3">门特</span>
             <span v-else>未知</span>
           </template>
         </el-table-column>
@@ -785,6 +786,7 @@
           { value:8,  label:"好转"},
           { value:9,  label:"放弃治疗"},
           { value:10, label:"其他状态"},
+          { value:11, label:"请假"},
         ],
         systemType: 0,
         systemArr: [
@@ -800,14 +802,15 @@
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           // { value: 1, label: "转出", source: 0, lapseto: 2 },
           // { value: 2, label: "留治", source: 0, lapseto: 1 },
-          { value: 3, label: '门诊', source: 1, lapseto: 1 },
-          { value: 4, label: '住院', source: 2, lapseto: 1 }
+          { value: 1, label: '门诊', source: 1, lapseto: 1 },
+          { value: 2, label: '住院', source: 2, lapseto: 1 },
+          { value: 3, label: '门特', source: 3, lapseto: 1 }
         ],
         patientSourceList:[
           {value:0,label:"全部",source:0,lapeseto:0},
           {value:1,label:"门诊",source:1,lapeseto:1},
           {value:2,label:"住院",source:2,lapeseto:2},
-         
+          {value:3,label:"门特",source:3,lapeseto:3},
        ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
@@ -821,6 +824,7 @@
           { value: 8, label: "好转", source: 0, lapseto: 8 },
           { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
           { value: 10, label: "其他状态", source: 0, lapseto: 10 },
+          { value: 11, label: "请假", source: 0, lapseto: 11 },
         ],
         scheduling: [
           {
@@ -1090,6 +1094,8 @@
                         obj['source'] = '1'
                       } else if (results[i][key] == '住院') {
                         obj['source'] = '2'
+                      } else if (results[i][key] == '门特') {
+                        obj['source'] = '3'
                       } else {
                         obj['source'] = '0'
                       }
@@ -1407,6 +1413,8 @@
            return "放弃治疗"
         }else if (row.lapseto == 10){
            return "其他状态"
+        }else if(row.lapseto == 11){
+          return "请假"
         }
       },
       getPatientSource(val){
@@ -1430,6 +1438,8 @@
            return "放弃治疗"
         }else if (val == 10){
            return "其他状态"
+        }else if (val == 11){
+           return "请假"
         }
       },
       openWechatBindDialog() {