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

src/api/advice.js

@@ -494,3 +494,11 @@ export function GetLastOrNextDoctorAdvice(params) {
     params: params
   });
 }
+
+export function getSchedualDoctors (params) {
+  return request({
+    url: '/api/schedule/advices',
+    method: 'get',
+    params: params
+  })
+}

src/api/config.js

@@ -119,6 +119,24 @@ export function generateLog(params) {
 
 
 
+export function getAllIsOpenInit() {
+  return request({
+    url: '/api/isopen/init',
+    method: 'get',
+  })
+}
+
+
+export function postXtHisIsOpen(params) {
+  return request({
+    url: '/api/xtconfig/isopen',
+    method: 'post',
+    params: params
+  })
+}
+
+
+
 
 
 

src/api/data.js

@@ -63,9 +63,6 @@ export function getPrintTemplate() {
   })
 }
 
-
-
-
 export function createDictionaryConfig(params) {
   console.log('params', params)
   return request({
@@ -108,7 +105,6 @@ export function updateDictionaryTemplate(params) {
   })
 }
 
-
 export function createBaseDrugLib(params) {
   return request({
     url: '/api/basedruglib/create',
@@ -117,16 +113,14 @@ export function createBaseDrugLib(params) {
   })
 }
 
-
-export function editBaseDrugLib(params,unit) {
+export function editBaseDrugLib(params, unit) {
   return request({
-    url: '/api/basedruglib/edit?unit='+unit,
+    url: '/api/basedruglib/edit?unit=' + unit,
     method: 'post',
     params: params
   })
 }
 
-
 export function getBaseDrugLib(params) {
   return request({
     url: '/api/basedruglib/get',
@@ -135,8 +129,6 @@ export function getBaseDrugLib(params) {
   })
 }
 
-
-
 export function getBaseDrugLibList(params) {
   return request({
     url: '/api/basedruglib/list',
@@ -173,6 +165,13 @@ export function createDrugUnitSafeguard(params) {
   })
 }
 
+export function deleteDurg(params) {
+  return request({
+    url: '/api/drug/basedruglib',
+    method: 'get',
+    params: params
+  })
+}
 
 
 

src/api/dialysis.js

@@ -145,6 +145,7 @@ export function getDialysisRecord(params) {
 }
 
 export function postPrescription(params) {
+  console.log('params', params)
   return request({
     url: '/api/dialysis/prescription',
     method: 'Post',
@@ -218,8 +219,6 @@ export function postTreatmentsummary(params) {
 }
 
 export function postAssessmentAfterDislysis(params, data) {
-  console.log('到了没有', data)
-  console.log('params', params)
   return request({
     url: '/api/dialysis/assessmentafterdislysis',
     method: 'Post',
@@ -242,6 +241,7 @@ export function postDelMonitorInfo(params) {
 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
+  console.log('中国人名', advices)
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',
@@ -277,17 +277,16 @@ export function GetDialysisgoods(params) {
   return request({
     url: '/api/dialysisgoods/get',
     method: 'get',
-    params: params,
+    params: params
 
   })
 }
 
-
 export function GetDialysisGoodStatistics(params) {
   return request({
     url: '/api/goodstatistics/get',
     method: 'get',
-    params: params,
+    params: params
 
   })
 }

src/api/his/his.js

@@ -134,7 +134,7 @@ export function getHisPrescriptionList(params) {
 
 export function getHisPrescriptionInfo(params){
   return request({
-    url:"",
+    url:"/api/hisprescription/info",
     method:"get",
     params:params
   })

src/api/stock.js

@@ -385,9 +385,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
+export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -433,9 +433,9 @@ export function deleteSalesReturnInfo(params) {
   })
 }
 
-export function editSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
+export function editSalesReturnInfo(params, return_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/salesreturn/edit?return_time=' + return_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -473,9 +473,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -489,9 +489,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
+export function editCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -544,8 +544,6 @@ export function getStockDetail(params) {
   })
 }
 
-
-
 export function getPrintStockGood(params) {
   return request({
     url: '/api/print/stock',
@@ -554,7 +552,6 @@ export function getPrintStockGood(params) {
   })
 }
 
-
 export function getWarehouseOutUser(params) {
   return request({
     url: '/api/warehouseout/user',
@@ -562,3 +559,4 @@ export function getWarehouseOutUser(params) {
     params: params
   })
 }
+

src/router/modules/dialysis.js

@@ -38,6 +38,26 @@ export default {
     //     noCache: true
     //   }
     // },
+    {
+      path: '/dialysis/dialysisDoctorAdvice',
+      component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
+      name: '透析医嘱',
+      meta: {
+        title: '透析医嘱',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/doctorAdvicePrint',
+      component: () => import('@/xt_pages/dialysis/doctorAdvicePrint'),
+      name: '透析医嘱打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析医嘱打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/consumableDrugs',
       component: () => import('@/xt_pages/dialysis/consumableDrugs'),

src/store/modules/temp_params.js

@@ -1,11 +1,15 @@
 const temp_params = {
   state: {
-    batch_print_dialysis_record_ids: []
+    batch_print_dialysis_record_ids: [],
+    advice_ids:[],
   },
   mutations: {
     SET_BATCH_PRINT_DIALYSIS_RECORD_IDS: (state, record_ids) => {
       state.batch_print_dialysis_record_ids = record_ids == null || record_ids == undefined ? [] : record_ids
-    }
+    },
+    SET_ADVICE_IDS: (state, record_ids) => {
+      state.advice_ids = record_ids == null || record_ids == undefined ? [] : record_ids
+    },
   },
   actions: {
     SetBatchPrintDialysisRecordIDs({ commit, state }, record_ids) {
@@ -14,6 +18,12 @@ const temp_params = {
         resolve()
       })
     },
+    SetAdviceIDs({ commit, state }, record_ids) {
+      return new Promise((resolve, reject) => {
+        commit('SET_ADVICE_IDS', record_ids)
+        resolve()
+      })
+    },
     ClearBatchPrintDialysisRecordIDs({ commit, state }) {
       return new Promise((resolve, reject) => {
         commit('SET_BATCH_PRINT_DIALYSIS_RECORD_IDS', null)

src/xt_pages/data/basicConfig.vue

@@ -5,43 +5,50 @@
     </div>
     <div class="app-container">
         <p style="font-size:18px">开关配置</p>
-        <div class="configBox">
-            <p>收费发药</p>
-            <p style="font-size:14px;margin-top:5px;">开启收费发药分离后，处方发药的工作需要到收费发药页面完成</p>
-            <p style="margin-top:20px;">收费，发药分离：
-                <el-switch v-model="value"></el-switch>
-            </p>
-        </div>
-        <div class="configBox">
-            <p>药品，耗材出库</p>
-            <p style="font-size:14px;margin-top:5px;">开启药品，耗材出库自动扣减则医生开完医嘱或处方可直接出库，不开启则由发药动作或出库按钮手动出库</p>
-            <div style="display:flex;margin-top:20px;">
-                <p style="margin-right:20px;">药品出库：
-                    <el-switch v-model="value"></el-switch>
-                </p>
-                <p>耗材出库：
-                    <el-switch v-model="value"></el-switch>
-                </p>
-            </div>
-        </div>
-        <div class="configBox">
-            <p style="margin-bottom:20px;">药品有效期预警设置(药品即将失效的预警提示)</p>
-            <el-select v-model="value" placeholder="请选择">
-                <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                </el-option>
-            </el-select>
-        </div>
-        <div class="configBox">
-            <p>处方单价锁定</p>
-            <p style="font-size:14px;margin-top:5px;">开启处方单价锁定后，开处方是无法修改药品或者诊疗项目以及附加费用单价</p>
-            <p style="margin-top:20px;">收费单价锁定：
-                <el-switch v-model="value"></el-switch>
-            </p>
-        </div>
+        <!--<div class="configBox">-->
+            <!--<p>收费发药</p>-->
+            <!--<p style="font-size:14px;margin-top:5px;">开启收费发药分离后，处方发药的工作需要到收费发药页面完成</p>-->
+            <!--<p style="margin-top:20px;">收费，发药分离：-->
+                <!--<el-switch v-model="value"></el-switch>-->
+            <!--</p>-->
+        <!--</div>-->
+      <div class="configBox">
+      <p>血透His互通</p>
+      <p style="font-size:14px;margin-top:5px;">血透His互通</p>
+      <p style="margin-top:20px;">血透His互通
+      <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
+      </p>
+      </div>
+        <!--<div class="configBox">-->
+            <!--<p>药品，耗材出库</p>-->
+            <!--<p style="font-size:14px;margin-top:5px;">开启药品，耗材出库自动扣减则医生开完医嘱或处方可直接出库，不开启则由发药动作或出库按钮手动出库</p>-->
+            <!--<div style="display:flex;margin-top:20px;">-->
+                <!--<p style="margin-right:20px;">药品出库：-->
+                    <!--<el-switch v-model="value" @change="changeFuncTwo"></el-switch>-->
+                <!--</p>-->
+                <!--<p>耗材出库：-->
+                    <!--<el-switch v-model="value"></el-switch>-->
+                <!--</p>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<div class="configBox">-->
+            <!--<p style="margin-bottom:20px;">药品有效期预警设置(药品即将失效的预警提示)</p>-->
+            <!--<el-select v-model="value" placeholder="请选择">-->
+                <!--<el-option-->
+                <!--v-for="item in options"-->
+                <!--:key="item.value"-->
+                <!--:label="item.label"-->
+                <!--:value="item.value">-->
+                <!--</el-option>-->
+            <!--</el-select>-->
+        <!--</div>-->
+        <!--<div class="configBox">-->
+            <!--<p>处方单价锁定</p>-->
+            <!--<p style="font-size:14px;margin-top:5px;">开启处方单价锁定后，开处方是无法修改药品或者诊疗项目以及附加费用单价</p>-->
+            <!--<p style="margin-top:20px;">收费单价锁定：-->
+                <!--<el-switch v-model="value"></el-switch>-->
+            <!--</p>-->
+        <!--</div>-->
         <div class="configBox">
             <p>打印预览设置</p>
             <p style="font-size:14px;margin-top:5px;">开启直接打印后，处方单，售药单，收费发票等打印时跳过预览</p>
@@ -55,6 +62,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getAllIsOpenInit,postXtHisIsOpen } from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -66,14 +74,67 @@ export default {
         { path: false, name: "管理中心" },
         { path: false, name: "基础配置" }
       ],
-      value:false
+      value:false,
+      is_open_xt_his:false,
     };
   },
   methods: {
-    
+    getInitIsOpenConfig(){
+      getAllIsOpenInit().then(
+        response => {
+          if (response.data.state === 1) {
+            if(response.data.data.is_open_xt_his == 1) {
+              this.is_open_xt_his = true
+            }else{
+              this.is_open_xt_his = false
+            }
+
+          } else {
+            this.$message.error(response.data.msg)
+          }
+        }
+      )
+
+    },
+    changeFuncOne(val){
+      if(this.is_open_xt_his){
+        let params={
+          is_open:this.is_open_xt_his
+        }
+        postXtHisIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }else{
+        let params={
+          is_open:this.is_open_xt_his
+        }
+        postXtHisIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }
+
+
+
+    }
+
   },
   created() {
-    
+    this.getInitIsOpenConfig()
+
   }
 };
 </script>

src/xt_pages/data/components/addDrugs.vue

@@ -14,10 +14,10 @@
             <el-form-item label="药品名称 : " prop="drug_name" >
               <el-input v-model="form.drug_name" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拼音 : " prop="pinyin" >
+            <el-form-item label="拼音 : " >
               <el-input v-model="form.pinyin" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="五笔 : " prop="wubi">
+            <el-form-item label="五笔 : " >
               <el-input v-model="form.wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品别名 : " prop="drug_alias">
@@ -407,8 +407,6 @@
 
         rules: {
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur'  }],
-          pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-          wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
           drug_spec: [{ required: true, message: '请填写药品规格',trigger: 'blur' }],
           drug_type: [{ required: true, message: '请填写药品类型',trigger: 'blur' }],

src/xt_pages/data/components/drugs.vue

@@ -78,7 +78,7 @@
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
-          <!--<el-button type="danger" size="small">删除</el-button>-->
+          <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,7 +121,8 @@
     createMedicineInsurancePercent,
     editBaseDrugLib,
     getBaseDrugLib,
-    getBaseDrugLibList
+    getBaseDrugLibList,
+    deleteDurg
   } from '@/api/data'
 
   export default {
@@ -461,7 +462,32 @@
           }
           this.$refs.addDrugs.show(0, this.formValue)
         }
-      }, getList() {
+      }, 
+
+       deleteDurg(id,index){
+         console.log("id",id)
+            this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+              const params = {
+                id:id,
+              }
+            deleteDurg(params).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.list.splice(index, 1);
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("药品已经出库不能删除")
+              }
+            })
+          })
+          .catch(() => {
+          })
+        },
+      getList() {
         let params = {
           page: this.page,
           limit: this.limit,

src/xt_pages/data/druguseTemplate.vue

@@ -315,7 +315,7 @@
                     <el-form-item label="医嘱内容:" required prop="advice_name">
                       <!-- <el-input v-model="templateForm.advice_name"></el-input> -->
 
-                      <el-select
+                      <!-- <el-select
                         v-model="templateForm.advice_name"
                         filterable
                         clearable
@@ -330,7 +330,16 @@
                         :label="item.drug_name"
                         :value="item.drug_name"
                       ></el-option>
-                     </el-select>
+                     </el-select> -->
+
+                      <el-autocomplete
+                          style="width:100%;"
+                          class="inline-input"
+                          v-model="templateForm.advice_name"
+                          :fetch-suggestions="querySearch"
+                          placeholder="请输入内容"
+                          @input="changeDrugName"
+                      ></el-autocomplete>
                     </el-form-item>
                   </el-col>
 
@@ -340,7 +349,7 @@
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
                         <!-- <el-input v-model="templateForm.advice_desc"></el-input> -->
-                         <el-select
+                         <!-- <el-select
                           v-model="templateForm.advice_desc"
                           filterable
                           clearable
@@ -355,7 +364,16 @@
                           :label="item.drug_spec"
                           :value="item.drug_spec"
                         ></el-option>
-                        </el-select>
+                        </el-select> -->
+
+                       <el-autocomplete
+                         style="width:100px;"
+                         class="inline-input"
+                         v-model="templateForm.advice_desc"
+                         :fetch-suggestions="querySearch1"
+                         placeholder="请输入内容"
+                         @input="changeDrugDesc"
+                       ></el-autocomplete>
                       </el-col>
                       <el-col class="line" :span="2">&nbsp;</el-col>
                       <el-col :span="14">
@@ -522,7 +540,6 @@
                           v-model="templateFormEdit.advice_name"
                           :fetch-suggestions="querySearch"
                           placeholder="请输入内容"
-                          @select="handleSelect"
                           @input="changeDrugNameTwo"
                          ></el-autocomplete>
                     </el-form-item>
@@ -537,7 +554,6 @@
                          v-model="templateFormEdit.advice_desc"
                          :fetch-suggestions="querySearch1"
                          placeholder="请输入内容"
-                         @select="handleSelect1"
                          @input="changeDrugDescTwo"
                        ></el-autocomplete>
                       </el-col>
@@ -2325,7 +2341,7 @@
         this.templateFormTwoVisible = false
       }, 
       submitTemplateTwo(formName) {
-       
+        
         this.templateForm['template_id'] = this.current_template_id
         this.templateForm['advice_type'] = this.form.advice_type
        
@@ -2342,7 +2358,8 @@
             return s && s.trim()
           }).join(',')
         }
-
+        console.log("编辑模板",this.templateForm)
+        
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
@@ -2679,7 +2696,7 @@
           template_id: this.current_template_id
         }
         console.log("params---",params)
-        return 
+       
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2812,6 +2829,8 @@
         })
        
     },
+
+
     changeDrugName(name){
        this.current_drug_name = name
        this.templateForm.advice_desc = ''

src/xt_pages/dialysis/PatientBox.vue

@@ -48,18 +48,18 @@
           <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
         </div>
       </div>
-      <div class="function" :class="functionColor(schedule)">
+      <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>
           <li>
-            <span class="iconfont">&#xe6f5;</span>班次 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f5;</span>班次 :
             {{ timeTypeText(schedule) }}
           </li>
           <li>
-            <span class="iconfont">&#xe6de;</span>床位号 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6de;</span>床位号 :
             {{ schedule.device_number.number }}
           </li>
           <li>
-            <span class="iconfont">&#xe6f6;</span>透析模式 :
+            <span class="iconfont" :id="modeColor(schedule.mode_id)">&#xe6f6;</span>透析模式 :
             {{
               schedule.mode_id &&
               $store.getters.treatment_mode[schedule.mode_id]
@@ -211,7 +211,8 @@ export default {
       headNurses: [],
       lastDialysisPrescribe: { id: 0 },
       temp_schedual: null,
-      date:''
+      date:'',
+      modedata:0,
     };
   },
   props: {
@@ -588,8 +589,11 @@ export default {
       this.$emit("advice");
     },
     open(schedual){
+      console.log("中国2222222",this)
+     
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id
+      this.modedata = 1
       this.getScheduleDetail()
       // this.getLongAdvice()
       this.$refs.prescription.show(this.prescription,schedual);
@@ -614,6 +618,15 @@ export default {
       
       let strDate = h  + ':' + m;
       return strDate;
+    },
+    modeColor (id) {
+      if (id == 1) {
+
+      } else if (id == 2) {
+        return 'modeRed'
+      } else if (id == 3) {
+        return 'modePurple'
+      }
     }
   },
 };
@@ -767,4 +780,10 @@ export default {
 .red {
   border: 1px #ff7979 solid;
 }
+#modeRed{
+  color:#ed5555;
+}
+#modePurple{
+  color: #53b86e;
+}
 </style>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -525,7 +525,7 @@ export default {
       console.log(val);
       this.$router.push({
         path: "/dialysis/details",
-        query: { patient_id: val.patient_id, date: val.sch_time_int }
+        query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
       });
     },
     handleSelectionChange(val) {
@@ -568,6 +568,7 @@ export default {
       }
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
+        console.log("2222",response.data.data.schedule)
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -582,14 +583,10 @@ export default {
                 bp: []
               };
 
-              SchedualPatientsTable["sch_id"] =
-                response.data.data.schedule[i].id;
-              SchedualPatientsTable["sch_time_int"] =
-                response.data.data.schedule[i].schedule_date;
-              SchedualPatientsTable["sch_time"] = parseTime(
-                response.data.data.schedule[i].schedule_date,
-                "{y}-{m}-{d}"
-              );
+              SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
+              SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
+              SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
+              SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
               SchedualPatientsTable["dialysis_no"] =
                 response.data.data.schedule[i].patient.dialysis_no;
               SchedualPatientsTable["name"] =
@@ -604,8 +601,7 @@ export default {
                 response.data.data.schedule[i].patient_id;
               SchedualPatientsTable["mode_name"] =
                 response.data.data.schedule[i].treatment_mode.name;
-              SchedualPatientsTable["target_ultrafiltration"] =
-                response.data.data.schedule[i].prescription.target_ultrafiltration;
+              SchedualPatientsTable["target_ultrafiltration"] = response.data.data.schedule[i].prescription.target_ultrafiltration;
               if (
                 response.data.data.schedule[i].assessment_before_dislysis.id > 0
               ) {
@@ -643,6 +639,7 @@ export default {
               }
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
+              console.log("中国222222",this.SchedualPatientsTableData)
             }
           }
         }

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -15,8 +15,8 @@
           <span class="content">{{
             replacement_total != "0" ? replacement_total : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
 
         </li>
 
@@ -81,8 +81,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -291,6 +291,7 @@
 
       </ul>
     </div>
+    <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>
   </div>
 </template>
 
@@ -321,6 +322,9 @@ export default {
     }
   },
   computed: {
+    note: function () {
+      return this.getValueStr('remark', 'remark')
+    },
     target_ultrafiltration: function() {
       var v = this.getValueStr(
         'target_ultrafiltration',

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27  &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -588,7 +588,13 @@
               <el-input v-model="form.dosage_of_anticoagulants"></el-input>
           </el-form-item>
         </el-col>
+        
 
+        <el-col :span="8" v-if="isShow('并发症其他')">
+          <el-form-item label="并发症其他: ">
+            <el-input v-model="form.other_complication"></el-input>
+          </el-form-item>
+        </el-col>
 
       </el-form>
 
@@ -742,6 +748,7 @@ export default {
         supine_diastolic_blood_pressure:'',
         diastolic_pressure:'',
         additional_weight:'',
+        other_complication:''
       }
     }
   },
@@ -944,6 +951,7 @@ export default {
       data["supine_diastolic_blood_pressure"] = this.form.supine_diastolic_blood_pressure
       data["diastolic_pressure"] = this.form.diastolic_pressure
       data["additional_weight"] = this.form.additional_weight ? parseFloat(this.form.additional_weight) : 0
+      data["other_complication"] = this.form.other_complication
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
           this.loading = false

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

@@ -833,8 +833,12 @@
         }
 
       },
-
+  //  上一方
       AddNewAdvice(name) {
+        for(let i=0;i<this.other_doctor_advices.length;i++){
+           this.other_doctor_advices[i].single_dose = this.other_doctor_advices[i].single_dose.toString()
+           this.other_doctor_advices[i].prescribing_number = this.other_doctor_advices[i].prescribing_number.toString()
+        }
         this.$refs[name].validate(valid => {
           if (valid) {
             var submitForm = {
@@ -844,7 +848,8 @@
               adviceNames: this.other_doctor_advices,
               remark: ''
             }
-
+            console.log("2223333",submitForm)
+           
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
@@ -2205,6 +2210,8 @@
           if (response.data.state == 1) {
 
             var doctor_advices = response.data.data.advices
+            console.log("doctor_advices",doctor_advices)
+           
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -717,15 +717,19 @@ export default {
                           }
                       }
                    }
-                   if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
-                      submitForm.adviceNames[index].way = 2
-                      submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
+                   if(submitForm.adviceNames[index].children.length == 0){
+                     if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
+                       console.log("进来了没有")
+                        submitForm.adviceNames[index].way = 2
+                        submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
+                    }
                    }
+                   
                 }
              }
           }
           console.log("2222",submitForm)
-        
+          
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -1512,6 +1516,7 @@ export default {
          if (response.data.state == 1) {
             this.arr_drug = []
             var medicalList = response.data.data.private_drug_list
+            console.log("medicallist",medicalList)
             var base_drug_list = response.data.data.base_drug_list
             var base_drug_cofig = response.data.data.base_drug_config
             var private_drug_cofig = response.data.data.private_drug_config

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

@@ -206,7 +206,13 @@
               <el-input v-model="assessmentBeforeDislysis.catheter" @focus="showInnerDialog('4')"></el-input>
             </el-form-item>
           </el-col>
+           
 
+          <el-col :span="8">
+            <el-form-item label="导管维护： " v-if="isShow('导管维护')">
+              <el-input v-model="assessmentBeforeDislysis.catheter_maintenance" @focus="showInnerDialog('18')"></el-input>
+            </el-form-item>
+          </el-col>
 
 
 
@@ -697,6 +703,7 @@
           urine_volume:'',
           edema:'',
           special_treatment:'',
+          catheter_maintenance:"",
         },
 
         InnerDialogProps: {
@@ -710,8 +717,8 @@
         machineType: [],
         puncture_ways: '',
         skins:[],
-        pinholings:[]
-
+        pinholings:[],
+        catheter_maintenancelist:[]
       }
     },
     props: {
@@ -978,6 +985,15 @@
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.blood_access_part_id
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+
+           case '18': // 导管维护
+            this.InnerDialogProps.values = this.catheter_maintenancelist
+            this.InnerDialogProps.titles = '导管维护'
+            this.InnerDialogProps.type = 'catheter_maintenance'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.catheter_maintenance
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
@@ -1039,6 +1055,9 @@
           case 'blood_access_part_id':
             this.assessmentBeforeDislysis.blood_access_part_id = val.value.join(',')
            break
+          case 'catheter_maintenance':
+           this.assessmentBeforeDislysis.catheter_maintenance = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -1200,6 +1219,8 @@
       console.log("皮肤",this.skins)
       this.pinholings = getDataConfig('hemodialysis','pinholing')
       console.log("针眼",this.pinholings)
+      this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
+      console.log("导管维护",this.catheter_maintenancelist)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24)">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -97,7 +97,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -223,7 +223,7 @@
 
 
 
-          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)"
+          <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28)"
                   v-show="zhiShow">
             <el-form-item label="置换量(ml)：">
               <el-input
@@ -232,7 +232,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20"
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28"
                   v-show="zhiShow">
             <el-form-item label="置换量(L)：">
               <el-input
@@ -510,6 +510,16 @@
           </el-col>
 
 
+           <el-col :span="8" v-if="isShows('抽血')">
+            <el-form-item label="抽血：">
+
+              <el-input v-model="dialysisPrescription.blood" @focus="showInnerDialog('6')"></el-input>
+
+              
+            </el-form-item>
+          </el-col>
+
+
           <!-- </el-row>
           <el-row :gutter="20" > -->
           <!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
@@ -779,7 +789,7 @@
             <!--</el-form-item>-->
           <!--</el-col>-->
 
-
+           
 
 
 
@@ -1258,6 +1268,7 @@
           heparin_sodium:"", //肝素钠
           nucleoprotamine:"",//鱼精蛋白
           no_heparin_remarks:"",
+          blood:"",
         },
 
         anticoagulant: {
@@ -1277,7 +1288,8 @@
         },
 
         doctorAdvices: [],
-        dialyzerPerfusionApparatus: []
+        dialyzerPerfusionApparatus: [],
+        bloods:[]
       }
     },
     methods: {
@@ -1312,14 +1324,50 @@
             this.InnerDialogProps.selected = arrtwo
             this.InnerDialogProps.isShowTextArea = false
             break
-        }
-      }, innerDialogComfirm: function(val) {
+
+          case '6': // 透析器/灌流器
+
+            this.InnerDialogProps.values = this.bloods
+            this.InnerDialogProps.titles = '抽血'
+            this.InnerDialogProps.type = 'blood'
+            this.InnerDialogProps.selected = this.dialysisPrescription.blood
+            this.InnerDialogProps.isShowTextArea = false
+            // if(this.dialysisPrescription.blood !="" || dialysisPrescription.blood !=undefined ){
+            //     var arr = this.dialysisPrescription.blood
+            //     var newArr =  arr.split(",")
+            //     console.log("抽血",newArr)
+            //     var Arr = []
+            //     for(let i=0;i<newArr.length;i++){
+            //       for(let j=0;j<this.bloods.length;j++){
+            //         var newarr = newArr[i].toUpperCase()
+
+            //         var dialy = this.bloods[j].name.toUpperCase()
+
+            //         if(newarr == dialy){
+            //             Arr.push(this.bloods[j].name)
+            //         }
+            //       }
+            //     }
+            //     var arrtwo = Arr.join(",")
+            //     console.log("Arr",arrtwo)
+            //     this.InnerDialogProps.values = this.bloods
+            //     this.InnerDialogProps.titles = '抽血'
+            //     this.InnerDialogProps.type = 'blood'
+            //     this.InnerDialogProps.selected = arrtwo
+            //     this.InnerDialogProps.isShowTextArea = false
+            //     break
+            // }  
+        }
+      }, 
+      innerDialogComfirm: function(val) {
         this.InnerDialogProps.visibility = false
         switch (val.type) {
           case 'dialyzer_perfusion_apparatus':
             this.dialysisPrescription.dialyzer_perfusion_apparatus = val.value.join(',')
             break
-
+          case 'blood':
+            this.dialysisPrescription.blood = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -1372,7 +1420,7 @@
 
 
         this.treatment_mode = this.$store.getters.treatment_mode
-        console.log("99999",this.treatment_mode)
+        // console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(
           'hemodialysis',
           'perfusion_apparatus'
@@ -1423,6 +1471,11 @@
           'dialyzer_perfusion_apparatus'
         )
 
+        this.bloods = getDataConfig(
+          'hemodialysis',
+          'blood'
+        )
+        console.log("抽血-----",this.bloods)
       //  dialyzerPerfusionApparatus.map(item => {
       //    item.name = item.name.toUpperCase()
       //  })
@@ -1765,7 +1818,6 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last) {
-
         var date = new Date()
         var year = date.getFullYear()
         var month = date.getMonth() + 1
@@ -1838,6 +1890,7 @@
 
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
+          
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
@@ -1920,6 +1973,9 @@
         }
 
         this.is_pre = 1
+
+        console.log("99999",this.prescription.id)
+        console.log("open",this.is_open)
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {
@@ -1935,7 +1991,8 @@
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-
+    
+            console.log("第一")
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1957,6 +2014,7 @@
                 this.hide()
               }
             })
+
           } else if (this.is_open == 1) {
             if (this.targetAdvices.length > 0) {
               // 弹框推送提醒
@@ -1977,7 +2035,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+               console.log("第二")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2020,11 +2078,12 @@
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              // console.log('paramsquerythree', ParamsQuery)
+              console.log('paramsquerythree', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+              console.log("第三")
+              
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2054,6 +2113,7 @@
 
                     remark: ''
                   }
+                   console.log("params--------",params)
                   CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(
                     rs => {
                       var resp = rs.data
@@ -2094,7 +2154,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               // console.log(this.prescription);
-
+              console.log("第四")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2106,7 +2166,7 @@
                     type: 'success',
                     duration: 2000
                   })
-
+ 
                   const prescription_resp = response.data.data.prescription
                   // console.log("aaaaaaa", prescription_resp);
                   var prescription = this.prescription
@@ -2137,7 +2197,7 @@
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
-
+               console.log("第五")
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2180,7 +2240,7 @@
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                console.log("第6")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2229,7 +2289,7 @@
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                 console.log("第七")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2251,6 +2311,7 @@
                       advice_doctor: this.waitUploadAdvices[0].advice_doctor,
                       advice_type: this.waitUploadAdvices[0].advice_type,
                       parent_id: this.patient_id,
+
                       // start_time: uParseTime(this.$route.query.date, '{y}-{m}-{d}'),
                       start_time:
                         uParseTime(this.$route.query.date, '{y}-{m}-{d}') +
@@ -2298,7 +2359,7 @@
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
-
+                console.log("第八")
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg)
@@ -2345,7 +2406,7 @@
             ) {
               ParamsQuery['mode'] = '3'
             }
-
+             console.log("第九")
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -2394,6 +2455,7 @@
         }
 
         this.is_pre = 2
+
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {
@@ -2746,6 +2808,7 @@
                       duration: 2000
                     })
                     const params = {
+                   
                       advices: this.waitUploadAdvices,
                       advice_date: uParseTime(
                         this.$route.query.date,
@@ -3144,7 +3207,10 @@
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
       },
     },
-
+    // created(){
+    //   var org_id =  this.$store.getters.xt_user.template_info.org_id
+    //   console.log("org_id-----",org_id)
+    // },
     watch: {
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0

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

@@ -154,7 +154,10 @@
                   template_id == 21 ||
                   template_id == 22 ||
                   template_id == 23 ||
-                  template_id == 24)
+                  template_id == 24 ||
+                  template_id == 26 ||
+                  template_id == 27 ||
+                  org_id == 9555)
             "
           >
             <template slot-scope="scope">
@@ -184,7 +187,10 @@
                 template_id != 21 &&
                 template_id != 22 &&
                 template_id != 23 &&
-                template_id != 24
+                template_id != 24 &&
+                template_id != 26 &&
+                template_id != 27 &&
+                org_id!=9555
             "
           >
             <template slot-scope="scope">
@@ -195,6 +201,29 @@
               }}
             </template>
           </el-table-column>
+
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="超滤率(ml/h)"
+            width="100"
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26) "
+          >
+            <template slot-scope="scope">
+              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="超滤率(L/h)"
+            width="100"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="sodium_concentration"
             align="center"
@@ -230,7 +259,7 @@
             align="center"
             label="置换率(ml/min)"
             width="120"
-            v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)" >
+            v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)" >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
@@ -241,7 +270,7 @@
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
+            v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26">
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
@@ -251,7 +280,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -262,7 +291,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -316,28 +345,7 @@
           </el-table-column>
 
 
-          <el-table-column
-            prop="displacement_flow_quantity"
-            align="center"
-            label="超滤率(ml/h)"
-            width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) "
-          >
-            <template slot-scope="scope">
-              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="displacement_flow_quantity"
-            align="center"
-            label="超滤率(L/h)"
-            width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
-            </template>
-          </el-table-column>
+          
 
           <el-table-column
             prop="heparin"
@@ -473,12 +481,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -486,7 +494,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -494,7 +502,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -513,22 +521,22 @@
               <el-input v-model="form.dialysate_temperature"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
+          <el-col :span="8" v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26">
             <el-form-item label="置换率(L/h)：">
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)">
+          <el-col :span="8" v-if="isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)">
             <el-form-item label="置换率(ml/min)：">
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') &&  template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20">
+          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)">
             <el-form-item label="置换量(L)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20)">
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)">
             <el-form-item label="置换量(ml)：">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
@@ -785,6 +793,7 @@ export default {
   },
   created() {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     var date = this.$route.query.date
     var patient_id = this.$route.query.patient_id
     this.patient_id = patient_id

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,20 +14,20 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20) " width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -43,6 +43,7 @@
           <td v-if="isShow('血流量')"> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('超滤量')"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }} </td>
+          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
           <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "" }} </td>
@@ -51,7 +52,6 @@
           <td v-if="isShow('电导度')"> {{ monitor.conductivity ? monitor.conductivity : "" }} </td>
           <th v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </th>
           <th v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </th>
-          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
           <th v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </th>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
@@ -83,6 +83,7 @@ export default {
   },
   created() {
     this.template_id = this.$store.getters.xt_user.template_info.template_id
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
   },
   methods: {
     parseTime(time, layout) {

src/xt_pages/dialysis/details/index.vue

@@ -764,6 +764,9 @@ export default {
     }, 1000*50);
   },
   computed: {
+    websocket() {
+      return this.$store.state.user.websocket;
+    },
     steps: function() {
       var steps = [
         { title: '透析处方', finish: false },
@@ -1040,8 +1043,8 @@ export default {
           this.lastDialysisPrescribe = lastDialysisPrescribe
           this.lastDryWeightDislysis = lastDryWeightDislysis
           this.headNurses = headNurses
-          this.system_prescribe = system_prescribe 
-          
+          this.system_prescribe = system_prescribe
+
 
 
           this.niprocart_info = []
@@ -1304,7 +1307,7 @@ export default {
       this.patient_id = schedual.patient_id
       this.date = schedual.schedule_date
       // this.getScheduleDetail();
-      // this.getLongAdvice();
+      this.getLongAdvice();
 
       var patient_id = schedual.patient_id
       var date = schedual.schedule_date
@@ -1653,7 +1656,7 @@ export default {
     websocketSend(data) {
       try {
         this.websocket.send(JSON.stringify(data))
-          
+
       } catch (error) {
         this.showError = true;
         this.showIndex = 4;
@@ -1739,7 +1742,7 @@ export default {
             arr.push(item.patient_id)
           })
           if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
-            
+
             this.showView = false
             this.$router.push({
               path: '/dialysis/details',
@@ -1752,9 +1755,9 @@ export default {
                 showView:false
               }
             })
-            
+
           }else {
-            
+
             this.showView = true
             this.$router.push({
               path: '/dialysis/details',

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -0,0 +1,731 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >打印</el-button>
+    </div>
+    <div class="app-container">
+      <!-- <div class="filter-container">
+        <el-input style="width: 400px;" v-model="searchKey" class="filter-item"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>-->
+      <div class="cell clearfix">
+        <label class="title">
+          <span class="name">日期查询:</span>
+        </label>
+        <el-date-picker
+          v-model="time"
+          prefix-icon="el-icon-date"
+          @change="changeTime"
+          :editable="false"
+          style="width: 250px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="timestamp"
+        ></el-date-picker>
+
+        <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
+      </div>
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">排班班次</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.value == schedulType ? 'active' : ''"
+              @click="selectSchedulType(item.value)"
+              v-for="item in schedulArr"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">分区</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == partitionType ? 'active' : ''"
+              @click="selectPartitionType(item.id)"
+              v-for="item in partitionArr"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        
+
+        
+        
+        <!-- <el-table-column
+          v-if="template_id != 6"
+          prop="checker"
+          min-width="30px"
+          align="center"
+          label="核对人员"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column> -->
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+const moment = require('moment')
+import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
+import { parseTime } from "@/utils";
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getPrintTemplate } from "@/api/data";
+import { getSchedualDoctors } from '@/api/advice'
+
+export default {
+  name: "Patient",
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "透析管理" },
+        { path: false, name: "透析监测" }
+      ],
+      loading: false,
+      time: "",
+
+      search_mode: 1, // 搜索模式 1.日期搜索 2.病人搜索
+      patient_search_keyword: "",
+
+      SchedualPatientsTableData: [],
+      active: true,
+      schedulType: 0,
+      schedulArr: [
+        { value: 0, label: "全部" },
+        { value: 1, label: "上午" },
+        { value: 2, label: "下午" },
+        { value: 3, label: "晚上" }
+      ],
+      template_id: 0,
+
+      partitionType: 0,
+
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 10,
+        schedul_type: 0,
+        partition_type: 0,
+        schedul_time: "",
+        keywords: ""
+      },
+      selecting_schs: [],
+      partitionArr: [],
+
+      scheduleMap:[]
+    };
+  },
+  created() {
+    var date = new Date();
+    this.time = date;
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    if (month < 10) {
+      month = "0" + month;
+    }
+    if (day < 10) {
+      day = "0" + day;
+    }
+    var nowDate = year + "-" + month + "-" + day;
+    var date = new Date(nowDate + " 00:00:00");
+    this.listQuery.schedul_time = date.getTime();
+    this.getAllZone();
+    this.getTemplateInfo();
+    this.requestSchedualDoctors(this.time)
+    // this.template_id = this.$store.getters.xt_user.template_info.template_id;
+  },
+  methods: {
+    getTemplateInfo() {
+      getPrintTemplate().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          var template = response.data.data.template;
+          this.template_id = template.template_id;
+        }
+      });
+    },
+    clickCurrent(val) {
+      console.log(val);
+      this.$router.push({
+        path: "/dialysis/details",
+        query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
+      });
+    },
+    handleSelectionChange(val) {
+      this.selecting_schs = val;
+    },
+
+    selectSchedulType(scheduleType) {
+      // alert(scheduleType);/
+      this.schedulType = scheduleType;
+      this.listQuery.schedul_type = scheduleType;
+      this.requestSchedualDoctors();
+    },
+    selectPartitionType(partitionType) {
+      this.partitionType = partitionType;
+      this.listQuery.partition_type = partitionType;
+      this.requestSchedualDoctors();
+    },
+
+    changeTime() {
+      this.listQuery.schedul_time = this.time;
+      this.requestSchedualDoctors(this.time)
+    },
+    getAllZone: function() {
+      GetAllZone().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.partitionArr = response.data.data.zone;
+          this.partitionArr.unshift({ id: 0, name: "全部" });
+        }
+      });
+    },
+    requestSchedualDoctors (time) {
+        let newTime =  moment(time).format('YYYY-MM-DD')
+        getSchedualDoctors({
+        date: newTime,
+        patient_type: 0,
+        advice_type: 2
+        }).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+            this.admin_users = resp.data.adminUser
+            var schedules = resp.data.scheduals
+            // console.log("schedules",schedules)
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+                item.doctor_advice.map(it =>{
+                    it.name = item.patient.name
+                    it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+        }
+        })
+    },
+    getValue: function(val) {
+      if (val != undefined) {
+        return val.value;
+      } else {
+        return "";
+      }
+    },
+
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getSchedualPatientList();
+    },
+    changeSearchMode: function() {
+      if (this.search_mode == 1) {
+        this.search_mode = 2;
+      } else {
+        this.search_mode = 1;
+      }
+    },
+    searchPatientAction: function() {
+      this.listQuery.keywords = this.patient_search_keyword;
+      console.log(this.patient_search_keyword);
+      if (this.patient_search_keyword.length == 0) {
+        return;
+      }
+      this.getSchedualPatientList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getSchedualPatientList();
+    },
+    batchPrintAction: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
+      // 模板ID为6
+      var sch_ids = [];
+
+      for (let index = 0; index < this.selecting_schs.length; index++) {
+        sch_ids.push(this.selecting_schs[index].patient_id);
+      }
+    //   console.log("sch_ids",sch_ids)
+      this.$store.dispatch("SetAdviceIDs", sch_ids);
+      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime()} });
+
+    },
+    batchPrintActionOne: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
+      var sch_ids = [];
+      for (let index = 0; index < this.selecting_schs.length; index++) {
+        sch_ids.push(this.selecting_schs[index].sch_id);
+      }
+      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
+      if (this.template_id == 2 || this.template_id == 0) {
+        this.$router.push({ path: "/dialysis/print/batch/otherone" });
+      } else if (this.template_id == 1) {
+        this.$router.push({ path: "/dialysis/print/batch" });
+      } else if (this.template_id == 5) {
+        this.$router.push({ path: "/dialysis/print/batch/fiveone" });
+      } else if (this.template_id == 22) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyTwo_one" });
+      }
+    },
+    batchPrintActionTwo: function() {
+      if (this.selecting_schs.length === 0) {
+        this.$message.error("请至少选择一条需要打印的内容");
+        return false;
+      }
+      var sch_ids = [];
+      for (let index = 0; index < this.selecting_schs.length; index++) {
+        sch_ids.push(this.selecting_schs[index].sch_id);
+      }
+      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
+      if (this.template_id == 2 || this.template_id == 0) {
+        this.$router.push({ path: "/dialysis/print/batch/othertwo" });
+      } else if (this.template_id == 1) {
+        this.$router.push({ path: "/dialysis/print/batch" });
+      } else if (this.template_id == 5) {
+        this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
+      } else if (this.template_id == 22) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyTwo_two" });
+      }
+    },
+    compare (property) {
+      return function (a, b) {
+        var value1 = a[property]
+        var value2 = b[property]
+        return value1 - value2
+      }
+    },
+    tableRowClassName({ row, rowIndex }) {
+        // if (row.stop_state == 1 || row.execution_state == 1) {
+        //     return 'stoped-row';
+        // }
+        // return 'success-rows'
+        // row.index = rowIndex
+        // const arr = this.hoverOrderArr
+        // for (let i = 0; i < arr.length; i++) {
+        //   if (rowIndex == arr[i]) {
+        //     return 'success-row'
+        //   }
+        // }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        
+        if (columnIndex === 1) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        if (columnIndex === 2) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+    },
+    adviceNameShow({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 2) {
+          return 'dialysisadvicenamedisplay'
+        } else {
+          return ''
+        }
+    },
+    getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length === 'undefined'
+        ) {
+          return name
+        }
+        var leng = this.admin_users.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == id) {
+            name = this.admin_users[index].name
+            break
+          }
+        }
+        return name
+    },
+    getAdviceContent(row, isChild) {
+        let tempSingleDoseDesc = ''
+        let tempDrugSpecDesc = ''
+        let tempPrescribingNumberDesc = ''
+
+        if (row.prescribing_number) {
+          tempPrescribingNumberDesc =
+            row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if (row.single_dose) {
+          if (this.template_id != 6) {
+            tempSingleDoseDesc =
+              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+          } else {
+            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+          }
+        }
+
+        if (row.advice_desc) {
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+        }
+
+        if (isChild == 1) {
+          // 不是子药
+
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc +
+            ' ' +
+            row.delivery_way +
+            ' ' +
+            row.execution_frequency
+          )
+        } else {
+          // 是子药
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc
+          )
+        }
+    },
+    handleSelectionChange(val){
+        // console.log('val',val)
+        this.selecting_schs = val;
+    }
+  },
+  components: {
+    BreadCrumb
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container {
+  //   margin: 20px;
+  font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .cqd-dataTitle {
+    color: #303133;
+    font-size: 14px;
+    border-bottom: 2px #e4e7ed solid;
+    height: 36px;
+    line-height: 36px;
+    margin: 0 0 25px 0;
+    position: relative;
+  }
+  .cqd-dataTitle::before {
+    position: absolute;
+    left: 0;
+    bottom: -2px;
+    content: "";
+    width: 42px;
+    height: 2px;
+    background: #409eff;
+  }
+  .search-component {
+    width: 500px;
+    .searchBox {
+      width: 300px;
+      height: 36px;
+      line-height: 36px;
+      padding-left: 15px;
+      border: 1px #dcdfe6 solid;
+      border-right: none;
+      outline: none;
+      float: left;
+      border-radius: 6px 0 0 6px;
+      font-size: 14px;
+      color: #333;
+      background: #fff;
+      box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
+    }
+    .searchBtn {
+      background-color: #409eff;
+      color: #fff;
+      font-size: 15px;
+      text-align: center;
+      height: 36px;
+      line-height: 36px;
+      float: left;
+      outline: none;
+      width: 70px;
+      border: none;
+      border-radius: 0 6px 6px 0;
+      font-family: "Microsoft Yahei";
+      cursor: pointer;
+    }
+  }
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+    span {
+      color: #ef2525;
+      font-family: "Arial";
+      padding: 0 2px;
+    }
+  }
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+.el-checkbox__inner::after {
+  height: 10px;
+  left: 7px;
+}
+.el-checkbox__inner {
+  width: 20px;
+  height: 20px;
+}
+</style>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -354,6 +354,59 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 26">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+      <template
+        v-if="
+          org_template_info.template_id == 27 ||
+            org_template_info.template_id == 0
+        "
+      >
+      <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisOnePage"
+            type="primary"
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
+      <template v-if="org_template_info.template_id == 28">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -559,6 +612,21 @@
             v-if="org_template_info.template_id == 25"
           >
           </DialysisPrintOrderTwentyFive>
+          <DialysisPrintOrderTwentySix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 26"
+          >
+          </DialysisPrintOrderTwentySix>
+          <DialysisPrintOrderTwentySeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 27"
+          >
+          </DialysisPrintOrderTwentySeven>
+          <DialysisPrintOrderTwentyEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 28"
+          >
+          </DialysisPrintOrderTwentyEight>
         </div>
       </el-container>
     </div>
@@ -603,9 +671,15 @@ import DialysisPrintOrderTwentyTwo from "./template/DialysisPrintOrderTwentyTwo"
 import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
 import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
+import DialysisPrintOrderTwentySix from "./template/DialysisPrintOrderTwentySix";
+import DialysisPrintOrderTwentySeven from "./template/DialysisPrintOrderTwentySeven";
+import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEight";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentyEight,
+    DialysisPrintOrderTwentySeven,
+    DialysisPrintOrderTwentySix,
     DialysisPrintOrderTwentyFive,
     DialysisPrintOrderTwentyFour,
     DialysisPrintOrderTwentyThree,
@@ -973,6 +1047,27 @@ export default {
           style: style5,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 26) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      } else if (this.org_template_info.template_id == 27) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      } else if (this.org_template_info.template_id == 28) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
@@ -1017,6 +1112,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 27){
+        printJS({
+          printable: "new-dialysis-1",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisTwoPage() {
@@ -1061,6 +1163,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if(this.org_template_info.template_id == 27){
+        printJS({
+          printable: "new-dialysis-2",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     getNumber() {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -0,0 +1,519 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="dialysisTable">
+                <div class="order_title_panl">
+                    <span class="main_title">透析医嘱</span>
+                </div>
+                <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
+                <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
+                    <tr>
+                    <th width="40px">姓名</th>
+                    <th width="40px">透析器</th>
+                    <!-- <th width="50px">类型</th> -->
+                    <th width="50px">开始时间</th>
+                    <th width="100px">医嘱内容</th>
+                    <th width="50px">执行时间</th>
+                    <th width="50px">执行护士</th>
+                    <th width="50px">校对护士</th>
+                    <th width="50px">校对时间</th>
+                    <th width="50px">开嘱医生</th>
+                    <th width="50px">开嘱时间</th>
+                    </tr>
+                    <template v-for="(schedules, zone_name, index) in scheduleMap">
+                    <tr :key="index">
+                        <td>{{ zone_name }}</td>
+                        <!-- <td></td> -->
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <template v-for="schedule in schedules">
+                        <template v-for="(group, group_index) in schedule.new_advice">
+                        <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                            <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}
+                            <br>
+                            （{{ advice.parent_id == 0 ? schedule.dialysis_no : ""}}）
+                            <br>
+                            <span v-if="schedule.mode_id == 1">(HD)</span>
+                            <span v-if="schedule.mode_id == 2">(HDF)</span>
+                            <span v-if="schedule.mode_id == 3">(HD+HP)</span>
+                            <span v-if="schedule.mode_id == 4">(HP)</span>
+                            <span v-if="schedule.mode_id == 5">(HF)</span>
+                            <span v-if="schedule.mode_id == 6">(SCUF)</span>
+                            <span v-if="schedule.mode_id == 7">(IUF)</span>
+                            <span v-if="schedule.mode_id == 8">(HFHD)</span>
+                            <span v-if="schedule.mode_id == 9">(HFHD+HP)</span>
+                            <span v-if="schedule.mode_id == 10">(PHF)</span>
+                            <span v-if="schedule.mode_id == 11">(HFR)</span>
+                            <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
+                            <span v-if="schedule.mode_id == 13">(CRRT)</span>
+                            <span v-if="schedule.mode_id == 14">(腹水回输)</span>
+                                
+                            </td>
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                            {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                            </td>
+                            <!-- <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>-->
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                            {{
+                            advice.parent_id == 0
+                            ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                            : ""
+                            }}
+                            </td>
+                            <td
+                            :class="
+                                advice.parent_id == 0
+                                ? 'advice_content'
+                                : 'subadvice_content'
+                            "
+                            >
+                            <span>{{ advice.advice_name }}</span>
+                            <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
+                            <span v-if="advice.prescribing_number">
+                                {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}
+                            </span>
+                            <span v-if="advice.single_dose">
+                                单次用量 {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}
+                            </span>
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
+                            <span
+                                v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                            >({{ advice.remark }})</span>
+                            </td>
+                            <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
+                            <td>{{ getName(advice.execution_staff) }}</td>
+                            <td>{{ getName(advice.checker) }}</td>
+                            <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
+                            <td>{{ getName(advice.advice_doctor) }}</td>
+                            <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
+                        </tr>
+                        </template>
+                    </template>
+                    </template>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getSchedualDoctors } from '@/api/advice'
+import { parseTime } from '@/utils'
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: '耗材药品' },
+                { path: false, name: '打印' }
+            ],
+            tableData:[],
+            start_time:"",
+            end_time:"",
+            print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+
+            zone_selected: 0,
+            scheduleMap:[],
+            time:''
+        }
+    },
+    methods:{
+        printAction: function() {
+            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
+
+            printJS({
+            printable: 'dialysisTable',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        requestSchedualDoctors (time) {
+            let newTime =  moment(time).format('YYYY-MM-DD')
+            getSchedualDoctors({
+            date: newTime,
+            patient_type: 0,
+            advice_type: 2
+            }).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                this.admin_user = resp.data.adminUser
+                var schedulesArr = resp.data.scheduals
+                let schedules = []
+                var ids = this.$store.getters.temp_params.advice_ids
+                console.log('ids',ids)
+                schedulesArr.map(item => {
+                    if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+                    
+                })
+                // console.log("schedules",schedules)
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+                // console.log('schedules', schedules)
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+                // console.log('arr', arr)
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+                    // console.log(item);
+                    // item.doctor_advice.map((items, i) => {
+                    //   console.log(items);
+                    // });
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+                // console.log('arrTwo', arrTwo)
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+                // console.log('a', a)
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =
+                        schedule.device_number.zone
+                    }
+                }
+
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
+                }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                }
+                
+
+                this.scheduleMap = scheduleMap
+                // console.log(9999999999,this.scheduleMap)
+
+                
+                }
+            })
+        },
+        compare (property) {
+            return function (a, b) {
+                var value1 = a[property]
+                var value2 = b[property]
+                return value1 - value2
+            }
+        },
+        parseTime: function (time, layout) {
+            if (time == 0) {
+                return ''
+            }
+            return parseTime(time, layout)
+        },
+        getName (val) {
+            for (let i = 0; i < this.admin_user.length; i++) {
+                if (this.admin_user[i].id == val) {
+                    return this.admin_user[i].name
+                }
+            }
+        },
+    },
+    computed: {
+    filtedScheduals: function () {
+        var scheduleMap = new Object()
+        if (this.zone_selected == 0) {
+            for (const key in this.scheduleMap) {
+            scheduleMap[key] = this.scheduleMap[key]
+            }
+        } else {
+            var zone_name = this.zones[this.zone_selected].text
+            scheduleMap[zone_name] = this.scheduleMap[zone_name]
+        }
+
+        if (this.schedule_type_selected != 0) {
+            var _scheduleMap = {}
+            for (const key in scheduleMap) {
+            var origin_schedules = scheduleMap[key]
+            var schedules = []
+            for (let index = 0; index < origin_schedules.length; index++) {
+                const schedule = origin_schedules[index]
+                if (schedule.schedule_type == this.schedule_type_selected) {
+                schedules.push(schedule)
+                }
+            }
+            if (schedules.length > 0) {
+                _scheduleMap[key] = schedules
+            }
+            }
+
+            scheduleMap = _scheduleMap
+        }
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            mapArr[i]['new_advice'] = []
+            }
+        }
+
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            var maps = mapArr[i]
+            var resp_advices = maps.doctor_advice
+            if (resp_advices.length > 0) {
+                var newGroupObject = function () {
+                return Object.assign(
+                    {},
+                    {
+                    group_no: 0,
+                    advices: []
+                    }
+                )
+                }
+                var initGroupBlock = function (group, advice) {
+                group.group_no = advice.groupno
+                }
+
+                var advice_groups = []
+                var group = newGroupObject()
+                for (let index = 0; index < resp_advices.length; index++) {
+                const advice = resp_advices[index]
+                if (advice.groupno == 0) {
+                    // 老版本的医嘱
+                    if (advice.parent_id > 0) {
+                    if (advice_groups.length > 0) {
+                        var parent_group = advice_groups[advice_groups.length - 1]
+                        if (parent_group.advices.length > 0) {
+                        if (parent_group.advices[0].id == advice.parent_id) {
+                            parent_group.advices.push(advice)
+                        }
+                        }
+                    }
+                    continue
+                    } else {
+                    if (group.group_no > 0) {
+                        advice_groups.push(group)
+                        group = newGroupObject()
+                    }
+
+                    initGroupBlock(group, advice)
+                    group.advices.push(advice)
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    continue
+                    }
+                } else {
+                    if (group.group_no > 0 && group.group_no != advice.groupno) {
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    }
+                    if (group.group_no == 0) {
+                    initGroupBlock(group, advice)
+                    }
+                    if (group.group_no == advice.groupno) {
+                    group.advices.push(advice)
+                    }
+                }
+                }
+                if (group.group_no > 0) {
+                // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                advice_groups.push(group)
+                }
+                advice_groups = advice_groups
+            } else {
+                advice_groups = []
+            }
+            maps.new_advice = advice_groups
+            }
+        }
+        console.log("222222",scheduleMap)
+        return scheduleMap
+        }
+    },
+    created(){
+      var time = this.$route.query.time
+      this.time = moment(time).format('YYYY-MM-DD')
+      console.log(11,this.$route.query)
+      this.requestSchedualDoctors(time)
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialysisTable{
+    width:960px;
+    margin: 0 auto;
+    text-align: center;
+    border-collapse: collapse;
+}
+.order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+}
+.dialysisTable tr{
+    padding: 10px 0;
+}
+.dialysisTable th {
+    color: #000;
+    padding: 0;
+    margin: 0;
+    height: 30px;
+}
+.dialysisTable tr td {
+    padding: 12px 0;
+}
+.subadvice_content {
+    text-align: left;
+    padding-left: 25px !important;
+    padding-right: 5px !important;
+}
+.advice_content {
+    text-align: left;
+    padding-left: 5px !important;
+    padding-right: 5px !important;
+    padding: 15px 5px !important;
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="dialysis-print-box">
     <div id='new-dialysis-1' class="dialysis-print-order">
-      <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">血液净化治疗记录单</div>
-      <table class="table-box" style="margin-top: 10px;">
+      <div class="order-yy-name"></div>
+      <div class="order-title" style="padding-bottom:10px;padding-top:0;">{{ orgname }}&nbsp;&nbsp;血液净化治疗记录单</div>
+      <table class="table-box">
         <tbody>
           <tr>
             <td width="50">姓 名:</td>
@@ -505,7 +505,7 @@
                     </td>
                     <td width="10">L</td>
                     <td width="20"></td>
-                    <td width="100">实际超滤量:</td>
+                    <td width="100">机面超滤量:</td>
                     <td width="50">
                       <div class="under-line">
                         &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : " " }}
@@ -663,12 +663,6 @@
                         <div class="under-line">&nbsp;{{ prescription.calcium ? prescription.calcium : "" }}</div>
                     </td>
                     <td width="20">mmol/L</td>
-                    <td width="30"></td>
-                    <td width="80">透析液温度:</td>
-                    <td width="50">
-                        <div class="under-line">&nbsp;{{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "" }}</div>
-                    </td>
-                    <td width="10">℃</td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -753,7 +747,7 @@
               透析中护理记录
             </td>
 
-            <td width="100">时间</td>
+            <td width="60">时间</td>
             <td width="40" style="height:20px;line-height:20px">体温<br />℃</td>
             <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
             <td width="40" style="height:20px;line-height:20px">脉搏<br />次/分</td>
@@ -764,12 +758,11 @@
             <td width="60" style="height:20px;line-height:20px">电导度<br />mS/cm</td>
             <td width="60" style="height:20px;line-height:20px">血流量<br />ml/分</td>
             <td width="40" style="height:20px;line-height:20px">液温<br />℃</td>
-            <td width="60" style="height:20px;line-height:20px">钠浓度<br />mmol/L</td>
             <td width="">特殊记录</td>
           </tr>
 
           <tr v-for="monitor in monitors" :key="monitor.id">
-            <td>&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+            <td style="height:40px;line-height:40px;">&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
             <td>&nbsp;{{ monitor.temperature ? monitor.temperature : '' }}</td>
             <td>
               <span v-if="monitor.systolic_blood_pressure || monitor.diastolic_blood_pressure">
@@ -785,9 +778,10 @@
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-            <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td style="text-align:left;padding-left:10px;">
-              &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+              <div style="line-height:20px;text-align: left;display: inline-block;">
+                &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
+              </div>
             </td>
           </tr>
         </tbody>
@@ -911,7 +905,7 @@
                 </tbody>
               </table>
 
-              <table class="table-box" style="margin-bottom:130px;">
+              <table class="table-box" style="margin-bottom:20px;">
                 <tbody>
                   <tr>
                     <!-- <td width="70">其他记录:</td> -->
@@ -960,8 +954,8 @@
       
     </div>
     <div id='new-dialysis-2' class="dialysis-print-order">
-      <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">临时医嘱单</div>
+      <!-- <div class="order-yy-name"></div> -->
+      <div class="order-title">{{ orgname }}&nbsp;&nbsp;临时医嘱单</div>
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
@@ -1816,8 +1810,8 @@ export default {
           if (this.org_template_info.org_id == 9535) {
             this.isShowZero = true
           }
-          if (this.monitors.length < 13) {
-            var nl = 14 - this.monitors.length
+          if (this.monitors.length < 9) {
+            var nl = 10 - this.monitors.length
             for (let index = 0; index < nl; index++) {
               this.monitors.push([])
             }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -29,12 +29,18 @@
           </div>
           岁
         </div>
-        <div class="inline_block">
+        <div class="inline_block" v-if="patientInfo_source_1">
           门诊：
           <div class="under_line" style="width: 30px;text-align: center;">
             <check-box :checked="patientInfo_source_1"></check-box>
           </div>
         </div>
+        <div class="inline_block" v-if="patientInfo_source_2">
+          住院：
+          <div class="under_line" style="width: 30px;text-align: center;">
+            <check-box :checked="patientInfo_source_2"></check-box>
+          </div>
+        </div>
         <div class="inline_block">
           病区：
           <div class="under_line" style="width: 50px;text-align: center;">

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -789,7 +789,7 @@
               <div>
                 <span style="width:70px;display:inline-block">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
-                </span>L
+                </span>ml
               </div>
             </td>
             <td width="100" style="border:none;border-left:1px solid #000;padding-left:5px">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -42,13 +42,16 @@
             </el-select>
           </el-form-item>
           <el-form-item label="诊断:" prop="name">
-            <el-autocomplete
-              style="width:100%;"
-              class="inline-input"
-              v-model="state1"
-              :fetch-suggestions="querySearch"
-              placeholder="请输入内容"
-            ></el-autocomplete>
+
+            <el-select style="margin-right:5px;" v-model="state1" placeholder="">
+              <el-option
+                v-for="(item,index) in sick"
+                :key="index"
+                :label="item.class_name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+
           </el-form-item>
           <el-form-item label="过敏病史: " prop="name">
             <el-autocomplete
@@ -83,7 +86,7 @@
         </div>
         <div class="costBox">
           <span>医生：</span>
-          <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
+          <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
             <el-option
               v-for="(item,index) in doctors"
               :key="index"
@@ -94,15 +97,15 @@
           <span>科室：</span>
           <el-select style="margin-right:5px;" v-model="departmentValue" placeholder="">
             <el-option
-              v-for="(item,index) in getDictionaryDataConfig('system','department')"
+              v-for="(item,index) in department"
               :key="index"
               :label="item.name"
-              :value="item.name">
+              :value="item.id">
             </el-option>
           </el-select>
-          <span>总计：</span>
+          <span>总价：</span>
           <span style="color:red;">{{ getTotal() }}</span>元
-          <span >{{order_status}}</span>
+          <span>{{order_status}}</span>
 
         </div>
       </div>
@@ -116,7 +119,8 @@
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
                 <div style="margin-bottom:5px;display:flex;">
-                  <el-input style="width:50%;"  @keyup.enter.native='searchAction' v-model.trim="search_keyword" placeholder=""></el-input>
+                  <el-input style="width:50%;"  @input="searchAction" @keyup.enter.native='searchAction' v-model.trim="search_keyword"
+                            placeholder="请输入药品名字"></el-input>
                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
                     <el-option
                       label="全部"
@@ -130,7 +134,8 @@
                     </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;flex:1;overflow-y: auto;"
+                <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs'
+                          style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableData"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -152,15 +157,16 @@
                 <div style="margin-bottom:5px;">
                   <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
                   <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
-                      <el-option
+                    <el-option
                       v-for="item in options"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value">
-                      </el-option>
+                    </el-option>
                   </el-select>
                 </div>
-                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;flex:1;overflow-y: auto;"
+                <el-table ref="multipleTableTwo" :data="advices_template" border
+                          style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
@@ -185,7 +191,8 @@
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="项目列表" name="1">
-                <el-table ref="tables" :data="tabProject" border @select='selectChange' style="width: 100%;flex:1;overflow-y: auto;"
+                <el-table ref="tables" :data="tabProject" border @select='selectChange'
+                          style="width: 100%;flex:1;overflow-y: auto;"
                           :row-style="{ color: '#303133' }"
                           @select-all="changeAllGoodInfoTableDataTwo"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -203,7 +210,8 @@
                 </el-table>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
-                <el-table :data="tabPrjectTeam"  border style="width: 100%;flex:1;overflow-y: auto;" :row-style="{ color: '#303133' }"
+                <el-table :data="tabPrjectTeam" border style="width: 100%;flex:1;overflow-y: auto;"
+                          :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row
                           @select='selectTeam'>
@@ -266,7 +274,7 @@
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
-      search_keyword:"",
+      search_keyword: '',
 
       other_sick: {
         type: Array,
@@ -326,17 +334,31 @@
         doctors: [],
         departMent: [],
         curStatus: 0,
-        order_status:"",
+        order_status: '',
         register_types: [
           { id: 1, name: '医保' },
           { id: 2, name: '自费' }
 
-        ]
+        ],
+        department:[],
+        sick:[]
       }
     },
     methods: {
-      searchAction(){
-        console.log(this.search_keyword)
+      searchAction() {
+        if(this.search_keyword.length == 0){
+          this.drugs = this.allDrugs
+        }else{
+          let arr = []
+          for (let i = 0; i < this.drugs.length; i++){
+            if(this.drugs[i].drug_name.indexOf(this.search_keyword) != -1){
+              arr = arr.concat(this.drugs[i])
+            }
+          }
+          this.drugs = arr
+
+        }
+
 
       },
       getTotal() {
@@ -408,6 +430,10 @@
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+
+
 
           }
         })
@@ -485,21 +511,19 @@
         this.departmentValue = info.departments
         this.register_type = info.register_type
 
-        if(info.prescription_status == 1 || info.prescription_status == 2){
-          this.order_status  = "未收费"
+        if (info.prescription_status == 1 || info.prescription_status == 2) {
+          this.order_status = '未收费'
 
         }
 
-        if(info.prescription_status == 3){
-          this.order_status  = "已结算"
+        if (info.prescription_status == 3) {
+          this.order_status = '已结算'
         }
 
-
-        if(info.prescription_status == 4){
-          this.order_status  = "已退费"
+        if (info.prescription_status == 4) {
+          this.order_status = '已退费'
         }
 
-
         // console.log(this.$refs)
         // this.$nextTick(() => {
         //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
@@ -511,7 +535,7 @@
         }
       },
       open(index) {
-        if(this.curPrescriptions.order_status >= 2){
+        if (this.curPrescriptions.order_status >= 2) {
           this.$message.error('当前处方处于结算或者退费状态,无法保存')
           return
         }
@@ -574,22 +598,21 @@
 
       },
       addTab(targetName) {
-        if(this.curPrescriptions.order_status >= 2){
+        if (this.curPrescriptions.order_status >= 2) {
           this.$message.error('该处方已经结算或者退费，无法继续添加处方')
           return
         }
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0 ){
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           this.$message.error('当前处方无数据，新增数据后才能新增处方')
           return
         }
 
-
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
           id: 0,
           name: newTabName,
-          order_status:0,
+          order_status: 0,
           advices: [],
           project: []
 
@@ -599,11 +622,11 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
-        if(this.curPrescriptions.order_status == 2){
+        if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
-        if(targetName == "处方1"){
+        if (targetName == '处方1') {
           this.$message.error('该处方无法删除')
           return
         }
@@ -765,7 +788,7 @@
         this.curDrugs = selection
       },
       comfirm() {
-        if(this.curPrescriptions.order_status >= 2){
+        if (this.curPrescriptions.order_status >= 2) {
           this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
           this.teamList = []
           this.curDrugs = []
@@ -910,7 +933,7 @@
         })
       },
       selectTeam(row) {
-        console.log("row------",row)
+        console.log('row------', row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].project_id)
@@ -936,7 +959,7 @@
         const params = {
           project_id: idstr
         }
-        console.log("params",params)
+        console.log('params', params)
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
@@ -945,6 +968,14 @@
             this.teamList = project
           }
         })
+      },changeDoctor(val){
+        console.log(val)
+        console.log(this.doctors)
+        for (let i = 0; i < this.doctors.length;i++){
+          if(this.doctors[i].admin_user_id == this.doctorValue){
+            this.departmentValue = this.doctors[i].department_id
+          }
+        }
       }
     },
     created() {
@@ -1049,10 +1080,12 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    .el-tabs__content{
-      flex:1;
-      overflow-y: auto;
-    }
+
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
+
   }
 
   .costBox {
@@ -1106,10 +1139,11 @@
   }
 
   }
-  .rightTabs{
+  .rightTabs {
     display: flex;
     flex-direction: column;
   }
+
   .comfirmBox {
     width: 100%;
     height: 60px;
@@ -1165,22 +1199,27 @@
 
   }
   .preTabs {
-    .el-tabs__content{
-      flex:1;
-      overflow-y: auto;
-    }
+
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
+
   }
   .rightTabs {
     height: 100%;
-    .el-tabs__content{
-      flex:1;
-      overflow-y: auto;
-    }
-    .el-tab-pane{
-      display: flex;
-      flex-direction: column;
-      height:100%;
-    }
+
+  .el-tabs__content {
+    flex: 1;
+    overflow-y: auto;
+  }
+
+  .el-tab-pane {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
   }
   #tab-more {
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -44,13 +44,13 @@
             <el-radio-button label="电子处方"></el-radio-button>
             <el-radio-button label="电子病历"></el-radio-button>
           </el-radio-group>
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
+          <div class="mainCell fixedCell" style="float:right" v-show="titleType == '电子处方'">
             <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
             <el-button size="small" ref="button_two"   @click="open(2)" type="primary">打印</el-button>
             <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
             <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
           </div>
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
+          <div class="mainCell fixedCell" style="float:right" v-show="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
@@ -62,9 +62,9 @@
         <desk-prescription  :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            :hisPatientInfo="hisPatientInfo"
-                           v-show="titleType == '处方'" style="flex:1;"></desk-prescription>
+                           v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '病历'" :detalid="detalid" ref="child"></desk-record>
+                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
          <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
          <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -301,12 +301,6 @@
           good_name: [
             { required: true, message: '请输入耗材名称', trigger: 'blur' }
           ],
-          pinyin: [
-            { required: true, message: '请输入拼音', trigger: 'blur' }
-          ],
-          wubi: [
-            { required: true, message: '请输入五笔', trigger: 'blur' }
-          ],
           good_kind: [
             { required: true, message: '请选择耗材种类', trigger: 'change' }
           ],

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -176,6 +176,7 @@ export default {
              this.$message.error("请添加药品规格")
              return
           }
+        
           const params = {
              patient_id:this.patient_id,
              medicineData:this.multipleSelection
@@ -186,6 +187,9 @@ export default {
                 this.$message.success("保存成功")
                 this.visible = false
                 this.$emit('getlist');
+                for(let i=0;i<this.multipleSelection.length;i++){
+                   this.multipleSelection[i].isSelected = false
+                }
              }else {
                 this.$message.error("药品名称规格已存在")
              }

src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue

@@ -31,7 +31,7 @@
                 <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="规格名称">
-                <template slot-scope="scope">{{scope.row.drug_name}}</template>
+                <template slot-scope="scope">{{scope.row.drug_spec}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="出库数量">
                 <template slot-scope="scope">
@@ -130,6 +130,7 @@ export default {
           getDrugDataByPatientId(params).then(response=>{
              if(response.data.state == 1){
                var medicalList = response.data.data.medicalList
+              
                 for(let i=0;i<medicalList.length;i++){
                   medicalList[i].store_number = ""
                   medicalList[i].remarks = ""

src/xt_pages/stock/stockInOrderAdd.vue

@@ -89,7 +89,7 @@
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>单价<span style="color: red">*</span></span>
+              <span>进货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -144,7 +144,7 @@
 
           <el-table-column min-width="23" align="center">
             <template slot="header" slot-scope="scope">
-              <span>单价<span style="color: red">*</span></span>
+              <span>出货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->

src/xt_pages/stock/stockQuery.vue

@@ -38,12 +38,17 @@
             {{ scope.row.good_code }}
           </template>
         </el-table-column>
-        <el-table-column label="商品类型" align="center">
+        <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.good_name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.type.type_name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="规格名称" align="center">
+        <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.specification_name }}</span>
           </template>

src/xt_pages/upload/fast/FastCountry.vue

@@ -1,28 +1,33 @@
 <template>
   <div class="patient-container">
-     <fast-patients-sidebar
+    
+    <el-container>
+      <div style="width:170px">
+        <el-form :inline="true" @submit.native.prevent>
+          <el-form-item label style="margin-bottom:0;">
+            <el-input v-model.trim="searchVal" @keyup.enter.native='onSearch' placeholder="姓名/透析号" style="width:70%"></el-input>
+            <el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>
+          </el-form-item>
+        </el-form>
+        <div style="width:170px">
+          <div class="tableTitle">患者列表</div>
+          <el-table :data="patientData" border style="width: 100%;" height="500" @row-click='handleSelect'>
+            <el-table-column prop="date" label="透析号" width="80" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.dialysis_no }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="姓名" width="90" align="center"></el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <!-- <fast-patients-sidebar
       :id="patientID"
       v-on:patient="patientInfoClick()"
       v-on:inspection="inspectionClick()"
-    ></fast-patients-sidebar>
+    ></fast-patients-sidebar> -->
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
-    <el-container>
-      <!--<div style="width:170px">-->
-        <!--<el-form :inline="true" :model="listQuery">-->
-          <!--<el-form-item label style="margin-bottom:0;">-->
-            <!--<el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>-->
-            <!--<el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>-->
-          <!--</el-form-item>-->
-        <!--</el-form>-->
-        <!--<div style="width:170px">-->
-          <!--<div class="tableTitle">患者列表</div>-->
-          <!--<el-table :data="tableData" border style="width: 100%;" height="500">-->
-            <!--<el-table-column prop="date" label="日期" width="80"></el-table-column>-->
-            <!--<el-table-column prop="name" label="姓名" width="90"></el-table-column>-->
-          <!--</el-table>-->
-        <!--</div>-->
-      <!--</div>-->
-
+      
       <div style="margin-left:20px;flex:1;" >
         <div class="cell clearfix">
           <div class="time">
@@ -36,8 +41,8 @@
             </ul>
           </div>
         </div>
-        <one ref="one" v-if="wayType == 0" :patientID="patientID" :is-edit='true' style="margin-top:28px;" @></one>
-        <two ref="two" v-if="wayType == 1" :id="patientID" :is-edit="true" style="margin-top:28px;"></two>
+        <one ref="one" v-show="wayType == 0" :patientID="patientID" :is-edit='true' style="margin-top:28px;" @></one>
+        <two ref="two" v-show="wayType == 1 && patientID != 0" :id="patientID" :is-edit="true" style="margin-top:28px;"></two>
       </div>
     </el-container>
   </div>
@@ -68,62 +73,14 @@
           id: 0
         },
         isShow: 1,
-        tableData: [
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          },
-          {
-              date: "2016",
-              name: "王小虎"
-          }
-        ],
         searchVal:'',
         way: [
             { value: 0, label: "基本信息", state: 0 },
             { value: 1, label: "检验检查", state: 1 },
         ],
         wayType: 0,
+        patientsList:[],
+        patientData:[]
       }
     },
     created() {
@@ -144,6 +101,7 @@
         fetchAllList().then(response => {
           if (response.data.state == 1) {
             this.patientsList = response.data.data.patients
+            this.patientData = response.data.data.patients
             if (type == 1) {
               this.patientID = this.patientsList[0].id
 
@@ -233,6 +191,26 @@
         var monthEndDate = new Date(nowYear, myMonth + 1, 1)
         var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
         return days
+      },
+      handleSelect(val) {
+        this.$router.push("/upload/fast?id=" + val.id);
+      },
+      onSearch(){
+        if(this.searchVal != ''){
+          let arr = []
+          this.patientsList.map(item => {
+          
+            if(item.name.includes(this.searchVal)){
+              console.log('hhhh')
+              arr.push(item)
+            }
+          })
+          console.log(arr)
+          this.patientData = arr
+        }else if(this.searchVal == ''){
+          this.patientData = this.patientsList
+        }
+        
       }
 
     }

src/xt_pages/upload/fast/FastPatientsSidebar.vue

@@ -29,7 +29,7 @@
       >
       </el-option>
     </el-select>
-    <el-tree
+    <!-- <el-tree
       :data="treeData"
       accordion
       node-key="name"

src/xt_pages/upload/fast/Two.vue

@@ -894,6 +894,9 @@ import { GetUploadInspections, GetInitInspections } from "@/api/inspection";
 export default {
   name: "Two",
   components: {},
+  props:{
+    id:Number
+  },
 
   data() {
     return {
@@ -976,6 +979,7 @@ export default {
     };
   },
   created() {
+    
     var start_time = new Date(
       this.getQuarterStartDate().replace(/-/g, "/")
     ).getTime();
@@ -1302,7 +1306,7 @@ export default {
     },
     xcgChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         1,
@@ -1311,7 +1315,7 @@ export default {
     },
     gkwzChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         2,
@@ -1320,7 +1324,7 @@ export default {
     },
     tdxChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         3,
@@ -1329,7 +1333,7 @@ export default {
     },
     shjcChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         4,
@@ -1338,7 +1342,7 @@ export default {
     },
     yyyyzChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         5,
@@ -1347,7 +1351,7 @@ export default {
     },
     crbxzbChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         6,
@@ -1356,7 +1360,7 @@ export default {
     },
     jhChange(val) {
       this.GetUploadInspections(
-        this.patient_id,
+        this.patient_id != 0 ? this.patient_id : parseInt(this.$route.query.id),
         val[0] / 1000,
         val[1] / 1000,
         7,
@@ -1424,6 +1428,12 @@ export default {
       var days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24);
       return days;
     }
+  },
+  watch:{
+    id(newVal, oldVal){//对引用类型的值无效
+      console.info('value changed 1', newVal)
+      this.patient_id = newVal
+    },
   }
 };
 </script>

src/xt_pages/upload/fast_upload.vue

@@ -6,10 +6,10 @@
     <div class="app-container">
       <div class="service-box">
         <el-tabs v-model="activeName">
-      <el-tab-pane label="国家质控平台" name="first">
+          <el-tab-pane label="国家质控平台" name="first">
            <fast-country></fast-country>
           </el-tab-pane>
-          <el-tab-pane label="省级质控平台" name="first">
+          <el-tab-pane label="省级质控平台">
             <fast-province></fast-province>
           </el-tab-pane>
           <el-tab-pane label="市级质控平台">

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -1410,6 +1410,7 @@ export default {
       this.nameFormTitle = "添加子药内容";
     },
     openGroupAdvice(isEdit) {
+     
       this.isChild = false;
       if (isEdit) {
         if (this.groupSelectRow === null) {
@@ -1450,7 +1451,7 @@ export default {
         if (!this.isChild) {
           this.weeks = this.groupSelectRow.week_day.split(",");
         }
-
+        this.getAdviceConfig(1)
         this.nameFormTitle = "修改医嘱内容";
       } else {
         this.nameForm = {

src/xt_pages/user/dialysisSolution.vue

@@ -1726,7 +1726,10 @@ export default {
     this.blood_filters = this.$store.getters.blood_filters
     this.perfusion_apparatus = this.$store.getters.perfusion_apparatus
     this.hemodialysis_machines = this.$store.getters.hemodialysis_machines
-    this.dialysate_formulation = this.$store.getters.dialysate_formulation
+    this.dialysate_formulation =  getDataConfig(
+          'hemodialysis',
+          'dialysate_formulation'
+    )
     this.body_fluid_option = this.$store.getters.body_fluid
     this.special_medicine_option = this.$store.getters.special_medicine
 

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -2,13 +2,13 @@
     <div >
         <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
             <div slot="content">
-                {{scheduleDetail.patient}}
+                {{scheduleDetail.patient}}11
                 <br/>
                 <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
             </div>
             <div>
-                <span>{{scheduleDetail.patient}}</span><br/>
-                <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
+                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
+                <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
             </div>
         </el-tooltip>
     </div>
@@ -30,5 +30,25 @@ export default {
           },
       },
   },
+  methods:{
+        modeColor(name){
+            if(name == 'HD'){
+
+            }else if(name == 'HDF'){
+                return 'modeRed'
+            }else if(name == 'HD+HP'){
+                return 'modePurple'
+            }
+        }
+  }
 };
 </script>
+
+<style lang="scss" scoped>
+.modeRed{
+  color:#ed5555;
+}
+.modePurple{
+  color: #53b86e;
+}
+</style>

src/xt_pages/workforce/components/tableData.vue

@@ -99,12 +99,13 @@
       @cell-click="clickThis"
       :summary-method="getSummaries"
       show-summary
-      :row-class-name="rowClass"
+      :row-class-name="tableRowClassName"
       :cell-class-name="cellClass"
       sum-text="总数"
       :height="tableContainHeight"
       ref="table"
       style="width: 100%;cursor: pointer;"
+      
     >
       <el-table-column
         prop="area"
@@ -329,6 +330,7 @@
                 v-model="searchKey"
                 placeholder="请输入搜索的内容"
                 style="width:260px"
+                @keyup.enter.native='SubmitSearch'
               ></el-input>
               <el-button
                 type="primary"
@@ -464,8 +466,11 @@
           :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false"
           type="primary"
           @click="submitTiaoX"
-          >保 存</el-button
-        >
+          >
+          <span v-if='tiaoZhengType == 1'>保存</span>
+          <span v-if='tiaoZhengType == 2'>下一步</span>
+          <span v-if='tiaoZhengType == 3'>下一步</span>
+          </el-button>
       </span>
     </el-dialog>
     <el-dialog
@@ -626,7 +631,7 @@ export default {
     return {
       // tableContainHeight:400,
       // tableHeight:'window.innerHeight - 0',
-      rowClass: "table-row-new-class schedule-table-row",
+      // rowClass: "table-row-new-class schedule-table-row",
       searchKey: "",
       tiaoZhengType: 1,
       modeOptions: null,
@@ -1931,6 +1936,13 @@ export default {
       this.currentData.id = row.id;
       this.searchTableVisible = false;
       this.msDialogVisible = true;
+    },
+    tableRowClassName({row, rowIndex}) {
+      if(row.zone_type == 1){
+        return 'table-row-new-class schedule-table-row'
+      }else {
+        return 'table-row-new-class schedule-table-row backPurple'
+      }
     }
   },
   components: {
@@ -2062,4 +2074,7 @@ export default {
     color: #fff;
   }
 }
+.backPurple{
+  color: #08c3df !important;
+}
 </style>

src/xt_pages/workforce/components/tableWeeks.vue

@@ -25,6 +25,20 @@
           </li>
         </ul>
       </div>
+      
+      <div  class="title"><span class="name">班 次</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_time ? 'active' : ''"
+            @click="selectWeekTime(item.id)"
+            v-for="item in weekTimes"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
     </div>
     <el-table
       :row-style="{ color: '#303133' }"
@@ -171,6 +185,13 @@ export default {
       anticoagulants_confit: null,
 
       week_type: "1",
+      week_time:0,
+      weekTimes:[
+        {id:0,name:"全部"},
+        {id:1,name:"上午"},
+        {id:2,name:"下午"},
+        {id:3,name:"晚上"},
+      ],
       weekTitle: ["", "", "", "", "", "", ""],
       weekData: {
         Monday: [],
@@ -195,15 +216,20 @@ export default {
   methods: {
     printAction() {
       this.$router.push({
-        path: "/schedule/remind/print?week_type=" + this.week_type
+        path: "/schedule/remind/print?week_type=" + this.week_type+"&week_time="+this.week_time
       });
     },
-    getScheduleWeekDay(weekType) {
-      getScheduleWeekDay(weekType).then(response => {
+    getScheduleWeekDay() {
+        const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
+        console.log("params------",params)
+      getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
           this.scheduleData = response.data.data.schdules;
-          //console.log("排班-----", this.scheduleData);
+          console.log("排班-----", this.scheduleData);
         } else {
           this.$message.error("网络错误");
           return false;
@@ -290,11 +316,16 @@ export default {
     },
     selectWeekType(type) {
       this.week_type = type;
-      let params = {
-        week_type: this.week_type
-      };
-      this.getScheduleWeekDay(params);
+      // let params = {
+      //   week_type: this.week_type
+      // };
+      this.getScheduleWeekDay();
     },
+    selectWeekTime(type){
+       this.week_time = type
+       this.getScheduleWeekDay()
+    },
+
     getSchedulesType: function(type) {
       let type_name = "";
       switch (type) {
@@ -401,10 +432,10 @@ export default {
     if (this.week_type == 0) {
       this.week_type = 7;
     }
-    let params = {
-      week_type: this.week_type
-    };
-    this.getScheduleWeekDay(params);
+    // let params = {
+    //   week_type: this.week_type
+    // };
+    this.getScheduleWeekDay();
   }
 };
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -72,6 +72,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
                 <td :width="td_4_width" style="text-align:left" >
                   <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
@@ -120,10 +123,14 @@
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
+      this.week_time  = this.$route.query.week_time
+      
+      const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
 
-
-
-      getScheduleWeekDay({week_type: this.week_type}).then(rs => {
+      getScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {