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

package.json

@@ -56,15 +56,15 @@
     "jsbarcode": "^3.11.5",
     "jsonlint": "1.6.3",
     "jspdf": "^2.5.1",
-    "jszip": "3.1.5",
+    "jszip": "^3.10.1",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
     "qrcodejs2": "0.0.2",
-    "sass-loader": "^7.0.0",
+    "sass-loader": "^7.3.1",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",
     "showdown": "1.8.5",
@@ -101,7 +101,7 @@
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "css-loader": "0.28.7",
-    "eslint": "4.13.1",
+    "eslint": "^6.8.0",
     "eslint-friendly-formatter": "3.0.0",
     "eslint-loader": "1.9.0",
     "eslint-plugin-html": "4.0.1",
@@ -123,7 +123,7 @@
     "sass-resources-loader": "^1.3.4",
     "script-loader": "^0.7.2",
     "semver": "5.4.1",
-    "shelljs": "0.7.8",
+    "shelljs": "^0.8.5",
     "svg-sprite-loader": "3.5.2",
     "uglifyjs-webpack-plugin": "1.1.3",
     "url-loader": "0.6.2",

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/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
 
             }

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
             }
           })

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">
@@ -122,6 +122,44 @@
                 {{ "/" }}
               </div>
             </div>
+            <div class="inline_block" style="flex: 1">
+              本次透析日期：
+              <div
+                class="under_line"
+                style="width: 120px; text-align: center"
+              >
+                {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
+              </div>
+            </div>
+            <div class="inline_block" style="flex: 1">
+              透析次数：
+              <div
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                  record.patient.total_dialysis +
+                  record.patient.user_sys_before_count
+                    ? record.patient.total_dialysis +
+                      record.patient.user_sys_before_count
+                    : "/"
+                }}
+              </div>
+
+              <div
+                v-if="org_id ==10234 || org_id ==10121"
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                    record.Count +
+                    record.patient.user_sys_before_count
+                      ?  record.Count +
+                        record.patient.user_sys_before_count
+                      : "/"
+                  }}
+              </div>
+            </div>
           </div>
           <div class="row">
             <div class="inline_block">
@@ -176,66 +214,6 @@
                 </tr>
                 <tr>
                   <td colspan="2">
-                    <div
-                      class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                    >
-                      <div class="inline_block" style="flex: 1">
-                        本次透析日期：
-                        <div
-                          class="under_line"
-                          style="width: 120px; text-align: center"
-                        >
-                          {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex: 1">
-                        透析次数：
-                        <div
-                          v-if="org_id!=10234 && org_id!=10121"
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          {{
-                            record.patient.total_dialysis +
-                            record.patient.user_sys_before_count
-                              ? record.patient.total_dialysis +
-                                record.patient.user_sys_before_count
-                              : "/"
-                          }}
-                        </div>
-
-                        <div
-                          v-if="org_id ==10234 || org_id ==10121"
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          {{
-                              record.Count +
-                              record.patient.user_sys_before_count
-                                ?  record.Count +
-                                  record.patient.user_sys_before_count
-                                : "/"
-                            }}
-                        </div>
-                      </div>
-                      <div class="inline_block" style="flex: 1">
-                        透前症状：
-                        <div
-                          class="under_line"
-                          style="width: 150px; text-align: center"
-                        >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .symptom_before_dialysis
-                              ? record.assessment_before_dislysis
-                                  .symptom_before_dialysis
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-                    </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px">
                       <div class="inline_block">
@@ -851,68 +829,22 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
-                        衣物重：
+                      <div class="inline_block" style="flex: 1">
+                        透前症状：
                         <div
                           class="under_line"
-                          style="width: 70px; text-align: center"
+                          style="width: 150px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.additional_weight
-                              ? record.assessment_before_dislysis.additional_weight
+                            record.assessment_before_dislysis
+                              .symptom_before_dialysis
+                              ? record.assessment_before_dislysis
+                                  .symptom_before_dialysis
                               : "/"
                           }}
                         </div>
                       </div>
-                      <div
-                        class="inline_block"
-                        style="flex: 1"
-                        v-if="org_id == 9538"
-                      >
-                        血浆分离器：
-                        <div
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          <span
-                            v-if="
-                              record.prescription.plasma_separator
-                                ? record.prescription.plasma_separator != 0 &&
-                                  record.prescription.plasma_separator != '0'
-                                : false
-                            "
-                            >{{ record.prescription.plasma_separator }}</span
-                          >
-                          <span v-else>/</span>
-                        </div>
-                      </div>
-                      <div
-                        class="inline_block"
-                        style="flex: 1"
-                        v-if="org_id == 9538"
-                      >
-                        胆红素吸附柱：
-                        <div
-                          class="under_line"
-                          style="width: 70px; text-align: center"
-                        >
-                          <span
-                            v-if="
-                              record.prescription.bilirubin_adsorption_column
-                                ? record.prescription
-                                    .bilirubin_adsorption_column != 0 &&
-                                  record.prescription
-                                    .bilirubin_adsorption_column != '0'
-                                : false
-                            "
-                            >{{
-                              record.prescription.bilirubin_adsorption_column
-                            }}</span
-                          >
-                          <span v-else>/</span>
-                        </div>
-                      </div>
                     </div>
 
                     <div
@@ -1261,6 +1193,7 @@
                           >mg</span
                         >
                       </div>
+                      
                       <div class="inline_block" style="margin-left: 20px">
                         透析机号：
                         <div
@@ -1293,29 +1226,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
@@ -1749,7 +1679,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402">
+                <tr >
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1922,150 +1852,6 @@
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402">
-                  <td style="padding: 0; position: relative" colspan="2">
-                    <table class="inside_table">
-                      <tbody>
-                        <tr style="line-height: 35px; padding: 8px 5px">
-                          <td
-                            colspan="7"
-                            style="
-                              letter-spacing: 5px;
-                              text-align: center;
-                              font-weight: 520;
-                              font-size: 16px;
-                              padding: 6px 8px;
-                              line-height: 30px;
-                            "
-                          >
-                            医嘱内容
-                          </td>
-                        </tr>
-                        <!-- <tr style="line-height:35px;padding:8px 5px;">
-                                            <td colspan="4" style="font-size: 16px">开医嘱</td>
-                                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                            </tr> -->
-                        <tr style="line-height: 35px; padding: 8px 5px">
-                          <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" colspan="2" width="45%">
-                            医嘱内容
-                          </td>
-                          <td style="font-size: 16px" width="10%">医生签名</td>
-                          <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" width="10%">
-                            执行人签名
-                          </td>
-
-                        </tr>
-                        <!-- <template v-for="group in doctor_advices" > -->
-
-                        <template v-if="record.advices">
-                          <tr
-                            v-for="(advice, advice_index) in record.his_advices"
-                            :key="advice_index"
-                          >
-                            <td height="35px">
-                              <span v-if="advice.start_time">
-                                {{ getTime(advice.start_time, "{h}:{i}") }}
-                              </span>
-                            </td>
-
-                            <td
-                              height="35px"
-                              colspan="2"
-                              class="advice-name"
-                              style="padding-left: 7px"
-                            >
-                              <span v-if="advice.parent_id > 0">---></span>
-                              <span>{{ advice.advice_name }}</span>
-
-                              <span
-                               v-if="advice && advice.advice_desc"
-                              >
-                                ({{ advice.advice_desc
-                                }}{{ advice.drug_spec_unit }} )
-                              </span>
-
-                              <span v-if="advice.prescribing_number"
-                                >&nbsp;&nbsp; {{ advice.prescribing_number
-                                }}{{ advice.prescribing_number_unit }}</span
-                              >
-                              <span v-if="advice.single_dose != 0">
-                                {{ advice.single_dose
-                                }}{{ advice.single_dose_unit }}</span
-                              >
-
-                              <span v-if="advice.parent_id == 0">{{
-                                advice.delivery_way
-                              }}</span>
-                              <span v-if="advice.parent_id == 0">{{
-                                advice.execution_frequency
-                              }}</span>
-                              <span
-                                v-if="
-                                  advice.parent_id == 0 &&
-                                  advice.remark.length > 0
-                                "
-                                >({{ advice.remark }})</span
-                              >
-                            </td>
-
-                            <td height="35px">
-                              <span
-                                v-if="
-                                  setAdminUserES(advice, 'advice_doctor') ==
-                                  ''
-                                "
-                                >{{
-                                  getAdminUser(advice, "advice_doctor")
-                                }}</span
-                              >
-                              <img
-                                class="es-img"
-                                :src="
-                                  setAdminUserES(advice, 'advice_doctor')
-                                "
-                                alt=""
-                                srcset=""
-                                v-else
-                                style="height: 40px"
-                              />
-                            </td>
-                            <td height="35px">
-                              <span v-if="advice.execution_time">{{
-                                getTime(advice.execution_time, " {h}:{i}")
-                              }}</span>
-                            </td>
-                            <td height="35px">
-                              <span
-                                v-if="
-                                  setAdminUserES(
-                                    advice,
-                                    'execution_staff'
-                                  ) == ''
-                                "
-                                >{{
-                                  getAdminUser(advice, "execution_staff")
-                                }}</span
-                              >
-                              <img
-                                class="es-img"
-                                :src="
-                                  setAdminUserES(advice, 'execution_staff')
-                                "
-                                alt=""
-                                srcset=""
-                                v-else
-                                style="height: 40px"
-                              />
-                            </td>
-                           
-                          </tr>
-                        </template>
-                      </tbody>
-                    </table>
-                  </td>
-                </tr>
               </tbody>
             </table>
           </div>
@@ -2116,6 +1902,7 @@
               <div class="inline_block" style="margin-left: 10px">
                 年龄：
                 <div class="under_line" style="width: 30px; text-align: center">
+                  <!-- {{ record.patient.age }} -->
                   {{ getAge(record.patient) }}
                 </div>
                 岁
@@ -2129,25 +1916,25 @@
               <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">
+              <div class="inline_block" v-if="org_id!=10510">
                 病区：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_zone.name}}
                 </div>
               </div>
-              <div class="inline_block" v-if="org_id!=10460">
+              <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
-                  {{ "/" }}
+                  {{ record.device_number.number }}
                 </div>
               </div>
               <div class="inline_block">
@@ -2161,18 +1948,56 @@
                 <div
                   class="under_line"
                   style="width: 70px; text-align: left"
-                  v-if="record.patient.admission_number"
+                  v-if="record.receive_assessment.admission_number"
                 >
-                  {{ record.patient.admission_number }}
+                  {{ record.receive_assessment.admission_number }}
                 </div>
                 <div
                   class="under_line"
-                  style="width: 70px; text-align: left"
+                  style="width: 70px; text-align: le ft"
                   v-else
                 >
                   {{ "/" }}
                 </div>
               </div>
+              <div class="inline_block" style="flex: 1">
+                本次透析日期：
+                <div
+                  class="under_line"
+                  style="width: 120px; text-align: center"
+                >
+                  {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
+                </div>
+              </div>
+              <div class="inline_block" style="flex: 1">
+                透析次数：
+                <div
+                  class="under_line"
+                  style="width: 70px; text-align: center"
+                >
+                  {{
+                    record.patient.total_dialysis +
+                    record.patient.user_sys_before_count
+                      ? record.patient.total_dialysis +
+                        record.patient.user_sys_before_count
+                      : "/"
+                  }}
+                </div>
+
+                <div
+                  v-if="org_id ==10234 || org_id ==10121"
+                  class="under_line"
+                  style="width: 70px; text-align: center"
+                >
+                  {{
+                      record.Count +
+                      record.patient.user_sys_before_count
+                        ?  record.Count +
+                          record.patient.user_sys_before_count
+                        : "/"
+                    }}
+                </div>
+              </div>
             </div>
             
             <div class="row">
@@ -2660,29 +2485,6 @@
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div
-                        class="inline_block"
-                        style="flex: 1; display: inline-block"
-                      >
-                        衣物重：
-                        <div
-                          class="under_line"
-                          style="
-                            width: 100px;
-                            line-height: 25px;
-                            text-align: left;
-                            margin-left: 2px;
-                            display: inline-block;
-                            white-space: normal;
-                          "
-                        >
-                          {{
-                            record.assessment_after_dislysis && record.assessment_after_dislysis.additional_weight
-                              ? record.assessment_after_dislysis.additional_weight
-                              : "/"
-                          }}
-                        </div>
-                      </div>
                       <div
                         class="inline_block"
                         style="flex: 1; display: inline-block"
@@ -2737,37 +2539,7 @@
                   
                     </div>
 
-                    <div
-                      class="row"
-                      style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 0 || org_id ==10375"
-                    >
-                      <div
-                        class="inline_block"
-                        style="flex: 1; display: inline-block"
-                      >
-                        宣教知识：
-                        <div
-                          class="under_line"
-                          style="
-                            width: 840px;
-                            line-height: 25px;
-                            text-align: left;
-                            margin-left: 2px;
-                            display: inline-block;
-                            white-space: normal;
-                          "
-                        >
-                          {{
-                            record.summer && record.summer.mission
-                              ? record.summer.mission
-                              : "/"
-                          }}
-                        </div>
-                      </div>
-
-                  
-                    </div>
+                   
                   </td>
                 </tr>
                 <tr>

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>

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">
@@ -127,6 +127,30 @@
               {{ "/" }}
             </div>
           </div>
+          <div class="inline_block" style="flex: 1">
+            本次透析日期：
+            <div
+              class="under_line"
+              style="width: 100px; text-align: center"
+            >
+              {{ xtdate }}
+            </div>
+          </div>
+          <div class="inline_block" style="flex: 1">
+            透析次数：
+            <div
+              class="under_line"
+              style="width: 70px; text-align: center"
+            >
+              {{
+                patientInfo.total_dialysis +
+                patientInfo.user_sys_before_count
+                  ? patientInfo.total_dialysis +
+                    patientInfo.user_sys_before_count
+                  : "/"
+              }}
+            </div>
+          </div>
         </div>
         <div class="row">
           <div class="inline_block">
@@ -212,7 +236,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       本次透析日期：
                       <div
                         class="under_line"
@@ -235,20 +259,8 @@
                             : "/"
                         }}
                       </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      透前症状：
-                      <div
-                        class="under_line"
-                        style="width: 150px; text-align: center"
-                      >
-                        {{
-                          predialysis.symptom_before_dialysis
-                            ? predialysis.symptom_before_dialysis
-                            : "/"
-                        }}
-                      </div>
-                    </div>
+                    </div> -->
+                   
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px">
@@ -823,7 +835,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1">
                       透析(滤)器：
                       <!--  透析(滤)器分开取值 -->
                       <div v-if="org_id!=10414"
@@ -856,7 +868,7 @@
 
                     </div>
 
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
+                    <div class="inline_block" style="flex: 1" >
                       灌流器：
                       <div
                         class="under_line"
@@ -870,82 +882,19 @@
                       </div>
                     </div>
 
-                     <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
-                      衣物重：
+                    <div class="inline_block" style="flex: 1">
+                      透前症状：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 150px; text-align: center"
                       >
                         {{
-                          predialysis.additional_weight
-                            ? predialysis.additional_weight
+                          predialysis.symptom_before_dialysis
+                            ? predialysis.symptom_before_dialysis
                             : "/"
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id==10290">
-                      透析器/灌流器：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        {{
-                          prescription.dialyzer_perfusion_apparatus
-                            ? prescription.dialyzer_perfusion_apparatus
-                            : ""
-                        }}
-                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
-                        {{
-                          prescription.dialysis_dialyszers
-                            ? prescription.dialysis_dialyszers
-                            : ""
-                        }}
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id == 9538"
-                    >
-                      血浆分离器：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        <span
-                          v-if="
-                            prescription.plasma_separator
-                              ? prescription.plasma_separator != 0 &&
-                                prescription.plasma_separator != '0'
-                              : false
-                          "
-                          >{{ prescription.plasma_separator }}</span
-                        >
-                        <span v-else>/</span>
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id == 9538"
-                    >
-                      胆红素吸附柱：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        <span
-                          v-if="
-                            prescription.bilirubin_adsorption_column
-                              ? prescription.bilirubin_adsorption_column != 0 &&
-                                prescription.bilirubin_adsorption_column != '0'
-                              : false
-                          "
-                          >{{ prescription.bilirubin_adsorption_column }}</span
-                        >
-                        <span v-else>/</span>
-                      </div>
-                    </div>
                   </div>
 
                   <div
@@ -1263,140 +1212,56 @@
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      透析机号：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          dialysisOrder &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0
-                            ? dialysisOrder.DeviceNumber.number
-                            : patientInfo.DialysisSchedule.device_number.number
-                        }}
-                      </div>
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                    >
-                      透析机型：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
-                      </div>
-                    
-                    </div>
-                  </div>
-
-
-                  <div class="row" style="padding: 2px 0; line-height: 23px">
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5"
-                    >
-                      置换速度：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          prescription.displace_speed
-                            ? prescription.displace_speed
-                            : ""
-                        }}
-                      </div>
-                      <span>ml/h</span>
-                   
-                  
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 20px"
-                      v-if="prescription.anticoagulant != 5"
-                    >
-                    透析液流速：
+                      Ns冲洗量：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
-                          prescription.dialysis_fluid_flow
-                            ? prescription.dialysis_fluid_flow
-                            : ""
-                        }}
+                        {{prescription.warsh_count?prescription.warsh_count:""}}
                       </div>
-                      <span>ml/h</span>
-                   
-                  
+                      <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>
-                      <span>ml/h</span>
-                    </div>
-                    <div class="inline_block" style="margin-left: 20px">
-                      冲洗量：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{prescription.pre_impulse?prescription.pre_impulse:""}}
-                      </div>
-                      <span>ml</span>
+                      <span>h</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
-                      冲洗时间：
+                      透析机号：
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
                         {{
-                          prescription.sodium_bicarbonate_flow
-                            ? prescription.sodium_bicarbonate_flow
-                            : ""
+                          dialysisOrder &&
+                          dialysisOrder.DeviceNumber &&
+                          dialysisOrder.DeviceNumber.number.length > 0
+                            ? dialysisOrder.DeviceNumber.number
+                            : patientInfo.DialysisSchedule.device_number.number
                         }}
                       </div>
-                      <span>h</span>
                     </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223"
-                  >
                     <div
                       class="inline_block"
-                      style="flex: 1; display: inline-block"
-                      v-if="org_id!=9675 && org_id!=10447"
+                      style="margin-left: 20px"
                     >
-                      备注：
+                      透析机型：
                       <div
                         class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
+                        style="width: 50px; text-align: center"
                       >
-                        {{ predialysis.remark ? predialysis.remark : "/" }}
+                       {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
+                    
                     </div>
                   </div>
                 </td>
@@ -1908,7 +1773,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">
@@ -1917,29 +1782,29 @@
                 <check-box :checked="receiverTreatmentAccess.condition == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510">
+            <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447 || org_id == 0 || org_id ==10460">{{
-                patientInfo.DialysisSchedule.device_zone.name
-                  ? patientInfo.DialysisSchedule.device_zone.name
-                  : ""
-              }}</span>
-              <span v-else>{{ "/" }}</span>
-            </div>
+                <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+                  patientInfo.DialysisSchedule.device_zone.name
+                    ? patientInfo.DialysisSchedule.device_zone.name
+                    : ""
+                }}</span>
+                <span v-else>{{ "/" }}</span>
+              </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" >
+            <div class="inline_block" v-if="org_id!=10460">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
-                dialysisOrder &&
-                dialysisOrder.DeviceNumber &&
-                dialysisOrder.DeviceNumber.number.length > 0
-                  ? dialysisOrder.DeviceNumber.number
-                  : patientInfo.DialysisSchedule.device_number.number
-              }}</span>
-              <span v-else>{{ "/" }}</span>
-            </div>
+                <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+                  dialysisOrder &&
+                  dialysisOrder.DeviceNumber &&
+                  dialysisOrder.DeviceNumber.number.length > 0
+                    ? dialysisOrder.DeviceNumber.number
+                    : patientInfo.DialysisSchedule.device_number.number
+                }}</span>
+                <span v-else>{{ "/" }}</span>
+              </div>
             </div>
             <div class="inline_block">
               透析号：
@@ -1947,24 +1812,42 @@
                 {{ patientInfo.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px"
-            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460">
-            住院号/门诊号：
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-if="receiverTreatmentAccess.admission_number"
-            >
-             {{ receiverTreatmentAccess.admission_number }}
+            <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460">
+              住院号/门诊号：
+              <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+                {{ receiverTreatmentAccess.admission_number }}
+              </div>
+              <div class="under_line" style="width: 70px;text-align: left" v-else-if="patientInfo.admission_number">
+                {{ patientInfo.admission_number }}
+              </div>
+              <div class="under_line" style="width: 70px;text-align: left" v-else>
+                {{ "/" }}
+              </div>
             </div>
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-else
-            >
-              {{ "/" }}
+            <div class="inline_block" style="flex: 1">
+              本次透析日期：
+              <div
+                class="under_line"
+                style="width: 100px; text-align: center"
+              >
+                {{ xtdate }}
+              </div>
+            </div>
+            <div class="inline_block" style="flex: 1">
+              透析次数：
+              <div
+                class="under_line"
+                style="width: 70px; text-align: center"
+              >
+                {{
+                  patientInfo.total_dialysis +
+                  patientInfo.user_sys_before_count
+                    ? patientInfo.total_dialysis +
+                      patientInfo.user_sys_before_count
+                    : "/"
+                }}
+              </div>
             </div>
-          </div>
           </div>
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
@@ -2433,138 +2316,11 @@
                       <span v-if="org_id ==9675||org_id==10447">L</span>
                     </div>
                   </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      动脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.arterial_tube == 0">/</span>
-                        <span v-if="afterdialysis.arterial_tube == 1"
-                          >动脉管道0</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 2"
-                          >动脉管道+</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 3"
-                          >动脉管道++</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 4"
-                          >动脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      静脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.intravenous_tube == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 1"
-                          >静脉管道0</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 2"
-                          >静脉管道+</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 3"
-                          >静脉管道++</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 4"
-                          >静脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      并发症：
-                      <div
-                        class="under_line"
-                        style="width: 170px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.complication
-                            ? afterdialysis.complication
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      穿刺处血肿：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 1"
-                          >有</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 2"
-                          >无</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-A端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-V端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
-                      </div>
-                    </div>
-                  </div>
 
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      衣物重：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          afterdialysis.additional_weight
-                            ? afterdialysis.additional_weight
-                            : "/"
-                        }}
-                      </div>kg
-                    </div>
                     <div
                       class="inline_block"
                       style="flex: 1; display: inline-block"
@@ -2618,98 +2374,6 @@
                       </div>
                     </div>
                   </div>
-                  <div
-                    v-if="org_id!=10460"
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      宣教知识：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          summary.mission
-                            ? summary.mission
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223&&org_id!=9538&&org_id!=9675"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                      v-if="org_id!=9675 && org_id!=10447"
-                    >
-                      备注：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.remark ? afterdialysis.remark : "/" }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 9538||org_id == 9675 || org_id == 0"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      中心静脉导管封管：A端<div
-                        class="under_line"
-                        style="
-                          width: 60px;
-                          line-height: 25px;
-                          text-align: center;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
-                      </div>ml,V端<div
-                        class="under_line"
-                        style="
-                          width: 60px;
-                          line-height: 25px;
-                          text-align: center;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
-                      </div>ml
-                      
-                    </div>
-                  </div>
                 </td>
               </tr>
               <tr>
@@ -2718,8 +2382,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                   <div v-if="org_id == 0 || org_id == 10440">
-    
+                   <!-- <div>
                     <div class="inline_block" style="flex: 1">
                       上机护士：
                       <div
@@ -2759,10 +2422,8 @@
                         />
                       </div>
                     </div>
-                  
-                  
-                  </div>
-                  <div v-if="org_id!=0 && org_id!=10440">
+                  </div> -->
+                  <div>
                     <div class="inline_block" style="flex: 1">
                       穿刺护士：
                       <div
@@ -2804,11 +2465,11 @@
                     </div>
                   </div>
                    
-                  <div v-if="org_id==0||org_id==10440">
+                  <!-- <div v-if="org_id==0||org_id==10440">
                     
                     <div class="inline_block" style="flex: 1">                 
                      <div>
-                      <span>责任护士：</span> 
+                      责任护士： 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"
@@ -2851,9 +2512,9 @@
 
                     </div>
 
-                  </div>
+                  </div> -->
 
-                  <div v-if="org_id!=0&&org_id!=10440">
+                  <div>
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10414">责任护士：</span> 
                       <span v-else>治疗护士：</span> 
@@ -3098,9 +2759,16 @@
           <!-- <div  class="print-yema">1</div> -->
         </div>
         <!-- 患者签名 -->
-        <div style="position: relative; left: 70%;top: 30px;">
+        <div style="position: relative; left: 70%;top: 50px;">
           患者签名：
-          <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 +3024,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 +3953,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

@@ -10,11 +10,11 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id !=0" >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
             <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -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/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/evaluationtool/Fallassessment.vue

@@ -103,8 +103,8 @@
                       <td class="start">自理能力</td>
                       <td>
                         <div class="jiange">
-                          <span v-for="item in zilinl" class="rightjiange">
-                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                          <span v-for="item in zilinl" class="rightjiange" @change="handleCheckedCitiesChange">
+                            <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
                           </span>
                         </div>
                         
@@ -143,7 +143,7 @@
                 <div>
                   <span>评估日期：</span>
                   <el-date-picker
-                    v-model="value1"
+                    v-model="pingdate"
                     type="date"
                     placeholder="选择日期"
                     :clearable="false"
@@ -152,7 +152,7 @@
                 </div>
                 <div>
                   <span>护士：</span>
-                  <el-select v-model="value" placeholder="请选择" >
+                  <el-select v-model="Nurse" placeholder="请选择" >
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -409,13 +409,13 @@
     data() {
       return {
         patient_id:0,
-        value1:'',
-        value:'',
+        pingdate:'',
+        Nurse:'',
         input:'',
         tumble_Totalpoints:0,
         options:[],
         checkList:[],
-        nianlin:['≥65岁（1分）','<65（1分）'],
+        nianlin:['≥65岁（1分）','<65（0分）'],
         jiwnag:['有跌倒史（2分）','有坠床史（2分）','晕厥（2分）','低血压（2分）'],
         yishizt:['烦躁（4分）','谵妄（3分）','嗜睡（2分）','模糊（2分）','痴呆（2分）','昏迷（1分）'],
         ganguan:['头晕（4分）','视觉障碍（2分）','听力障碍（2分）'],

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() {

src/xt_pages/workforce/components/editTableData.vue

@@ -160,7 +160,7 @@
               min-width="60"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               prop="cut"
@@ -168,7 +168,7 @@
               min-width="50"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               :label="'周一 (' + weekTitle[0] + ')'"
@@ -1345,7 +1345,7 @@
           </el-option>
         </el-select>
 
-       
+
       </div>
       <span slot="footer" class="dialog-footer" style="text-align: center">
         <el-button
@@ -1385,7 +1385,7 @@
           <el-form-item label="" prop="mode_id">
             <span>透析模式:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.mode_id"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1400,11 +1400,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          
+
           <!-- <el-form-item>
             <span>透析班次:</span>
             <el-select
-                filterable 
+                filterable
                 v-model="changeSchedule.schedule_type"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1419,11 +1419,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-        
+
           <el-form-item>
             <span>透析分区:</span>
             <el-select
-            filterable 
+            filterable
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
@@ -1442,7 +1442,7 @@
           <el-form-item>
             <span>透析床位:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.bed_id"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1753,7 +1753,7 @@
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
       </span>
     </el-dialog>
-    
+
   </div>
 </template>
 
@@ -3141,7 +3141,7 @@ export default {
       }else{
         this.cur_info.contagions = []
       }
-     
+
       this.patient_id_hover = row.id
     },
     // 选择透析模式
@@ -3238,6 +3238,7 @@ export default {
               id : row[key].schedule_id,
               contagions: row[key].patient_contagions,
             }
+            console.log('4444444',row[key].schedule_id);
           }else{
             this.cur_drag_obj = 3
             this.cur_drag_info={
@@ -3331,12 +3332,14 @@ export default {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
         } else {
+          console.log('11111111111',response.data);
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
           this.getSchedules();
         }
       });
+
     },
     // 交换位置
     changeSchTwo(){
@@ -3352,6 +3355,7 @@ export default {
             this.$message.error(response.data.msg);
             this.tipDialogVisibleThree = false
           } else {
+            console.log('22222222',response.data);
             this.$message.success("交换成功");
             this.tipDialogVisible = false
             this.tipDialogVisibleThree = false
@@ -3382,6 +3386,7 @@ export default {
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
+          console.log('ffffffffffff',this.currentData);
           // let nowDate = new Date();
           // let date = {
           //       year: nowDate.getFullYear(),
@@ -3391,8 +3396,8 @@ export default {
           //   let Month=date.month<10 ? '0'+ date.month :  date.month
           //   let Dateday= date.date<10 ? '0'+date.date : date.date
           //   this.systemDate = date.year + '-'+ Month + '-'+ Dateday;
-          // console.log('this.currentData的数据',this.currentData);
-          // console.log('this.cur_drag_info的数据',this.cur_drag_info);
+          console.log('this.currentData的数据',row[key].patient_id);
+          console.log('this.cur_drag_info的数据',key);
           // console.log('123453545',this.systemDate);
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
@@ -3421,9 +3426,9 @@ export default {
                       that.currentData.patient_id = that.cur_drag_info.patient_id
                       that.currentData.patient = that.cur_drag_info.patient_name
                        that.currentData.contagions = that.cur_drag_info.contagions
-                        console.log("中国hshshshshhs",that.cur_drag_info.contagions)
+                        console.log("中国hshshshshhs",that.cur_drag_info.id)
+
 
-                      
                         that.setScheduleTwo(this.cur_drag_info.id);
                 }
               }else{ // 非同一天
@@ -3450,7 +3455,7 @@ export default {
         }
       }
     },
-    
+
     // 左边栏选中名字和模式拖动结束后
     taskDraggerEnd(e) {},
     //move回调方法
@@ -3765,8 +3770,8 @@ export default {
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-      // if(columnIndex==1 ){  
-      //   return 'border_bott ' 
+      // if(columnIndex==1 ){
+      //   return 'border_bott '
       // }
       // if(columnIndex==0){
       //   return 'border_left'
@@ -3795,7 +3800,7 @@ export default {
                 row[column.property].patient_id == this.patient_id_hover
             ) {
               return "hover-td schedule-table-cell-disable";
-            } 
+            }
             // if(column.label == '晚'){
             //   return 'evening_border schedule-table-cell-disable'
             // }
@@ -3839,7 +3844,7 @@ export default {
     //       // console.log('33333333333');
     //       return 'border-top: 1px solid aqua;'
     //     }
-    //   } 
+    //   }
     // },
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
@@ -4573,14 +4578,12 @@ export default {
         this.currentData.contagions = row.contagions;
       }
     },
-    // 取消关闭弹窗
-    // closePatientPanel() {
-    //   this.dialogTableVisible = false;
-    //   this.currentData.patient_id = 0;
-    // },
+
     getSchedules() {
       var partionStr = this.partition_id;
+      console.log('66665555',partionStr);
       var arr = this.zoneIdList.join(",");
+      console.log('ccccccc',this.zoneIdList);
       var str = "";
       if (partionStr == 0) {
         str = arr;
@@ -4588,6 +4591,7 @@ export default {
       if (partionStr != 0) {
         str = partionStr.join(",");
       }
+      console.log('qqqqqqq',str);
       const params = {
         weekTime: this.theType,
         patitionid: str,
@@ -4597,7 +4601,7 @@ export default {
       getSchedulesOne(params).then((response) => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-
+          console.log('999990000',response.data.data);
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
@@ -5138,7 +5142,7 @@ export default {
               });
               // this.msDialogVisible = false;
               // this.getAllZones()
-             
+
             }
             this.changing_mode = false;
           }).catch((err) => {
@@ -5402,7 +5406,7 @@ export default {
         default:
           break;
       }
-    },    
+    },
     setScheduleTwo(id_two) {
       console.log("1112222222",this.currentData.contagions.length)
       var that = this;
@@ -5509,7 +5513,7 @@ export default {
             cflag = true;
           }
         });
-      
+
         if (!cflag) {
           this.$confirm(
               "此患者有传染病，与此透析机不匹配，确定在此排班吗?",
@@ -5533,7 +5537,7 @@ export default {
         } else {
           this.CreateSchedule(this.currentData.patient_id, this.currentData);
         }
-        
+
       } else if (that.currentData.partition_type > 1) {
         this.$confirm(
             "此患者没有传染病，与此透析机不匹配，确定在此排班吗?",
@@ -5546,7 +5550,7 @@ export default {
         )
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
-              
+
             })
             .catch(() => {
               this.dialogTableVisible=false
@@ -5897,7 +5901,7 @@ export default {
     this.partitions = this.partitionsProp;
 
     var contagions = this.$store.getters.contagions;
- 
+
     if (contagions.length > 0) {
       var that = this;
       contagions.forEach(function (citem) {
@@ -6070,7 +6074,7 @@ textarea{
 .border_left{
   border-left: 1px solid aqua !important;
 }
- 
+
 .evening_border{
   border-right: 1px solid aqua !important;
 }