合并代码

config/dev.env.js

@@ -7,11 +7,10 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   BASE_API:  '"http://api.xt.test.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-
+  // BASE_API:'"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }
-

config/index.js

@@ -1,14 +1,15 @@
-"use strict";
+'use strict'
 // Template version: 1.2.6
 // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require("path");
+const path = require('path')
 
 module.exports = {
   dev: {
+
     // Paths
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/",
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
     proxyTable: {},
 
     // Various Dev Server settings
@@ -18,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: "xt.test.sgjyun.com",
-    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    host: 'xt.test.sgjyun.com',
+    port: 9526, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,
@@ -39,7 +40,7 @@ module.exports = {
      */
 
     // https://webpack.js.org/configuration/devtool/#development
-    devtool: "#cheap-source-map",
+    devtool: '#cheap-source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
@@ -51,16 +52,16 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false
+    cssSourceMap: false,
   },
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, "../dist/index.html"),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, "../dist"),
-    assetsSubDirectory: "static",
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
 
     /**
      * You can set by youself according to actual condition
@@ -70,21 +71,21 @@ module.exports = {
      * In most cases please use '/' !!!
      */
     // assetsPublicPath: '/vue-element-admin/', // If you are deployed on the root path, please use '/'
-    assetsPublicPath: "./",
+    assetsPublicPath: './',
 
     /**
      * Source Maps
      */
     productionSourceMap: false,
     // https://webpack.js.org/configuration/devtool/#production
-    devtool: "#source-map",
+    devtool: '#source-map',
 
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ["js", "css"],
+    productionGzipExtensions: ['js', 'css'],
 
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -92,4 +93,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-};
+}

src/api/advice.js

@@ -1,12 +1,22 @@
 import request from '@/utils/request'
 
-export function getAdviceConfig(){
+export function getAdviceConfig(type){
     return request({
-        url:'/api/getadviceconfigs',
+        url:'/api/getadviceconfigs?type='+type,
         method:'get',
     })
 }
 
+export function getAllAdviceConfig(){
+  return request({
+    url:'/api/getalladviceconfig',
+    method:'get',
+  })
+}
+
+
+
+
 
 export function CreateDoctorAdvice(id, advice){
     return request({
@@ -197,11 +207,22 @@ export function postAdviceTemplate(params,name,advice_type){
 }
 
 export function CreateGroupAdvice(id, groupno, advices){
-  return request({
+  if(advices.remind > 0){
+    return request({
       url:'/api/patients/advice/creategroup?id='+id + '&groupno=' + groupno,
       method:'post',
       data:advices,
-  })
+    })
+
+  }else{
+    return request({
+      url:'/api/patients/advice/creategroup?id='+id + '&groupno=' + groupno,
+      method:'post',
+      data:advices,
+    })
+
+  }
+
 }
 export function DeleteGroupAdvice(groupno){
   return request({

src/api/dialysis.js

@@ -244,4 +244,3 @@ export function postDelMonitorInfo(params) {
 
 
 
-

src/api/patient.js

@@ -286,6 +286,16 @@ export function GetRemind(params) {
 }
 
 
+export function PostRemind(params) {
+  return request({
+    url: '/api/remind/is_open',
+    method: 'Post',
+    params:params,
+  })
+}
+
+
+
 
 
 

src/api/signandweigh.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 export function fetchSignPatients(params) {
-  console.log("bbbbbbbbbbbbbbb号码")
+  console.log('bbbbbbbbbbbbbbb号码')
   console.log(params)
   return request({
     url: '/api/sign/patients',
@@ -63,22 +63,30 @@ export function editdata(params) {
   })
 }
 
-export function sighdata(params){
-  console.log("好还哦")
+export function sighdata(params) {
+  console.log('好还哦')
   console.log(params)
-   return request({
-     url: '/api/sigh/sighdata',
-     params: params,   
-     method: 'Post'
-   })
+  return request({
+    url: '/api/sigh/sighdata',
+    params: params,
+    method: 'Post'
+  })
 }
 
-export function updateSignweight(params){
- 
-  console.log(params)
+export function updateSignweight(params) {
+  console.log('params是什么', params)
   return request({
-     url:'/api/sign/updateSignweight',
-     params:params,
-     method:'Post'
+    url: '/api/sign/updateSignweight',
+    params: params,
+    method: 'Post'
   })
-}
+}
+
+export function getForenoonData(params) {
+  console.log('呵呵呵呵呵')
+  return request({
+    url: '/api/sign/getforenoondata',
+    params: params,
+    method: 'Get'
+  })
+}

src/router/modules/dialysis.js

@@ -115,6 +115,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/dialysis/print/batch/six',
+    component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_six'),
+    hidden: true,
+    is_menu: false,
+    name: 'dialysis_batch_six',
+    meta: {
+      title: '批量打印',
+      noCache: true
+    }
+  },
   {
     path: '/dialysis/print/batch/otherone',
     component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other_one'),

src/router/modules/patient.js

@@ -148,16 +148,16 @@ export default {
       title: 'proeducation',
       noCache: true
     }
-  },{
-      path: '/course/print',
-      component: () => import('@/xt_pages/user/coursePrint'),
-      hidden: true,
-      is_menu: false,
-      name: 'dialysisPrintOrder',
-      meta: {
-        title: 'dialysisPrintOrder',
-        noCache: true
-      }
-    },
+  }, {
+    path: '/course/print',
+    component: () => import('@/xt_pages/user/coursePrint'),
+    hidden: true,
+    is_menu: false,
+    name: 'coursePrint',
+    meta: {
+      title: 'coursePrint',
+      noCache: true
+    }
+  }
   ]
 }

src/router/modules/systems.js

@@ -18,92 +18,99 @@ export default {
       title: 'adminManage'
     }
   },
-    {
-      path: '/role/manage',
-      component: () => import('@/xt_pages/role/role'),
-      name: 'roleManage',
-      meta: {
-        title: 'roleManage'
-      }
-    },
-    {
-      path: '/role/admin/create',
-      component: () => import('@/xt_pages/role/CreateAdmin'),
-      name: 'addAdmin',
-      meta: {
-        title: 'addAdmin',
-        noCache: true
-      },
-      hidden: true,
-      is_menu: false
-    },
-    {
-      path: '/role/admin/edit',
-      component: () => import('@/xt_pages/role/EditAdmin'),
-      name: 'editAdmin',
-      meta: {
-        title: 'editAdmin',
-        noCache: true
-      },
-      hidden: true,
-      is_menu: false
-    },
-    {
-      path: '/role/perview',
-      component: () => import('@/xt_pages/role/EditPerview'),
-      name: 'setupPerview',
-      meta: {
-        title: 'setupPerview',
-        noCache: true
-      },
-      hidden: true,
-      is_menu: false
-    },
-    {
-      path: '/role/admin/specialpermission',
-      component: () => import('@/xt_pages/role/special_permission'),
-      name: 'special_permission_manage',
-      meta: {
-        title: 'special_permission_manage'
-      }
+  {
+    path: '/role/manage',
+    component: () => import('@/xt_pages/role/role'),
+    name: 'roleManage',
+    meta: {
+      title: 'roleManage'
+    }
+  },
+  {
+    path: '/role/admin/create',
+    component: () => import('@/xt_pages/role/CreateAdmin'),
+    name: 'addAdmin',
+    meta: {
+      title: 'addAdmin',
+      noCache: true
     },
-    {
-      path: '/data/dictionary',
-      component: () => import('@/xt_pages/data/index'),
-      name: 'dictionary',
-      meta: {
-        title: 'data_dictionary'
-      }
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/admin/edit',
+    component: () => import('@/xt_pages/role/EditAdmin'),
+    name: 'editAdmin',
+    meta: {
+      title: 'editAdmin',
+      noCache: true
     },
-    {
-      path: '/data/template',
-      component: () => import('@/xt_pages/data/template'),
-      name: 'template',
-      meta: {
-        title: 'template'
-      }
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/perview',
+    component: () => import('@/xt_pages/role/EditPerview'),
+    name: 'setupPerview',
+    meta: {
+      title: 'setupPerview',
+      noCache: true
     },
-    {
-      path: '/data/druguse',
-      component: () => import('@/xt_pages/data/druguseTemplate'),
-      name: 'druguse',
-      meta: {
-        title: 'druguse'
-      }
-    }, {
-      path: '/data/showconfig',
-      component: () => import('@/xt_pages/data/showConfig'),
-      name: 'showconfig',
-      meta: {
-        title: 'showconfig'
-      }
-    },{
-      path: '/data/print',
-      component: () => import('@/xt_pages/data/printTemplate'),
-      name: 'printTemplate',
-      meta: {
-        title: 'printTemplate'
-      }
+    hidden: true,
+    is_menu: false
+  },
+  {
+    path: '/role/admin/specialpermission',
+    component: () => import('@/xt_pages/role/special_permission'),
+    name: 'special_permission_manage',
+    meta: {
+      title: 'special_permission_manage'
+    }
+  },
+  {
+    path: '/data/dictionary',
+    component: () => import('@/xt_pages/data/index'),
+    name: 'dictionary',
+    meta: {
+      title: 'data_dictionary'
+    }
+  },
+  {
+    path: '/data/template',
+    component: () => import('@/xt_pages/data/template'),
+    name: 'template',
+    meta: {
+      title: 'template'
+    }
+  },
+  {
+    path: '/data/druguse',
+    component: () => import('@/xt_pages/data/druguseTemplate'),
+    name: 'druguse',
+    meta: {
+      title: 'druguse'
+    }
+  }, {
+    path: '/data/showconfig',
+    component: () => import('@/xt_pages/data/showConfig'),
+    name: 'showconfig',
+    meta: {
+      title: 'showconfig'
+    }
+  }, {
+    path: '/data/print',
+    component: () => import('@/xt_pages/data/printTemplate'),
+    name: 'printTemplate',
+    meta: {
+      title: 'printTemplate'
+    }
+  }, {
+    path: '/data/hisconfig',
+    component: () => import('@/xt_pages/data/hisConfig'),
+    name: 'hisconfig',
+    meta: {
+      title: 'hisconfig'
     }
+  }
   ]
 }

src/store/getters.js

@@ -66,6 +66,7 @@ const getters = {
   good_unit: state => state.global_config.good_unit,
 
   temp_params: state => state.temp_params,
+  puncture_needle: state => state.global_config.puncture_needle,
 
 
 

src/store/modules/globalConfig.js

@@ -573,6 +573,12 @@ const global_config = {
       {id: 9, name: "皮下出血"},
     ],
 
+    puncture_needle: [
+      {id: 1, name: 'V钝针'},
+      {id: 2, name: 'V锐针'},
+      {id: 3, name: 'A锐针'},
+      {id: 4, name: 'A钝针'},
+    ],
 
   },
   mutations: {

src/styles/index.scss

@@ -272,6 +272,7 @@ code {
       }
     }
   }
+  //  border: solid 1px red;
 }
 
 .note {

src/views/layout/components/TagsView.vue

@@ -134,8 +134,8 @@ export default {
     top: 60px;
     overflow-x: scroll;
     white-space: normal;
-    right: 0;
-    left: 150px;
+    // right: 0;
+    // left: 150px;
     
     /* 针对缺省样式 (必须的) */
       &::-webkit-scrollbar {

src/xt_pages/data/components/hisConfigInfo.vue

@@ -0,0 +1,377 @@
+<template>
+  <div class="">
+    <div class="filter-container">
+      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary"
+                 icon="el-icon-circle-plus-outline">{{$t('table.add')}}
+      </el-button>
+    </div>
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list"
+              v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
+      <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column align="center" label="标题">
+        <template slot-scope="scope">
+          <!-- <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span> -->
+          <span>{{scope.row.title}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="内容">
+        <template slot-scope="scope">
+          <span v-html="scope.row.content">{{scope.row.content}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+            <el-button icon="el-icon-edit-outline" type="primary" size="small"
+                       @click="handleUpdate(scope.row)"></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger"
+                       @click="handleModifyStatus(scope.row,'deleted')">
+            </el-button>
+          </el-tooltip>
+
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div> -->
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="70px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="temp.title" maxlength="100" placeholder="请输入标题"></el-input>
+        </el-form-item>
+
+        <el-form-item label="内容"  v-if="type == 'course_disease'">
+          <keep-alive>
+            <editor ref="editor"
+                     id="editor"
+                     style="width: 600px"
+                     v-bind:r_content="temp.content">
+            </editor>
+          </keep-alive>
+        </el-form-item>
+
+        <el-form-item label="内容" prop="content" v-else>
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" v-model="temp.content"
+                    placeholder="请输入内容"></el-input>
+        </el-form-item>
+
+
+        <el-form-item :label="$t('data_config.remark')">
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" placeholder="请输入备注"
+                    v-model="temp.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+        <el-button v-else type="primary" @click="updateData">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="pvData" border fit
+                highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"></el-table-column>
+        <el-table-column prop="pv" label="Pv"></el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import { createChildConfig, createConfig, deleteChildConfig, updateChildConfig, updateTemplate } from '@/api/data'
+  import waves from '@/directive/waves' // 水波纹指令
+  import { parseTime } from '@/utils'
+  import store from '@/store'
+  import bus from '@/assets/eventBus'
+  import Editor from '@/components/Editor'
+
+  export default {
+    name: 'hisConfigInfo',
+    directives: {
+      waves
+    },
+    components: {
+      Editor
+    },
+    props: {
+      type: {
+        type: String,
+        default: 'patient'
+      }
+    },
+    beforeMount(){
+
+
+    },
+    data() {
+      return {
+        currentId: undefined,
+        tableKey: 0,
+        // list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          page: 1,
+          limit: 20,
+          importance: undefined,
+          title: undefined,
+          type: this.type,
+          sort: '+id'
+        },
+        importanceOptions: [1, 2, 3],
+        // calendarTypeOptions,
+        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+        statusOptions: ['published', 'draft', 'deleted'],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          title: '',
+          content: '',
+          remark: ''
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: '修改',
+          create: '新增'
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          content: [{ required: true, message: '请输入字段名', trigger: 'blur' }]
+        },
+        downloadLoading: false
+      }
+    },
+    // watch: {
+    //   'temp.config_field':function(){
+    //       this.temp.config_field =  this.temp.config_field.replace(/[^A-Za-z]/g,'');
+    //   }
+    // },
+    computed: {
+      list: function() {
+        // const list = store.getters.configlist[this.type]
+        // this.total = list.length
+        return store.getters.configlist[this.type]
+      }
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'info',
+          deleted: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
+      this.getList()
+    },
+    methods: {
+      fieldChange: function(newValue) {
+        this.temp.config_field = newValue.replace(/[^A-Za-z]/g, '')
+      },
+      handleRowChange(currentRow, oldCurrentRow) {
+        if (currentRow != undefined) {
+          this.currentId = currentRow.id
+          bus.$emit('parentChangeId', currentRow)
+        }
+      },
+      getList() {
+        this.listLoading = false
+        // setTimeout(() => {
+        //     this.listLoading = false
+        //   }, 1 * 1000)
+      },
+      handleFilter() {
+        this.listQuery.page = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val
+        this.getList()
+      },
+      handleModifyStatus(row, status) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.$confirm('此操作将永久删除该配置项, 是否继续?', '提示', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          const tempData = Object.assign({}, this.temp)
+          deleteChildConfig(tempData).then(response => {
+            if (!response.data) {
+              // 由于mockjs 不支持自定义状态码只能这样hack
+              reject('error')
+            }
+            if (response.data.state === 0) {
+              this.$message.error(response.data.msg)
+            }
+
+            const result = response.data.data.dataconfig
+            store.dispatch('updateParentConfigList', [tempData, 'delete']).then(() => {
+              next()
+            })
+          })
+
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+        })
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            })
+          })
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          title: '',
+          content: '',
+          remark: ''
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if(this.type == "course_disease"){
+            this.temp.content = this.$refs.editor.content;
+          }
+
+          if (valid) {
+            createConfig(this.temp).then(response => {
+              if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+                reject('error')
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg)
+              }
+              const result = response.data.data.dataconfig
+              // 更新store
+              store.dispatch('updateConfigList', result).then(() => {
+
+              })
+
+              this.dialogFormVisible = false
+
+              this.$message.success('创建成功')
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      updateData() {
+        this.$refs['dataForm'].validate(valid => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp)
+            if(this.type == "course_disease"){
+              tempData.content = this.$refs.editor.content;
+            }
+            updateTemplate(tempData).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject('error')
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg)
+              }
+
+              const result = response.data.data.dataconfig
+              store.dispatch('updateParentConfigList', [result, 'update']).then(() => {
+                next()
+              })
+
+              this.dialogFormVisible = false
+
+              this.$message.success('更新成功')
+            })
+          }
+        })
+      },
+      handleDelete(row) {
+
+        this.$message.success('删除成功')
+
+        const index = this.list.indexOf(row)
+        this.list.splice(index, 1)
+      },
+      handleFetchPv(pv) {
+        fetchPv(pv).then(response => {
+          this.pvData = response.data.pvData
+          this.dialogPvVisible = true
+        })
+      },
+      handleDownload() {
+        this.downloadLoading = true
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+          const data = this.formatJson(filterVal, this.list)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: 'table-list'
+          })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        }))
+      }
+    }
+  }
+</script>

src/xt_pages/data/druguseTemplate.vue

@@ -51,7 +51,7 @@
                 width="100"
               >
                 <template slot-scope="scope">
-                  <div>{{scope.row.advice_type == 1 ? "长期" : "临时"}}</div>
+                  <div>{{scope.row.advice_type == 1 ? '长期' : '临时'}}</div>
                 </template>
 
               </el-table-column>
@@ -94,16 +94,18 @@
                 </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount1"
                 align="center"
-                label="规格">
-                <template slot-scope="scope">
+                label="药品规格">
                   <!-- {{drugDesc(scope.row)}} -->
-                  {{scope.row.advice_desc}}
-                </template>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                  </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount2"
                 width="90"
@@ -146,6 +148,14 @@
               </el-table-column>
 
 
+              <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                </template>
+              </el-table-column>
+
               <el-table-column
                 align="center"
                 label="操作"
@@ -188,8 +198,8 @@
 
                   <el-form-item label="模版类型" prop="advice_type">
                     <el-radio-group v-model="form.advice_type">
-                      <el-radio label="0">临时</el-radio>
-                      <el-radio label="1">长期</el-radio>
+                      <el-radio :label="0">临时</el-radio>
+                      <el-radio :label="1">长期</el-radio>
                     </el-radio-group>
                   </el-form-item>
 
@@ -213,11 +223,10 @@
                       {{scope.row.advice_name}}
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格">
-                    <template slot-scope="scope">
-                      <!-- {{drugDescTwo(scope.row)}} -->
-                      {{scope.row.advice_desc}}
-                    </template>
+                  <el-table-column align="center" label="药品规格">
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                      </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
@@ -243,6 +252,14 @@
                     </template>
                   </el-table-column>
 
+                  <el-table-column prop="blood_flow_volume" align="center" label="提醒频率" v-if="form.advice_type == 1">
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.weekdays}}</span>
+                    </template>
+                  </el-table-column>
+
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -264,15 +281,13 @@
                       <el-input v-model="templateForm.advice_name"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="规格 :">
-                      <el-input v-model="templateForm.advice_desc"></el-input>
-                    </el-form-item>
 
 
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                  <el-col :span="12">
+                    <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateForm.drug_spec"  ></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="2">&nbsp;</el-col>
                       <el-col :span="14">
@@ -291,7 +306,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -379,6 +394,39 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+                  <el-col :span="24" v-if="form.advice_type&&!isAddChild">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateForm.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateForm.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateForm.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateForm.frequency_type == 3">
+                    <el-form-item prop="weekday">
+                      <el-checkbox-group v-model="templateForm.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
+
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -386,6 +434,9 @@
                 <el-button type="primary" @click="submitTemplate('templateForm')">保 存</el-button>
               </div>
             </el-dialog>
+            <!--TODO-->
+
+
             <el-dialog :title="editDialogTitle" :visible.sync="templateEditFormVisible" width="700px">
               <el-form
                 ref="templateFormEdit"
@@ -398,15 +449,12 @@
                     <el-form-item :label="edit_advice_name" required prop="advice_name">
                       <el-input v-model="templateFormEdit.advice_name"></el-input>
                     </el-form-item>
-
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="规格">
-                      <el-input v-model="templateFormEdit.advice_desc"></el-input>
-                    </el-form-item>
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                  <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateFormEdit.drug_spec"></el-input>
+                        <el-input v-model="templateFormEdit.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -425,7 +473,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -514,6 +562,41 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+
+                  <el-col :span="24">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateFormEdit.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateFormEdit.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateFormEdit.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateFormEdit.frequency_type == 3">
+                    <el-form-item>
+                      <el-checkbox-group v-model="templateFormEdit.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
+
+
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -548,34 +631,42 @@
                       <span v-if="scope.row.parent_id > 0"> &emsp;{{scope.row.advice_name}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格">
-                    <template slot-scope="scope">
+                  <el-table-column align="center" label="药品规格">
                       <!-- {{drugDesc(scope.row)}} -->
-                      {{scope.row.advice_desc}}
-                    </template>
+                      <template slot-scope="scope">
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                      </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
                       {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}
                     </template>
                   </el-table-column>
-                  <el-table-column prop="pulse_frequency" align="center" label="单次用量">
+                  <el-table-column align="center" label="单次用量">
                     <template slot-scope="scope" v-if="scope.row.single_dose != ''">
                       {{scope.row.single_dose}}{{scope.row.single_dose_unit}}
                     </template>
 
                   </el-table-column>
-                  <el-table-column prop="breathing_rate" align="center" label="给药途径">
+                  <el-table-column align="center" label="给药途径">
                     <template slot-scope="scope">
                       <span v-if="scope.row.parent_id == 0">{{scope.row.delivery_way}}</span>
                     </template>
 
                   </el-table-column>
-                  <el-table-column prop="blood_flow_volume" align="center" label="执行频率">
+                  <el-table-column align="center" label="执行频率">
                     <template slot-scope="scope">
                       <span v-if="scope.row.parent_id == 0">{{scope.row.execution_frequency}}</span>
                     </template>
                   </el-table-column>
+
+                  <el-table-column align="center" label="提醒频率" v-if="form.advice_type == 1">
+                    <template slot-scope="scope">
+                      <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                      <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                      <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+                    </template>
+                  </el-table-column>
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -583,6 +674,8 @@
                 <el-button type="primary" @click="modifyTemplateName">保 存</el-button>
               </div>
             </el-dialog>
+
+
             <el-dialog title="新增医嘱" :visible.sync="templateFormTwoVisible" width="700px">
               <el-form
                 ref="templateForm"
@@ -597,12 +690,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="规格 :">
-                      <el-input v-model="templateForm.advice_desc"></el-input>
-                    </el-form-item>
-                    <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+
+                <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.drug_spec"></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -621,7 +712,7 @@
                           ></el-option>
                         </el-select>
                       </el-col>
-                    </el-form-item> -->
+                    </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item label="单次用量 :" prop="single_dose">
@@ -709,7 +800,42 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+
+
+                  <el-col :span="24" v-if="form.advice_type == 1">
+                    <el-form-item label="周期提醒 :">
+                      <el-radio-group v-model="templateForm.frequency_type">
+                        <el-radio :label="1">每次必推</el-radio>
+                        <el-radio :label="2">天数频率</el-radio>
+                        <el-radio :label="3">星期频率</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+
+
+                  <el-col :span="12" v-if="templateForm.frequency_type == 2">
+                    <el-form-item prop="day_count">
+                      <el-input style="width: 50px" v-model="templateForm.day_count"></el-input>&nbsp;
+                      天/一次
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24" v-if="templateForm.frequency_type == 3">
+                    <el-form-item>
+                      <el-checkbox-group v-model="templateForm.weekday">
+                        <el-checkbox label="周一" name="type"></el-checkbox>
+                        <el-checkbox label="周二" name="type"></el-checkbox>
+                        <el-checkbox label="周三" name="type"></el-checkbox>
+                        <el-checkbox label="周四" name="type"></el-checkbox>
+                        <el-checkbox label="周五" name="type"></el-checkbox>
+                        <el-checkbox label="周六" name="type"></el-checkbox>
+                        <el-checkbox label="周日" name="type"></el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  </el-col>
                 </el-row>
+
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="cancelHandleTwo">取消</el-button>
@@ -1027,7 +1153,7 @@
     DeleteDrugWay,
     DeleteExecutionFrequency,
     DeleteParentAdviceTemplate,
-    getAdviceConfig,
+    getAllAdviceConfig,
     getAllAdviceTemplate,
     postAdviceTemplate,
     UpdateAdviceTemplate,
@@ -1045,6 +1171,8 @@
     components: { BreadCrumb },
     data() {
       return {
+        day_count: '',
+
         crumbs: [
           { path: false, name: '数据字典' },
           { path: 'data/druguse', name: '医嘱模版' }
@@ -1115,6 +1243,9 @@
           advice_name: [{ required: true, message: '请填写医嘱内容' }]
         },
         templateForm: {
+          frequency_type: 1,
+          day_count: '',
+          weekday: [],
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1129,6 +1260,10 @@
         },
 
         templateFormEdit: {
+          frequency_type: 0,
+          day_count: '',
+          weekday: [],
+          week_days: '',
           drug_spec: '',
           drug_spec_unit: '',
           advice_name: '',
@@ -1151,7 +1286,7 @@
         },
         form: {
           name: '',
-          advice_type: '0'
+          advice_type: 0
 
         },
         drugwayForm: {
@@ -1237,6 +1372,7 @@
         }
       },
       handleCreateTemplate() {
+        this.form.advice_type = 0
         this.templateTableVisible = true
       },
       newRecordAction() {
@@ -1247,6 +1383,7 @@
         this.isAddChild = false
         this.templateTableVisible = false
         this.templateFormVisible = true
+
       }, deleteRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
@@ -1274,12 +1411,12 @@
         }
 
         this.isEdit = true
-
         const adviceTable = this.adviceTableData[this.table_current_index]
-
         for (var index in adviceTable) {
           this.templateForm[index] = adviceTable[index]
         }
+        this.templateForm.weekday = adviceTable.weekdays.split(',')
+
         this.templateFormVisible = true
         this.templateTableVisible = false
         this.dialogTitle = '编辑医嘱内容'
@@ -1292,7 +1429,6 @@
         }).then(() => {
           this.adviceTableData = []
           this.form.name = ''
-          this.form.advice_type = ''
           this.templateFormVisible = false
           this.templateTableVisible = false
         }).catch(() => {
@@ -1329,7 +1465,6 @@
             this.handleSpanTempArr()
 
             this.form.name = ''
-            this.form.advice_type = ''
             this.adviceTableData = []
             this.templateFormVisible = false
             this.templateTableVisible = false
@@ -1444,6 +1579,7 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
+
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -1499,6 +1635,7 @@
                 }
               })
             } else {
+
               const templateFormTwo = {}
               templateFormTwo.advice_name = this.templateForm.advice_name
               templateFormTwo.advice_desc = this.templateForm.advice_desc
@@ -1512,6 +1649,33 @@
               templateFormTwo.execution_frequency = this.templateForm.execution_frequency
               templateFormTwo.parent_id = this.parent_id
 
+              if (this.templateForm.frequency_type == 1) {
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = '0'
+                templateFormTwo.weekdays = ''
+
+              } else if (this.templateForm.frequency_type == 2) {
+
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = this.templateForm.day_count
+                templateFormTwo.weekdays = ''
+
+              } else if (this.templateForm.frequency_type == 3) {
+                templateFormTwo.frequency_type = this.templateForm.frequency_type
+                templateFormTwo.day_count = '0'
+                templateFormTwo.weekdays = this.templateForm.weekday.filter(function(s) {
+                  return s && s.trim()
+                }).join(',')
+
+              }
+
+              this.templateForm.advice_name = ''
+              this.templateForm.advice_desc = ''
+              this.templateForm.frequency_type = 1
+              this.templateForm.day_count = ''
+              this.templateForm.weekday = []
+
+              console.log(templateFormTwo)
               if (this.isEdit) {
                 for (let i = 0; i < this.adviceTableData.length; i++) {
                   if (i == this.table_current_index) {
@@ -1525,10 +1689,14 @@
                     this.adviceTableData[i].prescribing_number_unit = templateFormTwo.prescribing_number_unit
                     this.adviceTableData[i].delivery_way = templateFormTwo.delivery_way
                     this.adviceTableData[i].execution_frequency = templateFormTwo.execution_frequency
+                    this.adviceTableData[i].frequency_type = templateFormTwo.frequency_type
+                    this.adviceTableData[i].day_count = templateFormTwo.day_count
+                    this.adviceTableData[i].weekdays = templateFormTwo.weekdays
                   }
                 }
               } else {
                 this.adviceTableData.unshift(templateFormTwo)
+                console.log(this.adviceTableData)
               }
               this.templateFormVisible = false
               this.templateTableVisible = true
@@ -1706,7 +1874,7 @@
 
       getAdviceConfig() {
         this.adviceTemplates = []
-        getAdviceConfig().then(response => {
+        getAllAdviceConfig().then(response => {
           if (response.data.state == 1) {
             this.drugways = response.data.data.drugways
             this.executionFrequencyOptions = response.data.data.efs
@@ -1764,6 +1932,24 @@
             this.templateFormEdit.prescribing_number = 0
           }
           if (valid) {
+            console.log(this.templateFormEdit)
+
+            if (this.templateFormEdit.frequency_type == 1) {
+
+              this.templateFormEdit.day_count = 0
+              this.templateFormEdit.week_days = ''
+
+            } else if (this.templateFormEdit.frequency_type == 2) {
+              this.templateFormEdit.day_count = parseInt(this.templateFormEdit.day_count)
+              this.templateFormEdit.week_days = ''
+
+            } else if (this.templateFormEdit.frequency_type == 3) {
+              this.templateFormEdit.day_count = 0
+              this.templateFormEdit.week_days = this.templateFormEdit.weekday.filter(function(s) {
+                return s && s.trim()
+              }).join(',')
+            }
+
             UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit).then(
               response => {
                 if (response.data.state == 0) {
@@ -1784,6 +1970,9 @@
                   this.adviceTemplates[this.currentIndex].execution_frequency = template.execution_frequency
                   this.adviceTemplates[this.currentIndex].prescribing_number = template.prescribing_number
                   this.adviceTemplates[this.currentIndex].prescribing_number_unit = template.prescribing_number_unit
+                  this.adviceTemplates[this.currentIndex].day_count = template.day_count
+                  this.adviceTemplates[this.currentIndex].week_days = template.week_days
+                  this.adviceTemplates[this.currentIndex].frequency_type = template.frequency_type
                   this.currentIndex = -1
                   return false
                 }
@@ -1878,6 +2067,20 @@
         this.templateFormTwoVisible = false
       }, submitTemplateTwo(formName) {
         this.templateForm['template_id'] = this.current_template_id
+        this.templateForm['advice_type'] = this.form.advice_type
+
+        if (this.templateForm.frequency_type == 1) {
+          this.templateForm.day_count = 0
+          this.templateForm.week_days = ''
+        } else if (this.templateForm.frequency_type == 2) {
+          this.templateForm.day_count = parseInt(this.templateForm.day_count)
+          this.templateForm.week_days = ''
+        } else if (this.templateForm.frequency_type == 3) {
+          this.templateForm.day_count = 0
+          this.templateForm.week_days = this.templateForm.weekday.filter(function(s) {
+            return s && s.trim()
+          }).join(',')
+        }
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1892,14 +2095,13 @@
             objects['isNoSub'] = 2
 
             this.adviceTableDataTwo.unshift(response.data.data.template)
-            // this.adviceTemplates.unshift(objects)
-            // this.handleSpanTempArr()
-
             this.getAdviceConfig()
             this.resetForm(formName)
             this.templateFormTwoVisible = false
-
             this.$message.success('添加成功')
+            this.templateForm.day_count = ''
+            this.templateForm.weekday = []
+            this.templateForm.frequency_type = 1
 
             return false
           }
@@ -1964,7 +2166,7 @@
           }
         })
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 8) {
+        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 9) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {
@@ -1998,6 +2200,7 @@
       }, cellMouseLeave: function(row, column, cell, event) {
         this.hoverOrderArr = []
       }, openEdit(index, row) {
+        console.log(row)
         this.hoverOrderArr = []
         this.currentIndex = index
         this.templateFormEdit.drug_spec_unit = row.drug_spec_unit
@@ -2012,6 +2215,10 @@
         this.templateFormEdit.single_dose_unit = row.single_dose_unit
         this.templateFormEdit.id = row.id
         this.templateFormEdit.parent_id = row.parent_id
+        this.templateFormEdit.day_count = row.day_count
+        this.templateFormEdit.frequency_type = row.frequency_type
+        this.templateFormEdit.weekday = row.week_days.split(',')
+
         this.templateEditFormVisible = true
         if (row.parent_id > 0) {
           this.editDialogTitle = '编辑子药'
@@ -2187,6 +2394,7 @@
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name
+        this.form.advice_type = row.advice_type
         this.templateTableTwoVisible = true
         this.adviceTableDataTwo = []
         for (let i = 0; i < this.adviceTemplates.length; i++) {

src/xt_pages/data/hisConfig.vue

@@ -0,0 +1,55 @@
+<template>
+<div class="main-contain">
+  <div class="position">
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
+  </div>
+  <div class="app-container">
+    <el-tabs v-model="activeName" >
+      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" style="display:flex;">
+        <keep-alive>
+          <div style="display:flex;width:100%;">
+          <tab-pane v-if='activeName==item.key' :type='item.key' style="flex:1;"></tab-pane>
+          </div>
+        </keep-alive>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+  </div>
+
+</template>
+
+<script>
+import tabPane from './components/hisConfigInfo'
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+export default {
+  name: 'hisconfig',
+  components: { tabPane,BreadCrumb},
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '系统管理' },
+        { path: 'data/hisconfig', name: 'His集成' },
+      ],
+      tabMapOptions: [
+        { label: "集成配置", key: 'education'},
+        { label: "医护配置", key: 'summary'},
+        { label: "病患配置", key: 'course_disease' },
+        { label: "同步配置", key: 'rescue_record'}
+      ],
+      activeName: 'education',
+      createdTimes: 0
+    }
+  },
+  methods: {
+    showCreatedTimes() {
+      this.createdTimes = this.createdTimes + 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .tab-container{
+    margin: 30px;
+  }
+</style>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -598,8 +598,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span
@@ -650,8 +649,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -983,7 +983,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -1085,7 +1085,9 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <!--<span>{{advice.advice_desc}}</span>-->
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -315,8 +315,8 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                       <!--<span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -417,7 +417,7 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -298,8 +298,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -402,7 +401,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -3,93 +3,31 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <template v-if="this.template_id == 1">
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          :disabled="selecting_schs.length == 0"
-          @click="batchPrintAction"
-          type="primary"
-          >打印</el-button
-        >
+        <el-button size="small" icon="el-icon-printer" :disabled="selecting_schs.length == 0" @click="batchPrintAction" type="primary">打印</el-button>
       </template>
       <template v-if="this.template_id == 2 || this.template_id == 0">
-        <div>
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintAction"
-            type="primary"
-            >打印全部</el-button
-          >
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintActionOne"
-            type="primary"
-            style=""
-            >打印纪录单</el-button
-          >
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintActionTwo"
-            type="primary"
-            >打印医嘱单</el-button
-          >
+        <div >
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintAction" type="primary">打印全部</el-button>
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintActionOne" type="primary" style="">打印纪录单</el-button>
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintActionTwo" type="primary">打印医嘱单</el-button>
         </div>
       </template>
       <template v-if="this.template_id == 3">
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          :disabled="selecting_schs.length == 0"
-          @click="batchPrintAction"
-          type="primary"
-          >打印</el-button
-        >
+        <el-button size="small" icon="el-icon-printer" :disabled="selecting_schs.length == 0" @click="batchPrintAction" type="primary">打印</el-button>
       </template>
       <template v-if="this.template_id == 4">
-        <el-button
-          size="small"
-          icon="el-icon-printer"
-          :disabled="selecting_schs.length == 0"
-          @click="batchPrintAction"
-          type="primary"
-          >打印</el-button
-        >
+        <el-button size="small" icon="el-icon-printer" :disabled="selecting_schs.length == 0" @click="batchPrintAction" type="primary">打印</el-button>
       </template>
       <template v-if="this.template_id == 5">
-        <div>
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintAction"
-            type="primary"
-            >打印全部</el-button
-          >
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintActionOne"
-            type="primary"
-            style=""
-            >打印纪录单</el-button
-          >
-          <el-button
-            :loading="loading"
-            size="small"
-            icon="el-icon-printer"
-            @click="batchPrintActionTwo"
-            type="primary"
-            >打印医嘱单</el-button
-          >
+        <div >
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintAction" type="primary">打印全部</el-button>
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintActionOne" type="primary" style="">打印纪录单</el-button>
+          <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="batchPrintActionTwo" type="primary">打印医嘱单</el-button>
         </div>
       </template>
+      <template v-if="this.template_id == 6">
+        <el-button size="small" icon="el-icon-printer" :disabled="selecting_schs.length == 0" @click="batchPrintAction" type="primary">打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -98,10 +36,7 @@
       </div>-->
       <div class="cell clearfix">
         <label class="title">
-          <span class="name">{{
-            search_mode == 1 ? "日期查询" : "病人查询"
-          }}</span>
-          :
+          <span class="name">{{ search_mode == 1 ? "日期查询" : "病人查询" }}</span> :
         </label>
         <el-date-picker
           v-show="search_mode == 1"
@@ -130,39 +65,40 @@
             @click="searchPatientAction"
           ></el-button>
         </el-input>
-        <el-button type="primary" @click="changeSearchMode">{{
-          search_mode == 1 ? "改为病人查询" : "改为日期查询"
-        }}</el-button>
+        <el-button
+          type="primary"
+          @click="changeSearchMode"
+        >{{ search_mode == 1 ? "改为病人查询" : "改为日期查询" }}</el-button>
 
         <!-- <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>
+        <label class="title">
+          <span class="name">排班班次</span> :
+        </label>
         <div class="time">
           <ul class>
             <li
-              :class="item.value == schedulType ? 'active' : ''"
+              :class="item.value==schedulType?'active':''"
               @click="selectSchedulType(item.value)"
               v-for="item in schedulArr"
               :key="item.value"
-            >
-              {{ item.label }}
-            </li>
+            >{{item.label}}</li>
           </ul>
         </div>
       </div>
       <div class="cell clearfix">
-        <label class="title"> <span class="name">分区</span> : </label>
+        <label class="title">
+          <span class="name">分区</span> :
+        </label>
         <div class="time">
           <ul class>
             <li
-              :class="item.id == partitionType ? 'active' : ''"
+              :class="item.id==partitionType?'active':''"
               @click="selectPartitionType(item.id)"
               v-for="item in partitionArr"
               :key="item.id"
-            >
-              {{ item.name }}
-            </li>
+            >{{item.name}}</li>
           </ul>
         </div>
       </div>
@@ -179,70 +115,33 @@
         @current-change="clickCurrent"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column
-          type="selection"
-          width="45"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="number"
-          label="机号"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          label="排班日期"
-          prop="sch_time"
-          align="center"
-          width="120"
-        ></el-table-column>
-        <el-table-column
-          prop="dialysis_no"
-          label="透析号"
-          align="center"
-        ></el-table-column>
+        <el-table-column type="selection" width="45" align="center"></el-table-column>
+        <el-table-column prop="number" label="机号" align="center"></el-table-column>
+        <el-table-column label="排班日期" prop="sch_time" align="center" width="120"></el-table-column>
+        <el-table-column prop="dialysis_no" label="透析号" align="center"></el-table-column>
         <el-table-column prop="name" label="姓名" align="center">
           <template slot-scope="scope">
-            <span style="color: #579ef8">{{ scope.row.name }}</span>
+            <span style="color: #579ef8">{{scope.row.name}}</span>
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="mode_name"
-          label="透析模式"
-          align="center"
-          width="100"
-        ></el-table-column>
+        <el-table-column prop="mode_name" label="透析模式" align="center" width="100"></el-table-column>
 
-        <el-table-column
-          prop="dialysis_before_weight"
-          label="透前体重(kg)"
-          align="center"
-          width="120"
-        ></el-table-column>
-        <el-table-column
-          prop="dialysis_after_weight"
-          label="透后体重(kg)"
-          align="center"
-          width="120"
-        ></el-table-column>
+        <el-table-column prop="dialysis_before_weight" label="透前体重(kg)" align="center" width="120"></el-table-column>
+        <el-table-column prop="dialysis_after_weight" label="透后体重(kg)" align="center" width="120"></el-table-column>
         <el-table-column label="透中血压(Hgmm)" align="center">
-          <el-table-column
-            v-for="(item, index) in labelArr"
-            :key="index"
-            :label="item"
-            align="center"
-          >
+          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item" align="center">
             <!-- 数据的遍历  scope.row就代表数据的每一个对象-->
-            <template slot-scope="scope">
+            <template slot-scope="scope" >
               <!--<span>{{scope.row.bp[index].value}}</span>-->
-              <span>{{ getValue(scope.row.bp[index]) }}</span>
+              <span>{{getValue(scope.row.bp[index])}}</span>
             </template>
           </el-table-column>
         </el-table-column>
       </el-table>
 
       <el-pagination
-        align="right"
+      align="right"
         @current-change="handleCurrentChange"
         :page-sizes="[10]"
         :page-size="10"
@@ -255,19 +154,20 @@
   </div>
 </template>
 
+
 <script>
 import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getPrintTemplate } from "@/api/data";
+import { getPrintTemplate } from '@/api/data'
 
 export default {
   name: "Patient",
   data() {
     return {
-      crumbs: [
-        { path: false, name: "透析管理" },
-        { path: false, name: "透析监测" }
+      crumbs:[
+        {path:false, name:'透析管理'},
+        {path:false, name:'透析监测'},
       ],
       loading: false,
       time: "",
@@ -284,11 +184,11 @@ export default {
         { value: 2, label: "下午" },
         { value: 3, label: "晚上" }
       ],
-      template_id: 0,
+      template_id : 0,
 
       partitionType: 0,
 
-      labelArr: ["第1次", "第2次", "第3次", "第4次", "第5次", "第6次", "第7次"],
+      labelArr: ['第1次', "第2次", "第3次", "第4次", "第5次", "第6次", "第7次"],
 
       pickerOptions1: {
         shortcuts: [
@@ -357,16 +257,16 @@ export default {
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
-    getTemplateInfo() {
+    getTemplateInfo(){
       getPrintTemplate().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          var template = response.data.data.template;
-          this.template_id = template.template_id;
+          var template = response.data.data.template
+          this.template_id = template.template_id
         }
-      });
+      })
     },
     clickCurrent(val) {
       console.log(val);
@@ -430,8 +330,7 @@ export default {
                 bp: []
               };
 
-              SchedualPatientsTable["sch_id"] =
-                response.data.data.schedule[i].id;
+              SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id
               SchedualPatientsTable["sch_time_int"] =
                 response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(
@@ -521,61 +420,65 @@ export default {
       this.getSchedualPatientList();
     },
     batchPrintAction: function() {
-      var sch_ids = [];
+      var sch_ids = []
       for (let index = 0; index < this.selecting_schs.length; index++) {
-        sch_ids.push(this.selecting_schs[index].sch_id);
+        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.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids)
+      if (this.template_id == 2 ||this.template_id == 0 ){
         this.$router.push({ path: "/dialysis/print/batch/other" });
-      } else if (this.template_id == 1) {
+      }else if(this.template_id == 1) {
         this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.template_id == 3) {
+      }
+      else if(this.template_id == 3) {
         this.$router.push({ path: "/dialysis/print/batch/three" });
-      } else if (this.template_id == 4) {
+      }
+      else if(this.template_id == 4) {
         this.$router.push({ path: "/dialysis/print/batch/four" });
-      } else if (this.template_id == 5) {
+      } else if (this.template_id == 5  ){
         this.$router.push({ path: "/dialysis/print/batch/five" });
+      } else if (this.template_id == 6  ){
+        this.$router.push({ path: "/dialysis/print/batch/six" });
       }
     },
     batchPrintActionOne: function() {
-      var sch_ids = [];
+      var sch_ids = []
       for (let index = 0; index < this.selecting_schs.length; index++) {
-        sch_ids.push(this.selecting_schs[index].sch_id);
+        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.$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) {
+      }else if(this.template_id == 1) {
         this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.template_id == 5) {
+      } else if (this.template_id == 5){
         this.$router.push({ path: "/dialysis/print/batch/fiveone" });
       }
     },
     batchPrintActionTwo: function() {
-      var sch_ids = [];
+      var sch_ids = []
       for (let index = 0; index < this.selecting_schs.length; index++) {
-        sch_ids.push(this.selecting_schs[index].sch_id);
+        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.$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) {
+      }else if(this.template_id == 1){
         this.$router.push({ path: "/dialysis/print/batch" });
-      } else if (this.template_id == 5) {
+      } else if (this.template_id == 5  ){
         this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
       }
     }
   },
   components: {
-    BreadCrumb
+      BreadCrumb
   }
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .app-container {
-  //   margin: 20px;
+//   margin: 20px;
   font-size: 15px;
   .filter-container {
     padding-bottom: 5px;

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -19,8 +19,8 @@
           <span>{{ patient.id == 0 ? "" : (patient.gender == 1 ? "男" : "女") }}</span>
         </li>
         <li>
-          <label>出生 : </label>
-          <span>{{ birthday }}</span>
+          <label>年龄:</label>
+          <span>{{ patient.age }}</span>
         </li>
         <li>
           <label>透析号 : </label>
@@ -38,19 +38,25 @@
           <label>住院号 : </label>
           <span>{{ patient.admission_number }}</span>
         </li>
+        <li>
+          <label>透析日期:</label>
+          <span>{{dialysis_time}}</span>
+        </li>
     </ul>
     <div class="middleLine"></div>
   </div>
 </template>
 
 <script>
-import { parseTime } from "@/utils"
+const moment = require('moment')
+import { parseTime } from '@/utils'
 
 export default {
-  name: "BasicInfor",
+  name: 'BasicInfor',
   data() {
     return {
-      title:'基本信息',
+      title: '基本信息',
+      dialysis_time: moment(new Date()).format('YYYY-MM-DD')
       // steps: [
       //   { title: "透析处方" },
       //   { title: "接诊评估" },
@@ -63,7 +69,7 @@ export default {
       //   { title: "透后评估" },
       //   { title: "治疗小结" }
       // ]
-    };
+    }
   },
   props: {
     patient: {
@@ -73,7 +79,7 @@ export default {
       }
     },
     device_number: {
-      type: String,
+      type: String
     },
     steps: {
       type: Array,
@@ -83,23 +89,26 @@ export default {
     }
   },
   computed: {
-    birthday: function() {
+    created_time: function() {
       if (this.patient.id == 0) {
-        return ""
+        return ''
       } else {
-        return parseTime(this.patient.birthday, "{y}-{m}-{d}")
+        return parseTime(this.patient.created_time, '{y}-{m}-{d}')
       }
     },
     source: function() {
-      return this.patient.source == 1 ? "门诊" : "住院"
-    },
+      return this.patient.source == 1 ? '门诊' : '住院'
+    }
   },
   methods: {
     stepState: function() {
-      return parseInt((Math.random() * 1000) + "") % 2 == 1;
-    },
+      return parseInt((Math.random() * 1000) + '') % 2 == 1
+    }
+  },
+  created() {
+    console.log('patinents是什么ha ', this.patient)
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
@@ -200,13 +209,15 @@ export default {
     padding:20px 40px;  
     li {
       float: left;
-      width: 25%;
+      width: 28%;
       // margin: 0 1rem 0 0;
       font-size: 15px;
       height: 35px;
       line-height: 35px;
       color: #34495e;
+      margin-left: 60px;
     }
+    // border: solid red 1px;
   }
 </style>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -1,500 +1,420 @@
 <template>
   <div class="plate-box">
-    <h2 class="DetailsTit">
-      <span>{{ title }}</span>
-    </h2>
+    <h2 class="DetailsTit"><span>{{ title }}</span></h2>
     <div class="plate">
       <ul>
         <li v-if="isShow('透析模式')">
           <label>透析模式 : </label>
-          <span class="content">{{ dialysis_mode }}</span>
+          <span class="content">{{dialysis_mode}}</span>
         </li>
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 : </label>
-          <span class="content">{{
-            target_ultrafiltration != "0" ? target_ultrafiltration : ""
-          }}</span>
-          <span class="unit">{{
-            target_ultrafiltration != "0" ? "L" : ""
-          }}</span>
+          <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
+          <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
         </li>
-        <li v-if="isShow('置换量')">
-          <label>置换量 : </label>
-          <span class="content">{{
-            replacement_total != "0" ? replacement_total : ""
-          }}</span>
-          <span class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
-        </li>
-        <li v-if="isShow('维持')">
-          <label>维持 : </label>
-          <span class="content">{{
-            anticoagulant_weichi != "0" ? anticoagulant_weichi : ""
-          }}</span>
-          <span class="unit">{{
-            anticoagulant_weichi != "0" ? "mg/h" : ""
-          }}</span>
-        </li>
-        <li v-if="isShow('钠')">
-          <label>钠 : </label>
-          <span class="content">{{ sodium != "0" ? sodium : "" }}</span>
-          <span class="unit">{{ sodium != "0" ? "mmol/L" : "" }}</span>
-        </li>
-        <li v-if="isShow('碳酸氢盐')">
-          <label>碳酸氢盐 : </label>
-          <span class="content">{{
-            bicarbonate != "0" ? bicarbonate : ""
-          }}</span>
-          <span class="unit">{{ bicarbonate != "0" ? "mmol/L" : "" }}</span>
-        </li>
-        <li v-if="isShow('体液过多其他症状')">
-          <label>体液过多其他症状 : </label>
-          <span class="content">{{ body_fluid_other }}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('首剂')">
+          <label>首剂 : </label>
+          <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
+          <span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>
         </li>
-        <li v-if="isShow('血管通路(内瘘)')">
-          <label>血管通路(内瘘): </label>
-          <span class="content">{{ blood_access }}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('钙')">
+          <label>钙: </label>
+          <span class="content">{{calcium != '0'?calcium:""}}</span>
+          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
         </li>
-        <li v-if="isShow('实际超滤量')">
-          <label>实际超滤量: </label>
-          <span class="content">{{
-            ultrafiltration != "0" ? ultrafiltration : ""
-          }}</span>
-          <span class="unit">{{ ultrafiltration != "0" ? "L" : "" }}</span>
+        <li v-if="isShow('置换量')">
+          <label>置换量 : </label>
+          <span class="content">{{replacement_total != '0'?replacement_total:""}}</span>
+          <span class="unit">{{replacement_total != '0'?"L":""}}</span>
         </li>
-        <li v-if="isShow('目标KT/V')">
-          <label>目标KT/V: </label>
-          <span class="content">{{ target_ktv != "0" ? target_ktv : "" }}</span>
+
+        <li v-if="isShow('葡萄糖')">
+          <label>葡萄糖 : </label>
+          <span class="content">{{glucose != '0'?glucose:""}}</span>
+          <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
         </li>
       </ul>
-      <!-- 11111111111111111111111111111111111111111111 -->
       <ul>
         <li v-if="isShow('透析时长')">
           <label>透析时长 : </label>
-          <span class="content">{{
-            dialysis_duration != "0" ? dialysis_duration : ""
-          }}</span>
+          <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
         </li>
         <li v-if="isShow('透析液配方')">
           <label>透析液配方 : </label>
-          <span class="content">{{ dialysate_formulation }}</span>
-        </li>
-        <li v-if="isShow('抗凝剂')">
-          <label>抗凝剂 : </label>
-          <span class="content">{{ anticoagulant }}</span>
-        </li>
-        <li v-if="isShow('总量')">
-          <label>总量: </label>
-          <span class="content">{{
-            anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""
-          }}</span>
-          <span class="unit">{{
-            anticoagulant_zongliang != "0" ? "mg" : ""
-          }}</span>
+          <span class="content">{{dialysate_formulation}}</span>
         </li>
-        <li v-if="isShow('钙')">
-          <label>钙: </label>
-          <span class="content">{{ calcium != "0" ? calcium : "" }}</span>
-          <span class="unit">{{ calcium != "0" ? "mmol/L" : "" }}</span>
-        </li>
-        <li v-if="isShow('葡萄糖')">
-          <label>葡萄糖 : </label>
-          <span class="content">{{ glucose != "0" ? glucose : "" }}</span>
-          <span class="unit">{{ glucose != "0" ? "mmol/l" : "" }}</span>
+        <li v-if="isShow('维持')">
+          <label>维持 : </label>
+          <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
+          <span class="unit">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
         </li>
-        <li v-if="isShow('体液过多症状')">
-          <label>体液过多症状 : </label>
-          <span class="content">{{ body_fluid }}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('钾')">
+          <label>钾 : </label>
+          <span class="content">{{kalium != '0'?kalium:""}}</span>
+          <span class="unit">{{kalium != '0'?"mmol/L":""}}</span>
         </li>
-        <li v-if="isShow('透析前使用特殊药物')">
-          <label>透析前使用特殊药物: </label>
-          <span class="content">{{ special_medicine }}</span>
-          <span class="unit"></span>
+        <li v-if="isShow('碳酸氢盐')">
+          <label>碳酸氢盐 : </label>
+          <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
+          <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
         </li>
-
         <!-- <li>
           <label>干体重 : </label>
           <span class="content">{{dry_weight}}</span>
           <span class="unit">kg</span>
         </li> -->
+        <li v-if="isShow('透析液温度')">
+          <label>透析液温度 : </label>
+          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
+          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
+        </li>
       </ul>
-      <!-- 22222222222222222222222222222222222222222222 -->
       <ul>
+
         <li v-if="isShow('血流量')">
           <label>血流量 : </label>
-          <span class="content">{{
-            blood_flow_volume != "0" ? blood_flow_volume : ""
-          }}</span>
-          <span class="unit">{{
-            blood_flow_volume != "0" ? "ml/min" : ""
-          }}</span>
+          <span class="content">{{blood_flow_volume != '0'?blood_flow_volume:''}}</span>
+          <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
-        <li v-if="isShow('透析液温度')">
-          <label>透析液温度 : </label>
-          <span class="content">{{
-            dialysate_temperature != "0" ? dialysate_temperature : ""
-          }}</span>
-          <span class="unit">{{
-            dialysate_temperature != "0" ? "℃" : ""
-          }}</span>
+        <li v-if="isShow('抗凝剂')">
+          <label>抗凝剂 : </label>
+          <span class="content">{{anticoagulant}}</span>
         </li>
-        <li v-if="isShow('首剂')">
-          <label>首剂 : </label>
-          <span class="content">{{
-            anticoagulant_shouji != "0" ? anticoagulant_shouji : ""
-          }}</span>
-          <span class="unit">{{
-            anticoagulant_shouji != "0" ? "mg" : ""
-          }}</span>
+        <li v-if="isShow('总量')">
+          <label>总量: </label>
+          <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
+          <span class="unit">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
         </li>
-        <li v-if="isShow('钾')">
-          <label>钾 : </label>
-          <span class="content">{{ kalium != "0" ? kalium : "" }}</span>
-          <span class="unit">{{ kalium != "0" ? "mmol/L" : "" }}</span>
+        <li v-if="isShow('钠')">
+          <label>钠 : </label>
+          <span class="content">{{sodium != '0'?sodium:""}}</span>
+          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
         </li>
+        <li v-if="isShow('透析液流量')">
+          <label>透析液流量 : </label>
+          <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
+          <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
+        </li>
+        <li v-if="isShow('电导度')">
+          <label>电导度 : </label>
+          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
+        </li>
+      </ul>
+
+
+      <ul>
         <li v-if="isShow('透析器/灌流器')">
           <label>透析器/灌流器 : </label>
-          <span class="content">{{ dialyzer_perfusion_apparatus }}</span>
+          <span class="content">{{dialyzer_perfusion_apparatus}}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('透析液流量')">
-          <label>透析液流量 : </label>
-          <span class="content">{{
-            dialysate_flow != "0" ? dialysate_flow : ""
-          }}</span>
-          <span class="unit">{{ dialysate_flow != "0" ? "ml/min" : "" }}</span>
+
+        <li v-if="isShow('体液过多症状')">
+          <label>体液过多症状 : </label>
+          <span class="content">{{body_fluid}}</span>
+          <span class="unit"></span>
+        </li>
+        <li v-if="isShow('体液过多其他症状')">
+          <label>体液过多其他症状 : </label>
+          <span class="content">{{body_fluid_other}}</span>
+          <span class="unit"></span>
+        </li>
+        <li v-if="isShow('透析前使用特殊药物')">
+          <label>透析前使用特殊药物: </label>
+          <span class="content">{{special_medicine}}</span>
+          <span class="unit"></span>
+        </li>
+        <li v-if="isShow('透析前使用其他特殊药物')">
+          <label>透析前使用其他特殊药物: </label>
+          <span class="content">{{special_medicine_other}}</span>
+          <span class="unit"></span>
         </li>
         <li v-if="isShow('置换液')">
           <label>置换液: </label>
-          <span class="content">{{ displace_liqui }}</span>
+          <span class="content">{{displace_liqui}}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('电导度')">
-          <label>电导度 : </label>
-          <span class="content">{{
-            conductivity != "0" ? conductivity : ""
-          }}</span>
-          <span class="unit">{{ conductivity != "0" ? "mS/m" : "" }}</span>
+        <li v-if="isShow('血管通路')">
+          <label>血管通路: </label>
+          <span class="content">{{blood_access}}</span>
+          <span class="unit"></span>
+        </li>
+        <li v-if="isShow('实际超滤量')">
+          <label>实际超滤量: </label>
+          <span class="content">{{ultrafiltration != '0'? ultrafiltration:''}}</span>
+          <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
+        </li>
+        <li v-if="isShow('目标KT/V')">
+          <label>目标KT/V: </label>
+          <span class="content">{{target_ktv != '0'? target_ktv:''}}</span>
         </li>
       </ul>
-      <!-- 3333333333333333333333333333333333333333333333333333 -->
-    </div>
-    <div class="note">
-      备注 : <span>{{ note }}</span>
+
+
+
     </div>
+    <div class="note">备注 : <span>{{note}}</span></div>
   </div>
 </template>
 
 <script>
-import { getDataConfig } from "@/utils/data";
-import store from "@/store";
+  import {getDataConfig} from '@/utils/data';
+  import store from "@/store";
 
-export default {
-  name: "DialysisPrescription",
-  data() {
-    return {
-      title: "透析处方",
-      perfusion_apparatus_map: {},
-      dialysateFormulationMap: {}
-    };
-  },
-  props: {
-    prescription: {
-      type: Object
-    },
-    solution: {
-      type: Object
-    },
-    device_number_map: {
-      type: Object
-    }
-  },
-  computed: {
-    target_ultrafiltration: function() {
-      var v = this.getValueStr(
-        "target_ultrafiltration",
-        "target_ultrafiltration"
-      );
-      return v.length == 0 ? "0" : v;
-    },
-    dialysis_mode: function() {
-      var mode = this.getValueStr("mode_id", "mode_id");
-      if (mode.length == 0) {
-        return "";
-      }
-      if (this.$store.getters.treatment_mode[mode] != undefined) {
-        return this.$store.getters.treatment_mode[mode].name;
-      }
-      return "";
-    },
-    perfusion_apparatus: function() {
-      var v = this.getValueStr("perfusion_apparatus", "perfusion_apparatus");
-      if (v.length == 0) {
-        return "";
-      }
-      if (this.perfusion_apparatus_map[v] != undefined) {
-        return this.perfusion_apparatus_map[v].name;
-      }
-      return "";
-    },
-    displace_liqui: function() {
-      var v = this.getValueStr("displace_liqui", "displace_liqui");
-      return v.length == 0 ? "0" : v;
-    },
-    anticoagulant_shouji: function() {
-      var v = this.getValueStr("anticoagulant_shouji", "anticoagulant_shouji");
-      return v.length == 0 ? "0" : v;
-    },
-    kalium: function() {
-      var v = this.getValueStr("kalium", "kalium");
-      return v.length == 0 ? "0" : v;
-    },
-    replacement_total: function() {
-      var v = this.getValueStr("replacement_total", "replacement_total");
-      return v.length == 0 ? "0" : v;
-    },
-    bicarbonate: function() {
-      var v = this.getValueStr("bicarbonate", "bicarbonate");
-      return v.length == 0 ? "0" : v;
-    },
-    dialysate_flow: function() {
-      var v = this.getValueStr("dialysate_flow", "dialysate_flow");
-      return v.length == 0 ? "0" : v;
-    },
-    dialysis_duration: function() {
-      var dialysis_duration_hour = this.getValueStr(
-        "dialysis_duration_hour",
-        "dialysis_duration_hour"
-      );
-      var dialysis_duration_minute = this.getValueStr(
-        "dialysis_duration_minute",
-        "dialysis_duration_minute"
-      );
-      if (
-        dialysis_duration_hour.length == 0 &&
-        dialysis_duration_minute.length == 0
-      ) {
-        return "0";
-      } else {
-        var time =
-          dialysis_duration_hour + "h" + dialysis_duration_minute + "min";
-        return time.length == 0 ? "0" : time;
-      }
-    },
-    blood_flow_volume: function() {
-      var v = this.getValueStr("blood_flow_volume", "blood_flow_volume");
-      return v.length == 0 ? "0" : v;
-    },
-    replacement_way: function() {
-      return this.getValueStr("replacement_way", "replacement_way");
-    },
-    anticoagulant_weichi: function() {
-      var v = this.getValueStr("anticoagulant_weichi", "anticoagulant_weichi");
-      return v.length == 0 ? "0" : v;
-    },
-    sodium: function() {
-      var v = this.getValueStr("sodium", "sodium");
-      return v.length == 0 ? "0" : v;
-    },
-    glucose: function() {
-      var v = this.getValueStr("glucose", "glucose");
-      return v.length == 0 ? "0" : v;
-    },
-    dialysate_temperature: function() {
-      var v = this.getValueStr(
-        "dialysate_temperature",
-        "dialysate_temperature"
-      );
-      return v.length == 0 ? "0" : v;
-    },
-    dialyzer: function() {
-      var v = this.getValueStr("dialyzer", "hemodialysis_machine");
-      if (v.length == 0) {
-        return "";
-      }
-      if (this.device_number_map[v] != undefined) {
-        return this.device_number_map[v].name;
-      }
-      return "";
-    },
-    dialysate_formulation: function() {
-      var v = this.getValueStr(
-        "dialysate_formulation",
-        "dialysate_formulation"
-      );
-      if (v.length == 0) {
-        return "";
-      }
-      if (v in this.dialysateFormulationMap) {
-        return this.dialysateFormulationMap[v].name;
+  export default {
+    name: "DialysisPrescription",
+    data() {
+      return {
+        title: "透析处方",
+        perfusion_apparatus_map: {},
+        dialysateFormulationMap:{},
+      };
+    },
+    props: {
+      prescription: {
+        type: Object,
+      },
+      solution: {
+        type: Object,
+      },
+      device_number_map: {
+        type: Object,
       }
-      return "";
-    },
-    prescription_dewatering: function() {
-      var v = this.getValueStr("prescription_dewatering", "dewater");
-      return v.length == 0 ? "0" : v;
-    },
-    anticoagulant: function() {
-      var v = this.getValueStr("anticoagulant", "anticoagulant");
-      if (v.length == 0) {
-        return "";
-      }
-      if (this.$store.getters.anticoagulants_confit[v] != undefined) {
-        return this.$store.getters.anticoagulants_confit[v].name;
-      }
-      return "";
-    },
-    anticoagulant_zongliang: function() {
-      var v = this.getValueStr(
-        "anticoagulant_zongliang",
-        "anticoagulant_zongliang"
-      );
-      return v.length == 0 ? "0" : v;
-    },
-    calcium: function() {
-      var v = this.getValueStr("calcium", "calcium");
-      return v.length == 0 ? "0" : v;
     },
+    computed: {
+      target_ultrafiltration:function(){
+        var v = this.getValueStr("target_ultrafiltration", "target_ultrafiltration")
+        return v.length == 0 ? "0" : v
+      },
+      dialysis_mode: function() {
+        var mode = this.getValueStr("mode_id", "mode_id")
+        if (mode.length == 0) {
+          return ""
+        }
+        if (this.$store.getters.treatment_mode[mode] != undefined) {
+          return this.$store.getters.treatment_mode[mode].name
+        }
+        return ""
+      },
+      perfusion_apparatus: function() {
+        var v = this.getValueStr("perfusion_apparatus", "perfusion_apparatus")
+        if (v.length == 0) {
+          return ""
+        }
+        if (this.perfusion_apparatus_map[v] != undefined) {
+          return this.perfusion_apparatus_map[v].name
+        }
+        return ""
+      },
+      displace_liqui: function() {
+        var v = this.getValueStr("displace_liqui", "displace_liqui")
+        return v.length == 0 ? "0" : v
+      },
+      anticoagulant_shouji: function() {
+        var v = this.getValueStr("anticoagulant_shouji", "anticoagulant_shouji")
+        return v.length == 0 ? "0" : v
+      },
+      kalium: function() {
+        var v = this.getValueStr("kalium", "kalium")
+        return v.length == 0 ? "0" : v
+      },
+      replacement_total:function(){
+        var v = this.getValueStr("replacement_total", "replacement_total")
+        return v.length == 0 ? "0" : v
+      },
+      bicarbonate: function() {
+        var v = this.getValueStr("bicarbonate", "bicarbonate")
+        return v.length == 0 ? "0" : v
+      },
+      dialysate_flow: function() {
+        var v = this.getValueStr("dialysate_flow", "dialysate_flow")
+        return v.length == 0 ? "0" : v
+      },
+      dialysis_duration: function() {
+        var dialysis_duration_hour = (this.getValueStr("dialysis_duration_hour", "dialysis_duration_hour"))
+        var dialysis_duration_minute = (this.getValueStr("dialysis_duration_minute", "dialysis_duration_minute"))
+        if(dialysis_duration_hour.length == 0 && dialysis_duration_minute.length == 0){
+          return  "0"
+        }else{
+          var time = dialysis_duration_hour+"h"+dialysis_duration_minute+"min"
+          return time.length == 0 ? "0" : time
+        }
 
-    conductivity: function() {
-      var v = this.getValueStr("conductivity", "conductivity");
-      return v.length == 0 ? "0" : v;
-    },
-    dialyzer_perfusion_apparatus: function() {
-      return this.getValueStr(
-        "dialyzer_perfusion_apparatus",
-        "dialyzer_perfusion_apparatus"
-      );
-    },
-    note: function() {
-      return this.getValueStr("remark", "remark");
-    },
-    body_fluid: function() {
-      var id = this.getValueStr("body_fluid", "body_fluid");
-      if (id == 0) {
-        return "";
-      }
-      var bodyFluidOptions = this.$store.getters.body_fluid;
-      for (let i = 0; i < bodyFluidOptions.length; i++) {
-        if (bodyFluidOptions[i].id == id) {
-          return bodyFluidOptions[i].name;
+      },
+      blood_flow_volume: function() {
+        var v = this.getValueStr("blood_flow_volume", "blood_flow_volume")
+        return v.length == 0 ? "0" : v
+      },
+      replacement_way: function() {
+        return this.getValueStr("replacement_way", "replacement_way")
+      },
+      anticoagulant_weichi: function() {
+        var v = this.getValueStr("anticoagulant_weichi", "anticoagulant_weichi")
+        return v.length == 0 ? "0" : v
+      },
+      sodium: function() {
+        var v = this.getValueStr("sodium", "sodium")
+        return v.length == 0 ? "0" : v
+      },
+      glucose: function() {
+        var v = this.getValueStr("glucose", "glucose")
+        return v.length == 0 ? "0" : v
+      },
+      dialysate_temperature: function() {
+        var v = this.getValueStr("dialysate_temperature", "dialysate_temperature")
+        return v.length == 0 ? "0" : v
+      },
+      dialyzer: function() {
+        var v = this.getValueStr("dialyzer", "hemodialysis_machine")
+        if (v.length == 0) {
+          return ""
         }
-      }
-    },
-    special_medicine: function() {
-      var id = this.getValueStr("special_medicine", "special_medicine");
-      if (id == 0) {
-        return "";
-      }
-      var special_medicine = this.$store.getters.special_medicine;
-      for (let i = 0; i < special_medicine.length; i++) {
-        if (special_medicine[i].id == id) {
-          return special_medicine[i].name;
+        if (this.device_number_map[v] != undefined) {
+          return this.device_number_map[v].name
         }
-      }
-    },
-    special_medicine_other: function() {
-      return this.getValueStr(
-        "special_medicine_other",
-        "special_medicine_other"
-      );
-    },
-    blood_access: function() {
-      var id = this.getValueStr("blood_access", "blood_access");
-      if (id == 0) {
-        return "";
-      }
-      var blood_access = this.$store.getters.blood_access_internal_fistula;
-      for (let i = 0; i < blood_access.length; i++) {
-        if (blood_access[i].id == id) {
-          return blood_access[i].name;
+        return ""
+      },
+      dialysate_formulation: function(){
+        var v = this.getValueStr("dialysate_formulation", "dialysate_formulation")
+        if (v.length == 0) {
+          return ""
         }
-      }
-    },
-    displace_liqui: function() {
-      var id = this.getValueStr("displace_liqui_part", "displace_liqui_part");
-      var displace_liqui_value = this.getValueStr(
-        "displace_liqui_value",
-        "displace_liqui_value"
-      );
-      var displace_liqui_part = "";
-      var displace_liqui = this.$store.getters.displace_liqui;
-      for (let i = 0; i < displace_liqui.length; i++) {
-        if (displace_liqui[i].id == id) {
-          displace_liqui_part = displace_liqui[i].name;
+        if(v in this.dialysateFormulationMap) {
+          return  this.dialysateFormulationMap[v].name;
         }
-      }
-      return displace_liqui_part + displace_liqui_value + "L";
-    },
-    ultrafiltration: function() {
-      var v = this.getValueStr("ultrafiltration", "ultrafiltration");
-      return v.length == 0 ? "0" : v;
-    },
-    body_fluid_other: function() {
-      return this.getValueStr("body_fluid_other", "body_fluid_others");
-    },
-    target_ktv: function() {
-      var v = this.getValueStr("target_ktv", "target_ktv");
-      return v.length == 0 ? "0" : v;
-    }
-  },
-  created() {
-    var perfusion_apparatus = this.$store.getters.perfusion_apparatus;
-    var map = {};
-    for (let index = 0; index < perfusion_apparatus.length; index++) {
-      const p = perfusion_apparatus[index];
-      map[p.id] = p;
-    }
-    this.perfusion_apparatus_map = map;
+        return ""
+      },
+      prescription_dewatering: function() {
+        var v = this.getValueStr("prescription_dewatering", "dewater")
+        return v.length == 0 ? "0" : v
+      },
+      anticoagulant: function() {
+        var v = this.getValueStr("anticoagulant", "anticoagulant")
+        if (v.length == 0) {
+          return ""
+        }
+        if (this.$store.getters.anticoagulants_confit[v] != undefined) {
+          return this.$store.getters.anticoagulants_confit[v].name
+        }
+        return ""
+      },
+      anticoagulant_zongliang: function() {
+        var v = this.getValueStr("anticoagulant_zongliang", "anticoagulant_zongliang")
+        return v.length == 0 ? "0" : v
+      },
+      calcium: function() {
+        var v = this.getValueStr("calcium", "calcium")
+        return v.length == 0 ? "0" : v
+      },
 
-    var dialysateFormulationOptions = getDataConfig(
-      "hemodialysis",
-      "dialysate_formulation"
-    );
-    for (var index in dialysateFormulationOptions) {
-      this.dialysateFormulationMap[dialysateFormulationOptions[index].id] =
-        dialysateFormulationOptions[index];
-    }
-  },
-  methods: {
-    getValueStr(pkey, skey) {
-      if (
-        (this.prescription == null || this.prescription.id == "") &&
-        (this.solution == null || this.solution.id == "")
-      ) {
-        return "";
-      } else if (this.prescription != null && this.prescription.id != "") {
-        if (
-          this.prescription[pkey] == null ||
-          this.prescription[pkey] == undefined
-        ) {
-          return "";
+      conductivity: function() {
+        var v = this.getValueStr("conductivity", "conductivity")
+        return v.length == 0 ? "0" : v
+      },
+      dialyzer_perfusion_apparatus: function() {
+        return this.getValueStr("dialyzer_perfusion_apparatus", "dialyzer_perfusion_apparatus")
+      },
+      note: function() {
+        return this.getValueStr("remark", "remark")
+      },body_fluid:function () {
+        var id =  this.getValueStr("body_fluid", "body_fluid")
+        if(id == 0){
+          return ""
+        }
+        var bodyFluidOptions = this.$store.getters.body_fluid;
+        for (let i = 0; i <bodyFluidOptions.length; i++){
+          if(bodyFluidOptions[i].id == id){
+            return bodyFluidOptions[i].name
+          }
         }
-        return this.prescription[pkey] + "";
-      } else {
-        if (this.solution[skey] == null || this.solution[skey] == undefined) {
-          return "";
+      },special_medicine:function () {
+        var id =  this.getValueStr("special_medicine", "special_medicine")
+        if(id == 0){
+          return ""
         }
-        return this.solution[skey] + "";
+        var special_medicine = this.$store.getters.special_medicine;
+        for (let i = 0; i <special_medicine.length; i++){
+          if(special_medicine[i].id == id){
+            return special_medicine[i].name
+          }
+        }
+      },special_medicine_other:function () {
+        return this.getValueStr("special_medicine_other", "special_medicine_other")
+      },blood_access:function () {
+        var id =  this.getValueStr("blood_access", "blood_access")
+        if(id == 0){
+          return ""
+        }
+        var blood_access = this.$store.getters.blood_access_internal_fistula;
+        for (let i = 0; i <blood_access.length; i++){
+          if(blood_access[i].id == id){
+            return blood_access[i].name
+          }
+        }
+      },displace_liqui:function () {
+        var id =  this.getValueStr("displace_liqui_part", "displace_liqui_part")
+        var displace_liqui_value =  this.getValueStr("displace_liqui_value", "displace_liqui_value")
+        var displace_liqui_part = ""
+        var displace_liqui = this.$store.getters.displace_liqui;
+        for (let i = 0; i <displace_liqui.length; i++){
+          if(displace_liqui[i].id == id){
+            displace_liqui_part = displace_liqui[i].name
+          }
+        }
+        return displace_liqui_part + displace_liqui_value+"L"
+
+      },ultrafiltration:function () {
+        var v = this.getValueStr("ultrafiltration", "ultrafiltration")
+        return v.length == 0 ? "0" : v
+      },body_fluid_other:function() {
+        return this.getValueStr("body_fluid_other", "body_fluid_others")
+
+      },target_ktv:function () {
+        var v = this.getValueStr("target_ktv", "target_ktv")
+        return v.length == 0 ? "0" : v
       }
     },
-    isShow(name) {
-      var filedList = store.getters.xt_user.fileds;
-      for (let i = 0; i < filedList.length; i++) {
-        if (
-          filedList[i].module == 1 &&
-          filedList[i].filed_name_cn == name &&
-          filedList[i].is_show == 1
-        ) {
-          return true;
+    created() {
+      var perfusion_apparatus = this.$store.getters.perfusion_apparatus
+      var map = {}
+      for (let index = 0; index < perfusion_apparatus.length; index++) {
+        const p = perfusion_apparatus[index];
+        map[p.id] = p
+      }
+      this.perfusion_apparatus_map = map
+
+      var dialysateFormulationOptions = getDataConfig('hemodialysis','dialysate_formulation');
+      for(var index in dialysateFormulationOptions){
+        this.dialysateFormulationMap[dialysateFormulationOptions[index].id] = dialysateFormulationOptions[index];
+      }
+    },
+    methods: {
+      getValueStr(pkey, skey) {
+        if ((this.prescription == null || this.prescription.id == "") && (this.solution == null || this.solution.id == "")) {
+          return ""
+        } else if (this.prescription != null && this.prescription.id != "") {
+          if (this.prescription[pkey] == null || this.prescription[pkey] == undefined) {
+            return ""
+          }
+          return this.prescription[pkey] + ""
+        } else {
+          if (this.solution[skey] == null || this.solution[skey] == undefined) {
+            return ""
+          }
+          return this.solution[skey] + ""
+        }
+      },isShow(name){
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++){
+          if(filedList[i].module == 1 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
+            return true
+          }
         }
+        return false
       }
-      return false;
     }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped></style>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -87,273 +87,266 @@ import doubleCheckDialog from './dialog/doubleCheckDialog'
 import AssessmentAfterDislysis from './dialog/AssessmentAfterDislysis'
 import acceptsTreatmentDialog from './dialog/acceptsTreatmentDialog'
 import assessmentBeforeDislysisDialog from './dialog/assessmentBeforeDislysisDialog'
-import MonitorDialog from "./dialog/monitor_dialog"
-import DoctorAdviceDialog from "./dialog/DoctorAdviceDialog"
-import treatmentSummaryDialog from "./dialog/treatmentSummaryDialog"
-import ComputerDialog from "./dialog/computer_dialog"
-import FinishDialog from "./dialog/finish_dialog"
+import MonitorDialog from './dialog/monitor_dialog'
+import DoctorAdviceDialog from './dialog/DoctorAdviceDialog'
+import treatmentSummaryDialog from './dialog/treatmentSummaryDialog'
+import ComputerDialog from './dialog/computer_dialog'
+import FinishDialog from './dialog/finish_dialog'
 
 export default {
-    name: 'NavIgation',
-    components: {
-        dialysisPrescriptionDialog,
-        doubleCheckDialog,
-        AssessmentAfterDislysis,
-        acceptsTreatmentDialog,
-        assessmentBeforeDislysisDialog,
-        treatmentSummaryDialog,
-        MonitorDialog,
-        DoctorAdviceDialog,
-        ComputerDialog,
-        FinishDialog
-    },
-    data() {
-      return {
+  name: 'NavIgation',
+  components: {
+    dialysisPrescriptionDialog,
+    doubleCheckDialog,
+    AssessmentAfterDislysis,
+    acceptsTreatmentDialog,
+    assessmentBeforeDislysisDialog,
+    treatmentSummaryDialog,
+    MonitorDialog,
+    DoctorAdviceDialog,
+    ComputerDialog,
+    FinishDialog
+  },
+  data() {
+    return {
 
+    }
+  },
+  props: {
+    patient: { // 患者信息
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    schedual: { // 患者排班信息
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    prescription: { // 透析处方
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    solution: { // 透析方案
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    receiver_treatment_access: { // 接诊评估
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    predialysis_evaluation: { // 透前评估
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    doctor_advices: { // 临时医嘱
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    double_check: { // 双人核对
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    assessment_after_dislysis: { // 透后评估
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    treatment_summary: { // 治疗小结
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    monitor_records: { // 透析监测
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    dialysis_order: { // 透析记录
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    admin_users: { // 系统用户列表
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    devices: { // 设备
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    device_numbers: { // 床位
+      type: Array,
+      default: () => {
+        return []
       }
     },
-    props: {
-      patient: { // 患者信息
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      schedual: { // 患者排班信息
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      prescription: { // 透析处方
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      solution: { // 透析方案
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      receiver_treatment_access: { // 接诊评估
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      predialysis_evaluation: { // 透前评估
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      doctor_advices: { // 临时医嘱
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      double_check: { // 双人核对
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      assessment_after_dislysis: { // 透后评估
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      treatment_summary: { // 治疗小结
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      monitor_records: { // 透析监测
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      dialysis_order: { // 透析记录
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
-      admin_users: { //系统用户列表
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      devices: { // 设备
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      device_numbers: { // 床位
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-
-
-      niprocart_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-
-      jms_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-
-
-      fistula_needle_set_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-
-
-      fistula_needle_set_16_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
 
+    niprocart_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
-      hemoperfusion_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
+    jms_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
-      dialyser_sterilised_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
+    fistula_needle_set_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
-      filtryzer_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
+    fistula_needle_set_16_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
-      dialyzers_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      injector_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      bloodlines_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      tubingHemodialysis_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      safe_package_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      aliquid_info: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      config: {
-        type: Object,
-        default: () => {
-          return {id: 0}
-        }
-      },
+    hemoperfusion_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
+    dialyser_sterilised_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
+    filtryzer_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
 
+    dialyzers_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    injector_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    bloodlines_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    tubingHemodialysis_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    safe_package_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    aliquid_info: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
 
-      admin_user_map: { // {user_id: admin_user object}
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      device_map: { // {device_id: device object}
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      device_number_map: { // {device_number_id: device_number object}
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-    },
-    methods:{
-        showMonitorDialog: function() {
-            this.$refs.monitor_dialog.show()
-        },
-        showAssessmentAfterDialog:function(){
-            this.$refs.assessment_after_dislysis.show()
-        },
-        showDoctorAdviceDialog:function(){
-            this.$refs.doctor_advice.show();
-        },
-        showComputerDialog: function() {
-            this.$refs.computer_dialog.show()
-        },
-        showFinishDialog: function() {
-            this.$refs.finish_dialog.show()
-        },
-        showPrescription: function () {
-            this.$refs.prescription.show();
-        },
-        showAccepts:function () {
-            this.$refs.accepts.show();
-        },
-        showAssessmentBefore:function () {
-            this.$refs.assessmentBefore.show();
-        },
-        showDoubleCheck:function () {
-            this.$refs.doubleCheck.show();
-        },
-        showrTeatmentSummary:function () {
-            this.$refs.treatmentSummary.show();
-        }
+    admin_user_map: { // {user_id: admin_user object}
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    device_map: { // {device_id: device object}
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    device_number_map: { // {device_number_id: device_number object}
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  methods: {
+    showMonitorDialog: function() {
+      this.$refs.monitor_dialog.show()
+    },
+    showAssessmentAfterDialog: function() {
+      this.$refs.assessment_after_dislysis.show()
+    },
+    showDoctorAdviceDialog: function() {
+      this.$refs.doctor_advice.show()
+    },
+    showComputerDialog: function() {
+      this.$refs.computer_dialog.show()
+    },
+    showFinishDialog: function() {
+      this.$refs.finish_dialog.show()
+    },
+    showPrescription: function() {
+      this.$refs.prescription.show()
+    },
+    showAccepts: function() {
+      this.$refs.accepts.show()
+    },
+    showAssessmentBefore: function() {
+      this.$refs.assessmentBefore.show()
+    },
+    showDoubleCheck: function() {
+      this.$refs.doubleCheck.show()
+    },
+    showrTeatmentSummary: function() {
+      this.$refs.treatmentSummary.show()
     }
+  }
 }
 </script>
 <style style="stylesheet/scss" lang="scss" scoped>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -19,7 +19,7 @@
           <span class="unit" v-if="actual_ultrafiltration!='0'">ml</span>
         </li>
         <li v-if="isShow('凝血')">
-          <label>凝血 : </label>
+          <label>透析器凝血 : </label>
           <span class="content">{{ cruor }}</span>
         </li>
         <li v-if="isShow('内瘘')">
@@ -92,6 +92,12 @@
           <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
           <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
         </li>
+        <li v-if="isShow('呼吸频率')">
+          <label>呼吸频率 : </label>
+          <span class="content" v-if="breathing_rate !='0'">{{ breathing_rate }}</span>
+          <span class="unit" v-if="breathing_rate !='0'">次/min</span>
+        </li>
+
         <li v-if="isShow('实际治疗时长')">
           <label>实际治疗时长 : </label>
           <span class="content" v-if="actual_treatment_hour!='0'">{{ actual_treatment_hour }}时</span>
@@ -181,179 +187,250 @@
 </template>
 
 <script>
-  import store from "@/store";
+  import store from '@/store'
 
-  export default {
+export default {
   name: 'DialysisPrescription',
   data() {
-    return {
-      title: '透后评估 '
-    }
+      return {
+        title: '透后评估 '
+      }
   },
   props: {
-    record: {
-      type: Object
-    }
+      record: {
+        type: Object
+      }
   },
   computed: {
-    weight_after: function() {
-      if (this.record.id == 0) {
-        return '-'
-      }
-      return this.record.weight_after
-    },
-    systolic_blood_pressure: function() {
-      if (this.record.id == 0) {
-        return '-'
+      weight_after: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.weight_after
+      },
+      systolic_blood_pressure: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.systolic_blood_pressure
+      },
+      actual_ultrafiltration: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.actual_ultrafiltration
+      },
+      cruor: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.cruor
+      },
+      internal_fistula: function() {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.record.internal_fistula
+      },
+      weight_loss: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.weight_loss
+      },
+      inpatient_department: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.inpatient_department
+      },
+      patient_gose: function() {
+        if (this.record.id == 0) {
+          return 0
+        }
+        return this.record.patient_gose
+      },
+      diastolic_blood_pressure: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.diastolic_blood_pressure
+      },
+      actual_displacement: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.actual_displacement
+      },
+      symptom_after_dialysis: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.symptom_after_dialysis
+      },
+      blood_access_part: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        const vascular_access = this.$store.getters.vascular_access
+        const valen = vascular_access.length
+        let name = '-'
+
+        for (var index in vascular_access) {
+          if (vascular_access[index].id == this.record.blood_access_part_id) {
+            name = vascular_access[index].name
+            break
+          }
+        }
+        return name
+      },
+      puncture_point_oozing_blood_name: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        switch (this.record.puncture_point_oozing_blood) {
+          case 1:
+            return '有'
+            break
+          case 2:
+            return '无'
+            break
+
+          default:
+            return '-'
+            break
+        }
+      }, eat_name: function() {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        switch (this.record.is_eat) {
+          case 1:
+            return '有'
+            break
+          case 2:
+            return '无'
+            break
+
+          default:
+            return '-'
+            break
+        }
+      },
+      patient_gose_name: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        switch (this.record.patient_gose) {
+          case 1:
+            return '离院'
+            break
+          case 2:
+            return '留观'
+            break
+          case 3:
+            return '住院'
+            break
+
+          default:
+            return '-'
+            break
+        }
+      },
+      blood_access_opera: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        const vascular_access = this.$store.getters.vascular_access_desc
+        let name = '-'
+        for (var index in vascular_access) {
+          if (vascular_access[index].id == this.record.blood_access_part_opera_id) {
+            name = vascular_access[index].name
+            break
+          }
+        }
+        return name
+      },
+      catheter: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.record.catheter
+      },
+      puncture_point_haematoma_name: function() {
+        if (this.record.id == 0)
+          {return}
       }
-      return this.record.systolic_blood_pressure
-    },
-    actual_ultrafiltration: function() {
+    }, breathing_rate: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.actual_ultrafiltration
+      return this.record.breathing_rate
     },
-    cruor: function() {
+    temperature: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.cruor
-    },
-    internal_fistula: function() {
-      if (this.record == null || this.record.id == '') {
-        return '-'
-      }
-      return this.record.internal_fistula
+      return this.record.temperature
     },
-    weight_loss: function() {
+    pulse_frequency: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.weight_loss
+      return this.record.pulse_frequency
     },
-    inpatient_department: function() {
+    actual_treatment_hour: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.inpatient_department
-    },
-    patient_gose: function() {
-      if (this.record.id == 0) {
-        return 0
-      }
-      return this.record.patient_gose
+      return this.record.actual_treatment_hour
     },
-    diastolic_blood_pressure: function() {
+    actual_treatment_minute: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.diastolic_blood_pressure
+      return this.record.actual_treatment_minute
     },
-    actual_displacement: function() {
+    dialysis_intakes_feed: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.actual_displacement
+      return this.record.dialysis_intakes
     },
-    symptom_after_dialysis: function() {
+    observation_content_other: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      return this.record.symptom_after_dialysis
+      return this.record.observation_content_other
     },
-    blood_access_part: function() {
+    observation_content: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      const vascular_access = this.$store.getters.vascular_access
-      const valen = vascular_access.length
-      let name = '-'
-
-      for (var index in vascular_access) {
-        if (vascular_access[index].id == this.record.blood_access_part_id) {
-          name = vascular_access[index].name
-          break
-        }
-      }
-      return name
+      return this.record.observation_content
     },
-    puncture_point_oozing_blood_name: function() {
+    complication: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      switch (this.record.puncture_point_oozing_blood) {
-        case 1:
-          return '有'
-          break
-        case 2:
-          return '无'
-          break
-
-        default:
-          return '-'
-          break
-      }
-    },eat_name:function(){
-      if (this.record == null || this.record.id == "") {
-        return "-"
-      }
-      switch (this.record.is_eat) {
-        case 1:
-          return '有'
-          break;
-        case 2:
-          return '无'
-          break
-
-        default:
-          return '-'
-          break;
-      }
+      return this.record.complication
     },
-    patient_gose_name: function() {
+    internal_fistula_tremor_ac_name: function() {
       if (this.record.id == 0) {
         return '-'
       }
-      switch (this.record.patient_gose) {
+      switch (this.record.internal_fistula_tremor_ac) {
         case 1:
-          return '离院'
+          return '存在'
           break
         case 2:
-          return '留观'
+          return '减弱'
           break
         case 3:
-          return '住院'
+          return '无'
           break
-
         default:
           return '-'
-          break
-      }
-    },
-    blood_access_opera: function() {
-      if (this.record.id == 0) {
-        return '-'
-      }
-      const vascular_access = this.$store.getters.vascular_access_desc
-      let name = '-'
-      for (var index in vascular_access) {
-        if (vascular_access[index].id == this.record.blood_access_part_opera_id) {
-          name = vascular_access[index].name
-          break
-        }
-      }
-      return name
-    },
-    catheter: function() {
-      if (this.record.id == 0) {
-        return '-'
-      }
-      return this.record.catheter
-    },
-    puncture_point_haematoma_name: function() {
-      if (this.record.id == 0) {
-        return '-'
       }
       switch (this.record.puncture_point_haematoma) {
         case 1:
@@ -440,106 +517,105 @@
         return ''
       }
       return this.record.remark
-    },in_advance_minute:function () {
-    if (this.record == null || this.record.id == "") {
-      return ""
-    }
-    return this.record.in_advance_minute
-  },in_advance_reason:function () {
-    if (this.record == null || this.record.id == "") {
-      return ""
-    }
-    return this.record.in_advance_reason + ","+this.record.in_advance_reason_other
-  },hemostasis_minute:function () {
-    if (this.record == null || this.record.id == "") {
-      return ""
-    }
+    },
+    in_advance_minute: function() {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_minute
+    },
+    in_advance_reason: function() {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_reason + ',' + this.record.in_advance_reason_other
+    },
+    hemostasis_minute: function() {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
 
-    return this.record.hemostasis_minute
-  },in_advance_reason_other:function () {
-    if (this.record == null || this.record.id == "") {
-      return ""
-    }
-    return this.record.in_advance_reason_other
-  }
-  },
+      return this.record.hemostasis_minute
+    },
+    in_advance_reason_other: function() {
+      if (this.record == null || this.record.id == '') {
+        return ''
+      }
+      return this.record.in_advance_reason_other
+    },
   methods: {
-    getOpera:function (id) {
-      var hemostasis_opera = this.$store.getters.hemostasis_opera;
-      var hemostasisOperaName = "";
-      for (let i = 0; i < hemostasis_opera.length; i++){
-        if(hemostasis_opera[i].id == id){
-          hemostasisOperaName =    hemostasis_opera[i].name
+      getOpera: function(id) {
+        var hemostasis_opera = this.$store.getters.hemostasis_opera
+        var hemostasisOperaName = ''
+        for (let i = 0; i < hemostasis_opera.length; i++) {
+          if (hemostasis_opera[i].id == id) {
+            hemostasisOperaName = hemostasis_opera[i].name
+          }
         }
-      }
-      return hemostasisOperaName
-
-    },getTremorNoise:function (id) {
-      var tremor_noise = this.$store.getters.tremor_noise;
-      var tremorNoiseName = "";
-      for (let i = 0; i < tremor_noise.length; i++){
-        if(tremor_noise[i].id == id){
-          tremorNoiseName =    tremor_noise[i].name
+        return hemostasisOperaName
+      }, getTremorNoise: function(id) {
+        var tremor_noise = this.$store.getters.tremor_noise
+        var tremorNoiseName = ''
+        for (let i = 0; i < tremor_noise.length; i++) {
+          if (tremor_noise[i].id == id) {
+            tremorNoiseName = tremor_noise[i].name
+          }
         }
-      }
-      return tremorNoiseName
-    },getDisequilibriumSyndrome:function (id) {
-      var disequilibrium_syndrome = this.$store.getters.disequilibrium_syndrome;
-      var disequilibriumSyndromeName = "";
-      for (let i = 0; i < disequilibrium_syndrome.length; i++){
-        if(disequilibrium_syndrome[i].id == id){
-          disequilibriumSyndromeName =    disequilibrium_syndrome[i].name
+        return tremorNoiseName
+      }, getDisequilibriumSyndrome: function(id) {
+        var disequilibrium_syndrome = this.$store.getters.disequilibrium_syndrome
+        var disequilibriumSyndromeName = ''
+        for (let i = 0; i < disequilibrium_syndrome.length; i++) {
+          if (disequilibrium_syndrome[i].id == id) {
+            disequilibriumSyndromeName = disequilibrium_syndrome[i].name
+          }
         }
-      }
-      return disequilibriumSyndromeName
-
-    },getDisequilibriumSyndromeOptionName:function (id) {
-      var disequilibrium_syndrome_option = this.$store.getters.disequilibrium_syndrome_option;
-      var disequilibriumSyndromeOptionName = "";
-      for (let i = 0; i < disequilibrium_syndrome_option.length; i++) {
-        if (disequilibrium_syndrome_option[i].id == id) {
-          disequilibriumSyndromeOptionName = disequilibrium_syndrome_option[i].name
+        return disequilibriumSyndromeName
+      }, getDisequilibriumSyndromeOptionName: function(id) {
+        var disequilibrium_syndrome_option = this.$store.getters.disequilibrium_syndrome_option
+        var disequilibriumSyndromeOptionName = ''
+        for (let i = 0; i < disequilibrium_syndrome_option.length; i++) {
+          if (disequilibrium_syndrome_option[i].id == id) {
+            disequilibriumSyndromeOptionName = disequilibrium_syndrome_option[i].name
+          }
         }
-      }
-      return disequilibriumSyndromeOptionName
-    },getArterialTubeName:function (id) {
-      var arterial_tube = this.$store.getters.arterial_tube;
-      var arterialTubeName = "";
-      for (let i = 0; i < arterial_tube.length; i++) {
-        if (arterial_tube[i].id == id) {
-          arterialTubeName = arterial_tube[i].name
+        return disequilibriumSyndromeOptionName
+      }, getArterialTubeName: function(id) {
+        var arterial_tube = this.$store.getters.arterial_tube
+        var arterialTubeName = ''
+        for (let i = 0; i < arterial_tube.length; i++) {
+          if (arterial_tube[i].id == id) {
+            arterialTubeName = arterial_tube[i].name
+          }
         }
-      }
-      return arterialTubeName
-
-    },getIntravenousTubeName:function (id) {
-      var intravenous_tube = this.$store.getters.intravenous_tube;
-      var intravenousTubeName = "";
-      for (let i = 0; i < intravenous_tube.length; i++) {
-        if (intravenous_tube[i].id == id) {
-          intravenousTubeName = intravenous_tube[i].name
+        return arterialTubeName
+      }, getIntravenousTubeName: function(id) {
+        var intravenous_tube = this.$store.getters.intravenous_tube
+        var intravenousTubeName = ''
+        for (let i = 0; i < intravenous_tube.length; i++) {
+          if (intravenous_tube[i].id == id) {
+            intravenousTubeName = intravenous_tube[i].name
+          }
         }
-      }
-      return intravenousTubeName
-
-    },getDialyzer:function (id) {
-      var dialyzer = this.$store.getters.dialyzer;
-      var dialyzerName = "";
-      for (let i = 0; i < dialyzer.length; i++) {
-        if (dialyzer[i].id == id) {
-          dialyzerName = dialyzer[i].name
+        return intravenousTubeName
+      }, getDialyzer: function(id) {
+        var dialyzer = this.$store.getters.dialyzer
+        var dialyzerName = ''
+        for (let i = 0; i < dialyzer.length; i++) {
+          if (dialyzer[i].id == id) {
+            dialyzerName = dialyzer[i].name
+          }
         }
-      }
-      return dialyzerName
-    },isShow(name){
-      var filedList = store.getters.xt_user.fileds
-      for (let i = 0; i < filedList.length; i++){
-        if(filedList[i].module == 5 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
-          return true
+        return dialyzerName
+      }, isShow(name) {
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 5 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
         }
+        return false
       }
-      return false
-    },
   }
 }
 </script>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -93,6 +93,11 @@
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
 
+        <li v-if="isShow('穿刺针')">
+          <label>穿刺针 : </label>
+          <span class="content">{{this.record.puncture_needle}}</span>
+        </li>
+
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>

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

@@ -4,7 +4,7 @@
       title="透后评估"
       :visible.sync="isVisibility"
       width="1010px"
-      modal-append-to-body=“false”
+      :modal-append-to-body="false"
     >
       <el-form ref="form" :model="form" label-width="160px">
         <!-- <el-row :gutter="20"> -->
@@ -42,6 +42,12 @@
               <el-input v-model="form.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8" v-if="isShow('呼吸频率')">
+            <el-form-item label="呼吸频率(次/min): " >
+              <el-input v-model="form.breathing_rate"></el-input>
+            </el-form-item>
+          </el-col>
         <!-- </el-row>
 
         <el-row :gutter="20"> -->
@@ -376,9 +382,9 @@
   import MultiSelectBox from './MultiSelectBox'
   import { postAssessmentAfterDislysis } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
-  import store from "@/store";
+  import store from '@/store'
 
-  export default {
+export default {
     name: 'AssessmentAfterDislysis',
     props: {
       assessment_after_dislysis: { // 透后评估
@@ -458,7 +464,7 @@
           observation_content_other: '',
           remark: '',
           dialysis_order_id: 0,
-          is_eat:2,
+          is_eat: 2,
           dialysis_process: '',
           in_advance_minute: '',
           in_advance_reason: '',
@@ -470,7 +476,8 @@
           disequilibrium_syndrome_option: '',
           arterial_tube: '',
           intravenous_tube: '',
-          dialyzer: ''
+          dialyzer: '',
+          breathing_rate: ''
 
         }
       }
@@ -512,6 +519,9 @@
           if (this.assessment_after_dislysis['pulse_frequency'] == 0) {
             this.form['pulse_frequency'] = ''
           }
+          if (this.assessment_after_dislysis['breathing_rate'] == 0) {
+            this.form['breathing_rate'] = ''
+          }
           if (this.assessment_after_dislysis['actual_ultrafiltration'] == 0) {
             this.form['actual_ultrafiltration'] = ''
           }
@@ -582,8 +592,6 @@
         data['observation_content_other'] = this.form.observation_content_other
         data['remark'] = this.form.remark
         data['dialysis_order_id'] = this.form.dialysis_order_id ? parseFloat(this.form.dialysis_order_id) : 0
-
-
         data['dialysis_process'] = this.form.dialysis_process ? parseFloat(this.form.dialysis_process) : 0
         data['in_advance_minute'] = this.form.in_advance_minute ? parseFloat(this.form.in_advance_minute) : 0
         data['in_advance_reason_other'] = this.form.in_advance_reason_other
@@ -599,7 +607,6 @@
 
         data['is_eat'] = this.form.is_eat ? parseFloat(this.form.is_eat) : 0
 
-
         postAssessmentAfterDislysis(ParamsQuery, data).then(response => {
           this.loading = false
           if (response.data.state == 0) {
@@ -735,20 +742,19 @@
 
       hide() {
         this.isVisibility = false
-      }, isShow(name){
+      }, isShow(name) {
         var filedList = store.getters.xt_user.fileds
 
-
-        for (let i = 0; i < filedList.length; i++){
-
-          if(filedList[i].module == 5 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 5 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
         }
         return false
-      },
+      }
     },
     created() {
+      console.log('this.form', this.form)
       this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
       this.symptomsOptions = getDataConfig('hemodialysis', 'symptoms')
       this.internalFistulaOptions = getDataConfig('hemodialysis', 'internal_fistula')
@@ -759,7 +765,7 @@
       this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
       this.patientGoseOptions = this.$store.getters.patient_gose
       this.observationContentOptions = this.$store.getters.observation_content
-
+  
       console.log(this.patient)
 
       var date = this.$route.query && this.$route.query.date

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

@@ -142,7 +142,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="药品规格：">
-              <el-input v-model="form.drug_spec" style="width: 40%;"></el-input>
+              <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
               <el-select v-model="form.drug_spec_unit" style="width: 56%;" filterable placeholder="选择">
                 <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                 </el-option>
@@ -746,7 +746,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -783,7 +783,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -820,7 +820,7 @@ export default {
           ),
           start_time: uParseTime(
             row.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: row.advice_name,
           drug_spec: row.drug_spec != 0 ? '' + row.drug_spec : '',
@@ -1269,21 +1269,22 @@ export default {
         let tempSingleDoseDesc = ''
         const tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
+        let tempDrugDesc = ''
+
+
 
         if (row.single_dose) {
           tempSingleDoseDesc = ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
         }
-        // if(row.drug_spec){
-        //   tempDrugSpecDesc = "  "+row.drug_spec + "" + row.drug_spec_unit
-        // }
+
         if (row.prescribing_number) {
           tempPrescribingNumberDesc = '*' + row.prescribing_number + '' + row.prescribing_number_unit
         }
 
         if (isChild == 1) { // 不是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
+          return row.advice_name + row.advice_desc + row.drug_spec_unit + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
         } else { // 是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc
+          return row.advice_name + row.advice_desc + row.drug_spec_unit +  tempPrescribingNumberDesc + tempSingleDoseDesc
         }
       }
 

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

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="接诊评估"
-             modal-append-to-body=“false”
+             :modal-append-to-body= "false"
              :visible.sync="isVisibility"
             width="854px">
     <el-form :model="receiveTreatmentAsses" label-width="80px">

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

@@ -91,11 +91,17 @@
               ></el-table-column>
 
               <el-table-column
-                label="规格"
-                property="advice_desc"
+                label="药品规格"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -194,10 +200,16 @@
               align="center"
             ></el-table-column>
             <el-table-column
-              label="规格"
-              property="advice_desc"
+              label="药品规格"
               align="center"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -285,12 +297,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+           <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -309,7 +321,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

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

@@ -90,11 +90,17 @@
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
-                label="规格"
+                label="药品规格"
                 property="advice_desc"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -188,8 +194,14 @@
               label="规格"
               align="center"
 
-              property="advice_desc"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -277,12 +289,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+            <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -301,7 +313,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

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

@@ -3,7 +3,7 @@
     title="透前评估"
     :visible.sync="isVisibility"
     width="1010px"
-    modal-append-to-body=“false”
+    :modal-append-to-body="false"
   >
 
     <!--<check-box-dialog-->
@@ -161,6 +161,12 @@
             <el-input v-model="assessmentBeforeDislysis.complication" @focus="showInnerDialog('5')"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
+            <el-input v-model="assessmentBeforeDislysis.puncture_needle" @focus="showInnerDialog('11')"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
             <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
@@ -402,9 +408,9 @@
   import multiSelectBox from './MultiSelectBox'
   import { getDataConfig } from '@/utils/data'
   import { postAssessmentBeforeDislysis } from '@/api/dialysis'
-  import store from "@/store";
+  import store from '@/store'
 
-  import { uParseTime } from '@/utils/tools'
+import { uParseTime } from '@/utils/tools'
 
 export default {
     components: {
@@ -420,7 +426,7 @@ export default {
         last_dialysis_after: [],
         dialysis_interphase: [],
         symptom_before_dialysis: [],
-        blood_access_noise:[],
+        blood_access_noise: [],
         catheter: [],
         complication: [],
         hemorrhage: [],
@@ -428,9 +434,10 @@ export default {
         blood_access_part_opera: [],
         internal_fistula: [],
         internal_fistula_skin: [],
-        puncture_method:[],
+        puncture_method: [],
         isVisibiltyForCruorDialog: false,
         assessmentBeforeDislysis: {
+          puncture_needle: '',
           catheter_bend: '',
           internal_fistula_skin: '',
           weight_before: '',
@@ -452,12 +459,12 @@ export default {
           is_hemorrhage: '',
           hemorrhage: '',
           hemorrhage_other: '',
-          puncture_method:'',
-          breathing_rate:'',
+          puncture_method: '',
+          breathing_rate: '',
           dialysis_count: '',
           emergency_treatment: '',
           emergency_treatment_other: '',
-          ductus_arantii_other:'',
+          ductus_arantii_other: '',
           ductus_arantii: '',
           venous_catheterization_part_other: '',
           venous_catheterization_part: '',
@@ -466,11 +473,11 @@ export default {
           blood_access_noise: '',
           internal_fistula_other: '',
           blood_access_internal_fistula: '',
-          is_infect:'',
-          exposed:'',
-          skin:'',
-          skin_other:'',
-          infect_other:'',
+          is_infect: '',
+          exposed: '',
+          skin: '',
+          skin_other: '',
+          infect_other: ''
         },
         // InnerDialogProps: {
         //   checkedCities: [],
@@ -509,11 +516,11 @@ export default {
       }
     },
     methods: {
-      isShow(name){
+      isShow(name) {
         var filedList = store.getters.xt_user.fileds
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 3 &&filedList[i].filed_name_cn == name && filedList[i].is_show == 1){
-              return true
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 3 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
           }
         }
         return false
@@ -611,12 +618,20 @@ export default {
 
             break
           case '10': //
-            this.InnerDialogProps.values =  this.$store.getters.ductus_arantii
+            this.InnerDialogProps.values = this.$store.getters.ductus_arantii
             this.InnerDialogProps.titles = '中心静脉导管'
             this.InnerDialogProps.type = 'ductus_arantii'
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.ductus_arantii
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+          case '11': //
+            this.InnerDialogProps.values = this.$store.getters.puncture_needle
+            this.InnerDialogProps.titles = '穿刺针'
+            this.InnerDialogProps.type = 'puncture_needle'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       }, innerDialogComfirm: function(val) {
@@ -656,14 +671,15 @@ export default {
           case 'ductus_arantii':
             this.assessmentBeforeDislysis.ductus_arantii = val.value.join(',')
             break
-
-
-
+          case 'puncture_needle':
+            this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
+            break
         }
       }, innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
         const ParamsQuery = this.assessmentBeforeDislysis
+        console.log('paramsquery是什么', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
@@ -679,8 +695,10 @@ export default {
             })
 
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
+
             // prop
             var predialysis_evaluation = this.predialysis_evaluation
+            console.log('predialysis_evalution是什么', predialysis_evaluation)
             for (var index in assessment_before_dislysis_resp) {
               // predialysis_evaluation[index] = assessment_before_dislysis_resp[index];
               this.$set(predialysis_evaluation, index, assessment_before_dislysis_resp[index])
@@ -708,10 +726,6 @@ export default {
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
-
-
-
-
     }, watch: {
       isVisibility(val) {
 
@@ -735,8 +749,6 @@ export default {
             this.assessmentBeforeDislysis['is_hemorrhage'] = this.predialysis_evaluation['is_hemorrhage'] + ''
           }
 
-
-
           if (this.predialysis_evaluation['is_infect'] == 0) {
             this.assessmentBeforeDislysis['is_infect'] = ''
           } else {
@@ -772,7 +784,6 @@ export default {
           //   this.assessmentBeforeDislysis['emergency_treatment'] = this.predialysis_evaluation['emergency_treatment'] + ''
           // }
 
-
           if (this.predialysis_evaluation['blood_access_part_id'] == 0) {
             this.assessmentBeforeDislysis['blood_access_part_id'] = ''
           }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="透析上机" :visible.sync="visible" width="854px" modal-append-to-body=“false”>
+    <el-dialog title="透析上机" :visible.sync="visible" width="854px" :modal-append-to-body="false">
       <el-form :model="form" label-width="80px">
         <el-form-item label="上机床位">
           <el-select v-model="form.bed_id" placeholder="" :disabled="dialysis_order.id != 0">

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

@@ -3,7 +3,7 @@
     title="透析处方"
     :visible.sync="isVisibility"
     width="1010px"
-    modal-append-to-body=“false”
+    :modal-append-to-body="false"
     :append-to-body="true"
   >
     <el-form ref="dialysisPrescription" :model="dialysisPrescription" label-width="148px">
@@ -198,7 +198,7 @@
         <el-row :gutter="20" > -->
 
         <el-col :span="8" v-if="isShows('体液过多其他症状')">
-          <el-form-item label="其他体液过多症状">
+          <el-form-item label="体液过多其他症状">
             <el-input v-model="dialysisPrescription.body_fluid_other"></el-input>
           </el-form-item>
         </el-col>
@@ -245,8 +245,8 @@
         </el-col>
 
 
-        <el-col :span="8" v-if="isShows('血管通路(内瘘)')">
-          <el-form-item label="血管通路(内瘘)：">
+        <el-col :span="8" v-if="isShows('血管通路')">
+          <el-form-item label="血管通路：">
             <el-select v-model="dialysisPrescription.blood_access" placeholder="请选择">
               <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -480,7 +480,6 @@
         }
       },
 
-
       fistula_needle_set_info: {
         type: Array,
         default: () => {
@@ -488,7 +487,6 @@
         }
       },
 
-
       fistula_needle_set_16_info: {
         type: Array,
         default: () => {
@@ -496,7 +494,6 @@
         }
       },
 
-
       hemoperfusion_info: {
         type: Array,
         default: () => {
@@ -557,7 +554,7 @@
       config: {
         type: Object,
         default: () => {
-          return {id: 0}
+          return { id: 0 }
         }
       },
 
@@ -658,20 +655,20 @@
           ultrafiltration: '',
           blood_access: '',
 
-          niprocart:'',
-          jms:'',
-          fistula_needle_set:'',
-          fistula_needle_set_16:'',
-          hemoperfusion:'',
-          dialyser_sterilised:'',
-          filtryzer:'',
-          target_ktv:'',
-          dialyzers:'',
-          injector:'',
-          bloodlines:'',
-          tubing_hemodialysis:'',
-          package:'',
-          a_liquid:'',
+          niprocart: '',
+          jms: '',
+          fistula_needle_set: '',
+          fistula_needle_set_16: '',
+          hemoperfusion: '',
+          dialyser_sterilised: '',
+          filtryzer: '',
+          target_ktv: '',
+          dialyzers: '',
+          injector: '',
+          bloodlines: '',
+          tubing_hemodialysis: '',
+          package: '',
+          a_liquid: ''
         },
 
         anticoagulant: {
@@ -969,7 +966,6 @@
             if (this.prescription['target_ktv'] == 0) {
               this.dialysisPrescription['target_ktv'] = ''
             }
-
           } else if (this.solution != null && typeof this.solution.id !== 'undefined' && this.solution.id) {
             for (const key in this.solution) {
               this.dialysisPrescription[key] = this.solution[key]

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

@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="双人核对"
              :visible.sync="isVisibility"
-             modal-append-to-body=“false”
+             :modal-append-to-body="false"
              width="854px">
 
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="透析下机" :visible.sync="visible" width="854px" modal-append-to-body=“false” >
+        <el-dialog title="透析下机" :visible.sync="visible" width="854px" :modal-append-to-body="false" >
             <div class="txsj">
             </div>
             <el-form :model="form" label-width="80px">
@@ -45,6 +45,7 @@ export default {
 
             patient_id: 0,
             schedule_date: 0,
+            start_time: '',
 
             form: {
                 nurse_id: 0,

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

@@ -1,6 +1,6 @@
 <template>
   <div class="dialog_box">
-    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" modal-append-to-body=“false”>
+    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" :modal-append-to-body="false">
       <div v-show="edit == false">
         <div class="txsj">
           <el-button round @click="newRecordAction">新增监测</el-button>
@@ -304,9 +304,9 @@
   import { parseTime } from '@/utils'
   import { getDataConfig } from '@/utils/data'
   import { editMonitor, postDelMonitorInfo } from '@/api/dialysis_record'
-  import store from "@/store";
+  import store from '@/store'
 
-  export default {
+export default {
     name: 'MonitorDialog',
     data() {
       return {
@@ -340,8 +340,8 @@
           dialysate_temperature: '', // 透析液温度
           replacement_rate: '', // 置换率
           displacement_quantity: '', // 置换量
-          conductivity:'', //电导度
-          displacement_flow_quantity:'',//置换液流量
+          conductivity: '', // 电导度
+          displacement_flow_quantity: '', // 置换液流量
           ktv: '', // KT/V
           symptom: '', // 病情变化
           dispose: '', // 处理
@@ -379,10 +379,10 @@
       this.form.operate_time = (new Date()).getTime()
     },
     methods: {
-      isShow(name){
+      isShow(name) {
         var filedList = store.getters.xt_user.fileds
-        for (let i = 0; i < filedList.length; i++){
-          if(filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1){
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
             return true
           }
         }
@@ -447,7 +447,7 @@
           this.form.displacement_quantity = ''
           this.form.conductivity = ''
           this.form.displacement_flow_quantity = ''
-            this.form.ktv = ''
+          this.form.ktv = ''
           this.form.symptom = ''
           this.form.dispose = ''
           this.form.result = ''

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

@@ -3,7 +3,7 @@
     title="治疗小结"
     width="854px"
     :visible.sync="isVisibility"
-    modal-append-to-body=“false”
+    :modal-append-to-body="false"
   >
     <el-form :model="treatmentSummary">
       <el-row :gutter="20">
@@ -39,139 +39,127 @@
 </template>
 
 <script>
-  import {getDataConfig} from "@/utils/data";
-  import {postTreatmentsummary} from "@/api/dialysis";
-  import {uParseTime} from "@/utils/tools";
+  import { getDataConfig } from '@/utils/data'
+import { postTreatmentsummary } from '@/api/dialysis'
+import { uParseTime } from '@/utils/tools'
 
-
-
-  export default {
-    name: "treatmentSummaryDialog",
+export default {
+    name: 'treatmentSummaryDialog',
 
     props: {
-      treatment_summary : { // 治疗小结
+      treatment_summary: { // 治疗小结
         type: Object,
         default: () => {
-          return {id: 0}
+          return { id: 0 }
         }
       }, patient: { // 患者信息
         type: Object,
         default: () => {
-          return {id: 0}
+          return { id: 0 }
         }
-      },
+      }
 
     },
     data() {
       return {
-        value:'',
-        value2:'',
-
-        isVisibility:false,
-        record_date:'',
-        education:[],
-        summary:[],
-        treatmentSummary:{
-          mission: "",
-          dialysis_summary: "",
-          sj_nurse: "",
-          zl_nurse: "",
-          hd_nurse: "",
-          xj_nurse: "",
-          zl_doctor: ""
-        },
-      };
-    },
-    methods:{
+        value: '',
+        value2: '',
+
+        isVisibility: false,
+        record_date: '',
+        education: [],
+        summary: [],
+        treatmentSummary: {
+          mission: '',
+          dialysis_summary: '',
+          sj_nurse: '',
+          zl_nurse: '',
+          hd_nurse: '',
+          xj_nurse: '',
+          zl_doctor: ''
+        }
+      }
+  },
+    methods: {
       show() {
-        this.isVisibility = true;
+        this.isVisibility = true
       },
       hide() {
-        this.isVisibility = false;
+        this.isVisibility = false
       },
-      dialysisAfterTeachSelectChange: function (values) {
-
-        if (this.treatmentSummary.mission == "") {
+      dialysisAfterTeachSelectChange: function(values) {
+        if (this.treatmentSummary.mission == '') {
           this.treatmentSummary.mission = values
         } else {
           if (this.treatmentSummary.mission.indexOf(values) == -1) {
             if (this.treatmentSummary.mission.charAt(this.treatmentSummary.mission.length - 1).indexOf('。') == -1) {
-              this.treatmentSummary.mission = this.treatmentSummary.mission + "," + values
-
+              this.treatmentSummary.mission = this.treatmentSummary.mission + ',' + values
             } else {
               this.treatmentSummary.mission = this.treatmentSummary.mission + values
-
             }
           }
         }
-      },  dialysisSummarySelectChange: function (values) {
-        if (this.treatmentSummary.dialysis_summary == "") {
+      }, dialysisSummarySelectChange: function(values) {
+        if (this.treatmentSummary.dialysis_summary == '') {
           this.treatmentSummary.dialysis_summary = values
         } else {
           if (this.treatmentSummary.dialysis_summary.indexOf(values) == -1) {
             if (this.treatmentSummary.dialysis_summary.charAt(this.treatmentSummary.dialysis_summary.length - 1).indexOf('。') == -1) {
-              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + "," + values
-
+              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + ',' + values
             } else {
-              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + "," + values
+              this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + ',' + values
               this.treatmentSummary.dialysis_summary = this.treatmentSummary.dialysis_summary + values
-
             }
           }
         }
-
-      },handleCancle:function () {
-        this.isVisibility = false;
-
-      },handleComfirm:function () {
-        let ParamsQuery = this.treatmentSummary;
-        ParamsQuery["patient"] = this.patient.id;
-        ParamsQuery["record_date"] = this.record_date;
+      }, handleCancle: function() {
+        this.isVisibility = false
+      }, handleComfirm: function() {
+        const ParamsQuery = this.treatmentSummary
+        ParamsQuery['patient'] = this.patient.id
+        ParamsQuery['record_date'] = this.record_date
         postTreatmentsummary(ParamsQuery).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
+            this.$message.error(response.data.msg)
+            return false
           } else {
             this.$notify({
-              title: "成功",
-              message: "提交成功",
-              type: "success",
+              title: '成功',
+              message: '提交成功',
+              type: 'success',
               duration: 2000
-            });
+            })
 
-            let summary_resp = response.data.data.summary;
-            //prop
-            var treatment_summary = this.treatment_summary;
-            for( var index in summary_resp) {
+            const summary_resp = response.data.data.summary
+            // prop
+            var treatment_summary = this.treatment_summary
+            for (var index in summary_resp) {
               // treatment_summary[index] = summary_resp[index];
               this.$set(treatment_summary, index, summary_resp[index])
             }
 
             this.hide()
           }
-        });
-
-
+        })
       }
-    },watch: {
+    }, watch: {
       isVisibility(val) {
 
       },
-      "treatment_summary.id": function () {
+      'treatment_summary.id': function() {
         if (this.treatment_summary.id > 0) {
           for (var index in this.treatmentSummary) {
-            this.treatmentSummary[index] = this.treatment_summary[index];
+            this.treatmentSummary[index] = this.treatment_summary[index]
           }
         }
-      },
+      }
     }, created() {
-      this.education  = getDataConfig('education','education')
-      this.summary  = getDataConfig('summary','summary')
-
+      this.education = getDataConfig('education', 'education')
+      this.summary = getDataConfig('summary', 'summary')
 
-      var date = this.$route.query && this.$route.query.date;
-      this.record_date = uParseTime(date, '{y}-{m}-{d}');
-    },
+      var date = this.$route.query && this.$route.query.date
+      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+  }
   }
 </script>
 

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -50,34 +50,34 @@
 </template>
 
 <script>
-  import store from "@/store";
+  import store from '@/store'
 
-  import { parseTime } from '@/utils'
+import { parseTime } from '@/utils'
 
 export default {
   name: 'statOrder',
   data() {
-    return {
-      title: '透析监测 '
-    }
+      return {
+        title: '透析监测 '
+      }
   },
   props: {
-    monitores: {
-      type: Array
-    }
+      monitores: {
+        type: Array
+      }
   },
   methods: {
-    parseTime(time, layout) {
-      return parseTime(time, layout)
-    },isShow(name){
-      var filedList = store.getters.xt_user.fileds
-      for (let i = 0; i < filedList.length; i++){
-        if(filedList[i].module == 4 && filedList[i].filed_name_cn == name&&filedList[i].is_show == 1){
-          return true
+      parseTime(time, layout) {
+        return parseTime(time, layout)
+      }, isShow(name) {
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 4 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
         }
+        return false
       }
-      return false
-    },
   }
 }
 </script>

src/xt_pages/dialysis/details/index.vue

@@ -305,20 +305,20 @@
         device_map: {}, // {device_id: device}
         device_number_map: {}, // {device_number_id: device_number}
 
-        niprocart_info:[],
-        jms_info:[],
-        fistula_needle_set_info:[],
-        fistula_needle_set_16_info:[],
-        hemoperfusion_info:[],
-        dialyser_sterilised_info:[],
-        filtryzer_info:[],
-        dialyzers_info:[],
-        injector_info:[],
-        bloodlines_info:[],
-        tubingHemodialysis_info:[],
-        safe_package_info:[],
-        aliquid_info:[],
-        config:{},
+        niprocart_info: [],
+        jms_info: [],
+        fistula_needle_set_info: [],
+        fistula_needle_set_16_info: [],
+        hemoperfusion_info: [],
+        dialyser_sterilised_info: [],
+        filtryzer_info: [],
+        dialyzers_info: [],
+        injector_info: [],
+        bloodlines_info: [],
+        tubingHemodialysis_info: [],
+        safe_package_info: [],
+        aliquid_info: [],
+        config: {}
       }
     },
     created() {
@@ -364,7 +364,6 @@
         var mrl = this.monitor_records.length
         for (let index = 0; index < mrl; index++) {
           if (this.monitor_records[index].id == record_id) {
-
             this.monitor_records.splice(index, 1)
             break
           }
@@ -377,11 +376,14 @@
           var resp = rs.data
           if (resp.state == 1) {
             var patient = resp.data.patient // 患者信息
+            console.log('patient是史森明', patient)
             var schedual = resp.data.schedual // 患者排班信息
             var prescription = resp.data.prescription // 透析处方
+            console.log('prescription', prescription)
             var solution = resp.data.solution // 透析方案
             var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
             var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
+            console.log('predialysis_evaluation', predialysis_evaluation)
             var doctor_advices = resp.data.doctor_advices // 临时医嘱
             var double_check = resp.data.double_check // 双人核对
             var assessment_after_dislysis = resp.data.assessment_after_dislysis // 透后评估
@@ -389,7 +391,6 @@
             var monitor_records = resp.data.monitor_records // 透析监测
             var dialysis_order = resp.data.dialysis_order // 透析记录
 
-
             var niprocart_info = resp.data.niprocart_info
             var jms_info = resp.data.jms_info
             var fistula_needle_set_info = resp.data.fistula_needle_set_info
@@ -406,8 +407,6 @@
 
             var config = resp.data.config
 
-
-
             this.niprocart_info = niprocart_info
             this.jms_info = jms_info
             this.fistula_needle_set_info = fistula_needle_set_info
@@ -423,8 +422,6 @@
             this.aliquid_info = aliquid_info
             this.config = config
 
-
-
             this.patient = patient
             this.schedual = schedual == null ? { id: 0 } : schedual
             this.prescription = prescription == null ? { id: 0 } : prescription
@@ -447,7 +444,6 @@
             this.dialysis_order =
               dialysis_order == null ? { id: 0 } : dialysis_order
 
-
             // this.$refs.stat_order.setAdvices(this.doctor_advices)
             // this.$refs.monitoring.setRecords(this.monitor_records)
 

src/xt_pages/dialysis/details/statOrder.vue

@@ -21,7 +21,7 @@
           <span v-if="advice.parent_id>0">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           <span >&nbsp;{{advice.advice_name }}</span>
           <span >{{advice.advice_desc}}</span>
-          <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
+           <span v-if="advice.advice_desc">{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
           <span >{{advice.delivery_way}}</span>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -25,6 +25,10 @@
           <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 == 6">
+        <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
+      </template>
+      
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -47,6 +51,8 @@
 
       <DialysisPrintOrderFive v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 5 "> </DialysisPrintOrderFive>
 
+      <DialysisPrintOrderSix v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 6 "> </DialysisPrintOrderSix>
+
 
     </div>
   </div>
@@ -63,6 +69,7 @@
   import DialysisPrintOrderThree from './template/dialysisPrintOrderThree'
   import DialysisPrintOrderFour from './template/DialysisPrintOrderFour'
   import DialysisPrintOrderFive from './template/DialysisPrintOrderFive'
+  import DialysisPrintOrderSix from './template/DialysisPrintOrderSix'
   import print from 'print-js'
 
   export default {
@@ -73,6 +80,7 @@
       DialysisPrintOrderThree,
       DialysisPrintOrderFour,
       DialysisPrintOrderFive,
+      DialysisPrintOrderSix,
       LabelBox,
       BreadCrumb
     },
@@ -227,6 +235,14 @@
             scanStyles: false
           })
         }
+        else if (this.org_template_info.template_id == 6 ) {
+          printJS({
+            printable: 'dialysis-print-box-1',
+            type: 'html',
+            style: style2,
+            scanStyles: false
+          })
+        }
       },printThisOnePage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -907,7 +907,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -974,7 +974,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -1085,7 +1085,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrder',
+    name: 'dialysisPrintOrderFour',
     components: {
       // DialysisPrintOrderOne,
       // DialysisPrintOrderTwo,

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -836,7 +836,7 @@
               <td class="advice-name">
                 <span v-if="advice[0].parent_id>0">└</span>
                 <span>{{advice[0].advice_name }}</span>
-                <span>{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
+                <span v-if="advice[0].advice_desc">{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
                 <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                 <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
                 <span
@@ -847,8 +847,8 @@
                   <div>▲</div>
                   <div>
                     <span>{{child.advice_name }}</span>
-                    <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -915,7 +915,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -1026,7 +1026,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrder',
+    name: 'dialysisPrintOrderOne',
     components: {
       // DialysisPrintOrderOne,
       // DialysisPrintOrderTwo,

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -882,7 +882,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -949,7 +949,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -1072,7 +1072,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrder',
+    name: 'dialysisPrintOrderThree',
     components: {
       // DialysisPrintOrderOne,
       // DialysisPrintOrderTwo,

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -1110,7 +1110,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrder',
+    name: 'dialysisPrintOrderFive',
     props: ['childResponse'],
     components: {
       // DialysisPrintOrderOne,

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1024,7 +1024,7 @@
   import print from 'print-js'
 
   export default {
-    name: 'dialysisPrintOrder',
+    name: 'dialysisPrintOrderTwo',
     props: ['childResponse'],
     components: {
       // DialysisPrintOrderOne,

src/xt_pages/sign/index.vue

@@ -31,9 +31,10 @@
                     <el-table-column prop="state" label="状态" min-width="30" align="center">
                         <template slot-scope="scope">
                             <span v-if="scope.row.dialysis_order && scope.row.dialysis_order.stage==2">已下机</span>
-                            <span v-else-if="scope.row.dialysis_order && scope.row.dialysis_order.id>0 ">透析中</span>
-                            <span v-else-if="scope.row.signin.id ==0">未签到</span>
+                            <span v-else-if="scope.row.dialysis_order && scope.row.dialysis_order.id>0 ">已上机</span>
+                            <span v-else-if="scope.row.predialysisevaluation.id ==0">未签到</span>
                             <span v-else>已签到</span>
+
                         </template>
                     </el-table-column>
                 </el-table>
@@ -89,7 +90,7 @@
                     <el-row :gutter="20">
                         <el-col :span="23" align="right" class="button">
                             <el-button  @click="hide()">取消</el-button>
-                            <el-button @click="updateSignweight();sighdata();" type="primary">保存</el-button>
+                            <el-button @click="updateSignweight();" type="primary">保存</el-button>
                         </el-col>
                     </el-row>
                    </div>
@@ -101,7 +102,7 @@
 </template>
 
 <script>
-import { fetchSignPatients, getPatientSign, getDialysisInforInfomation, getDialysisAfterInfomation, updateSignweight, sighdata } from '@/api/signandweigh'
+import { fetchSignPatients, getPatientSign, getDialysisInforInfomation, getDialysisAfterInfomation, updateSignweight, sighdata, getForenoonData } from '@/api/signandweigh'
 import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
@@ -220,27 +221,61 @@ export default {
           this.querySignParams.date_time = response.data.data.today
           if (this.queryParams.need_schedule_type === 1) {
             var sl = this.schedules.length
-            console.log('s1是什么东西')
+            var panel = response.data.data.panel
+            console.log('panel是什么', panel)
+            console.log('s1是什么东西', sl)
             console.log(sl)
             for (let index = 0; index < sl; index++) {
               if (this.schedules[index].type in response.data.data.panel) {
                 console.log(this.schedules[index].type)
                 console.log(response.data.data.panel[this.schedules[index].type].schedule)
                 this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule
-                this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
-                this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
-                this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after
+                // this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
+                // console.log('sign是什么', this.schedules[index].sign)
+                // this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
+                // this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after
               }
             }
+
+            for (let index = 0; index < this.patients.length; index++) {
+              var sl = this.schedules.length
+              for (let j = 0; j < sl; j++) {
+                console.log('这个是是呢是什么', this.schedules[j].type)
+                console.log('这个是什么', this.patients[index].schedule.schedule_type)
+                if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
+                  if (this.patients[index].predialysisevaluation.id !== 0) {
+                    this.schedules[j].sign++
+                  }
+                }
+              }
+            }
+
+            // if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
+            //   var sl = this.schedules.length
+            //   for (let j = 0; j < sl; j++) {
+            //     if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
+            //       if ((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) || (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)) {
+            //         this.schedules[j].sign++
+            //       }
+            //       if (signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0) {
+            //         this.schedules[j].before++
+            //       }
+            //       if (signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0) {
+            //         this.schedules[j].after++
+            //       }
+            //     }
+            //   }
+            // }
           }
         }
       })
     },
     getPatientSign() {
       getPatientSign(this.querySignParams).then(response => {
-        if (response.data.state == 1) {
+        if (response.data.state === 1) {
           if (response.data.data.sign != null) {
             var sign = response.data.data.sign
+            console.log('sign是什么', sign)
             this.weigh_form.dry_weight = sign.dry_weight
             this.weigh_form.clothes_weight = sign.clothes_weight
             // 透前
@@ -331,7 +366,7 @@ export default {
       getDialysisAfterInfomation(id).then(response => {
         if (response.data.data.patientinfor != null) {
           var patientinfor = response.data.data.patientinfor
-          console.log(patientinfor)
+          console.log('patientInfor', patientinfor)
           this.weigh_infor.dry_weight = patientinfor.dry_weight
           if (this.weigh_infor.dry_weight === 0) {
             this.weigh_infor.dry_weight = ''
@@ -372,6 +407,7 @@ export default {
     },
 
     updateSignweight() {
+      // eslint-disable-next-line no-new-object
       var params = new Object()
       var data_time = this.querySignParams.date_time
       params.date_time = data_time
@@ -392,10 +428,13 @@ export default {
 
       updateSignweight(params).then(response => {
         if (response.data.state === 1) {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
+          var signs = response.data.data.signs
+          console.log('signs是什么', signs)
+          this.$message.success('成功')
+          // this.$message({
+          //   type: 'success',
+          //   message: '成功!'
+          // })
         }
       })
       console.log('params数据', params)
@@ -408,6 +447,7 @@ export default {
       // 透前数据
       var params = new Object()
       var data_time = this.querySignParams.date_time
+      console.log('data_time', data_time)
       params.date_time = data_time
       params.patient_id = this.weigh_form.patient_id
       params.dry_weight = this.weigh_list.dry_weight
@@ -429,15 +469,19 @@ export default {
         var signs = response.data.data.signs
         console.log('signs是什么?', signs)
         if (response.data.state === 1) {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
+          // this.$message({
+          //   type: 'success',
+          //   message: '成功!'
+          // })
           var tlen = this.patients.length
 
           for (let index = 0; index < tlen; index++) {
             if (this.patients[index].id === params.patient_id) {
               var signin = this.patients[index].signin
+              console.log('signin是什么', signin)
+              var sings = response.data.data.signs
+              console.log('signs', signs)
+
               this.patients[index].signin = response.data.data.signs
 
               if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
@@ -465,7 +509,16 @@ export default {
           return false
         }
       })
+    },
+    getForenoonData() {
+      getForenoonData().then(response => {
+        if (response.data.state === 1) {
+          var total = response.data.data.total
+          console.log('total', total)
+        }
+      })
     }
+
   },
   watch: {
     'weigh_form.weigh_before': function() {
@@ -522,6 +575,7 @@ export default {
     this.queryParams.schedule_type = -1
     this.queryParams.need_schedule_type = 1
     this.fetchSignPatients()
+    this.getForenoonData()
   }
 }
 </script>

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -4,8 +4,8 @@
       <el-form ref="groupForm" :rules="groupRules" :model="groupForm" label-width="90px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="医嘱类型 :" required prop="advice_type">
-              <el-select v-model="groupForm.advice_type" placeholder="请选择">
+            <el-form-item label="医嘱类型 :" >
+              <el-select v-model="groupForm.advice_type" placeholder="请选择" disabled>
                 <el-option
                   :label="item.label"
                   :key="item.value"
@@ -19,14 +19,17 @@
             <el-form-item label="开始时间 :" required prop="start_time">
               <el-date-picker
                 type="datetime"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="groupForm.start_time"
               ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
+
+
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="开嘱医生 :">
@@ -41,14 +44,15 @@
         </el-row>
         <el-row style="margin-bottom: 20px">
           <el-col :span="2">&nbsp;</el-col>
-          <el-col :span="5">
-            <el-button
-              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
-              @click="openAdviceTemplate()"
-              round
-            >选择医嘱模板
-            </el-button>
-          </el-col>
+          <!--<el-col :span="5">-->
+            <!--<el-button-->
+              <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
+              <!--@click="openAdviceTemplate()"-->
+              <!--round-->
+              <!---->
+            <!--&gt;选择医嘱模板-->
+            <!--</el-button>-->
+          <!--</el-col>-->
 
           <el-col :span="5">
             <el-button
@@ -99,19 +103,14 @@
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
-                label="规格"
+                label="药品规格"
                 property="advice_desc"
-              ></el-table-column>
-              <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
+              >
                 <template slot-scope="scope">
-                  <span
-                    v-if="scope.row.drug_spec!=0"
-                  >{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
-                  <span
-                    v-if="scope.row.prescribing_number!=0"
-                  >*{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                 </template>
-              </el-table-column> -->
+              </el-table-column>
+
               <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
                 <template slot-scope="scope">
                   <span
@@ -141,6 +140,16 @@
                   <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
+
+
+              <el-table-column label="提醒频率" min-width="80" property="execution_frequency" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                  <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                  <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_day}}</span>
+                </template>
+              </el-table-column>
+
             </el-table>
           </el-col>
         </el-row>
@@ -189,9 +198,14 @@
               style="word-break: keep-all;white-space:nowrap;"
             ></el-table-column>
             <el-table-column
-              label="规格"
+              label="药品规格"
               property="advice_desc"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -279,12 +293,12 @@
           </el-col>
           <el-col :span="12">
 
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -303,7 +317,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -397,6 +411,42 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="24" v-if="groupForm.advice_type == 1&&!isChild">
+            <el-form-item label="周期提醒 :">
+              <el-radio-group v-model="nameForm.frequency_type">
+                <el-radio :label="1">每次必推</el-radio>
+                <el-radio :label="2">天数频率</el-radio>
+                <el-radio :label="3">星期频率</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="12" v-if="nameForm.frequency_type == 2">
+            <el-form-item prop="day_count">
+              <el-input style="width: 50px" v-model="nameForm.day_count"></el-input>&nbsp;
+              天/一次
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24" v-if="nameForm.frequency_type == 3">
+            <el-form-item prop="weekday">
+              <el-checkbox-group v-model="weeks">
+                <el-checkbox label="周一" name="type"></el-checkbox>
+                <el-checkbox label="周二" name="type"></el-checkbox>
+                <el-checkbox label="周三" name="type"></el-checkbox>
+                <el-checkbox label="周四" name="type"></el-checkbox>
+                <el-checkbox label="周五" name="type"></el-checkbox>
+                <el-checkbox label="周六" name="type"></el-checkbox>
+                <el-checkbox label="周日" name="type"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+
+
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -430,6 +480,7 @@
     name: 'EditGroupAdvice',
     data() {
       return {
+        weeks:[],
         editRowKey: 0,
         templateFormVisible: false,
         oldTemplateFormVisible: false,
@@ -463,7 +514,7 @@
           prescribing_number: "",
           prescribing_number_unit: "",
           delivery_way: "",
-          execution_frequency: "",
+          execution_frequency: 0,
           isEdit: 0,
           index: 0,
           id: 0,
@@ -495,6 +546,17 @@
           return []
         }
       },
+      weekList: [
+        { id: 1, name: '周一' },
+        { id: 2, name: '周二' },
+        { id: 3, name: '周三' },
+        { id: 4, name: '周四' },
+        { id: 5, name: '周五' },
+        { id: 6, name: '周六' },
+        { id: 7, name: '周日' }
+
+      ],
+      weekday:[],
       groupFormVisible: false,
       groupForm: {
         advice_type: "",
@@ -504,6 +566,10 @@
         advice_doctor: "",
         remark: "",
         parent_id: 0,
+        remind:0,
+        frequency_type:0,
+        day_count:'',
+
       },
       adviceTypeOptions: {
         type: Array,
@@ -643,7 +709,6 @@
                 start_time: _this.groupForm.start_time,
                 advice_name: _this.nameForm.advice_name,
                 advice_desc: _this.nameForm.advice_desc,
-
                 single_dose: '' + _this.nameForm.single_dose,
                 single_dose_unit: _this.nameForm.single_dose_unit,
                 drug_spec: '' + _this.nameForm.drug_spec,
@@ -658,7 +723,13 @@
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.parent_id,
                 groupno: _this.groupForm.groupno,
+                frequency_type: _this.nameForm.frequency_type,
+                day_count:_this.nameForm.day_count.toString(),
+                week_days:this.weeks.filter(function(s) {
+                  return s && s.trim()
+                }).join(','),
               };
+              console.log( _this.adviceTableData)
               EditDoctorAdvice(this.patientID, this.groupSelectRow.id, submitForm).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
@@ -687,6 +758,11 @@
                       _this.adviceTableData[index].execution_frequency = advice.execution_frequency;
                       _this.adviceTableData[index].prescribing_number = advice.prescribing_number;
                       _this.adviceTableData[index].prescribing_number_unit = advice.prescribing_number_unit;
+
+                      _this.adviceTableData[index].frequency_type = advice.frequency_type;
+                      _this.adviceTableData[index].day_count = advice.day_count;
+                      _this.adviceTableData[index].week_day = advice.week_day;
+
                       break;
                     }
                   }
@@ -715,6 +791,7 @@
                       }
                     }
                   } else {
+
                     for (let index = 0; index < ale; index++) {
                       if (_this.groupSelectRow.row_key == _this.groupForm.adviceNames[index].row_key) {
                         _this.groupForm.adviceNames[index].advice_name = _this.nameForm.advice_name;
@@ -728,6 +805,11 @@
                         _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way;
                         _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency;
 
+
+                        _this.groupForm.adviceNames[index].frequency_type = _this.nameForm.frequency_type;
+                        _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
+                        _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
+                          console.log(_this.weeks)
                         _this.$set(_this.groupForm.adviceNames, index, _this.groupForm.adviceNames[index]);
                         break;
                       }
@@ -735,6 +817,7 @@
                   }
                 }
               });
+              // this.weeks = []
 
             } else {
               if (_this.isChild) {
@@ -808,6 +891,9 @@
                 });
 
               } else {
+                _this.nameForm.week_days= this.weeks.filter(function(s) {
+                  return s && s.trim()
+                }).join(',')
                 _this.submitGroupForm = {
                   advice_type: _this.groupForm.advice_type,
                   advice_date: _this.groupForm.advice_date,
@@ -824,6 +910,12 @@
                       prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                       delivery_way: _this.nameForm.delivery_way,
                       execution_frequency: _this.nameForm.execution_frequency,
+                      template_id:"D" + new Date().getTime() + this.getRandValue(),
+
+                      frequency_type: _this.nameForm.frequency_type,
+                      day_count: _this.nameForm.day_count.toString(),
+                      week_days: _this.nameForm.week_days,
+
                       isEdit: 0,
                       id: 0,
                       children: [],
@@ -834,6 +926,9 @@
                   remark: _this.groupForm.remark,
                   parent_id: 0,
                 };
+
+
+
                 CreateGroupAdvice(_this.patientID, _this.groupForm.groupno, _this.submitGroupForm).then(response => {
                   if (response.data.state == 0) {
                     _this.$message.error(response.data.msg);
@@ -845,6 +940,7 @@
                       type: "success",
                       duration: 2000
                     });
+                    this.weeks = []
                     if (_this.adviceType == _this.groupForm.advice_type || _this.adviceType == 0) {
 
                       // var alen = response.data.data.advices.length
@@ -907,6 +1003,11 @@
                           prescribing_number_unit: groups[index].prescribing_number_unit,
                           delivery_way: groups[index].delivery_way,
                           execution_frequency: groups[index].execution_frequency,
+
+                          frequency_type: groups[index].frequency_type,
+                          day_count: groups[index].day_count,
+                          week_day: groups[index].week_day,
+
                           isEdit: 0,
                           index: 0,
                           id: groups[index].id,
@@ -953,8 +1054,20 @@
             _this.nameFormVisible = false;
           }
         });
-      },
+      },getRandValue(){
+        var charactors="1234567890";
+
+        var value='',i;
 
+        for(let j=1;j<=4;j++){
+
+          i = parseInt(10*Math.random());
+
+          value = value + charactors.charAt(i);
+
+        }
+        return value
+      },
       openGroupChild() {
         if (this.groupSelectRow === null) {
 
@@ -1016,8 +1129,14 @@
             id: this.groupSelectRow.id,
             children: [],
             parent_row: this.groupSelectRow.parent_row,
-            // row_key:this.groupSelectRow.row_key,
+
+            day_count: this.groupSelectRow.day_count,
+            week_days: this.groupSelectRow.week_day,
+            frequency_type: this.groupSelectRow.frequency_type
+
           };
+          // console.log(this.nameForm.week_days)
+          this.weeks = this.groupSelectRow.week_day.split(",")
           this.nameFormTitle = '修改医嘱内容';
         } else {
           this.nameForm = {
@@ -1031,11 +1150,15 @@
             prescribing_number_unit: "",
             delivery_way: "",
             execution_frequency: "",
+            template_id:"",
             isEdit: 0,
             index: 0,
             id: 0,
             children: [],
             parent_row: 0,
+            day_count: '',
+            week_days: '',
+            frequency_type: 0,
           };
           this.nameFormTitle = '新增医嘱内容';
         }
@@ -1286,6 +1409,7 @@
             prescribing_number_unit: this.allSelectedTemplate[index].prescribing_number_unit,
             delivery_way: this.allSelectedTemplate[index].delivery_way,
             execution_frequency: this.allSelectedTemplate[index].execution_frequency,
+
             isEdit: 0,
             id: 0,
             children: [],

src/xt_pages/user/components/PatientDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container ">
-    <el-dialog title="新增甲肝乙肝丙肝梅毒HIV" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" >
+    <el-dialog title="查看传染病检查结果" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" >
       <el-form :model="form"  ref="form" label-position="top">
         <el-row >
           <el-col :span="1">&nbsp;</el-col>
@@ -153,11 +153,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="24">
-              <el-form-item label="响应结果 : " >
-                <el-input disabled type="textarea" :rows="3" v-model="form.response_result" resize="none" placeholder=""></el-input>
-              </el-form-item>
-            </el-col>
+
 
             <el-col :span="24">
               <el-form-item label="传染病周期提醒: " >
@@ -337,13 +333,7 @@
             <el-input type="textarea" :rows="3" v-model="form.remark" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="传染病 : " prop="contagions">
-            <el-checkbox-group v-model="form.contagions">
-              <el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id" :value="item.id" disabled>{{item.name}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="24">
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group v-model="form.diseases">
@@ -653,6 +643,9 @@ export default {
       print_time: '',
 
       rules: {
+        contagions: [
+          { type: 'array', required: false, trigger: 'change' }
+        ],
         avatar: [{ required: true, message: '请上传头像', trigger: 'blur' }],
         patientType: [
           { required: true, message: '请选择患者类型', trigger: 'blur' }
@@ -1199,7 +1192,8 @@ export default {
       //  var params =new Object();
       //    params.id = this.patientPrint.id
       //    params.name =  this.patientPrint.name;
-      this.$options.methods.qrcode(epatientID, ename, egender, eidCardNo, edialysisNo, ephone, eheathCareNo)// 调用生成二维码的方法
+      // this.$options.methods.qrcode(epatientID, ename, egender, eidCardNo, edialysisNo, ephone, eheathCareNo)// 调用生成二维码的方法
+      this.$options.methods.qrcode(patientID, name, gender, idCardNo, dialysisNo, phone, healthCareNo)
       // this.$options.methods.qrcode(params)
     },showInspectDialog(){
       this.dialogFormVisible = true

src/xt_pages/user/components/PatientForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-contain">
-    <el-dialog title="新增甲肝乙肝丙肝梅毒HIV" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
+    <el-dialog title="新增传染病检查" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
       <el-form :model="form"  ref="form" label-position="top">
         <el-row >
           <el-col :span="1">&nbsp;</el-col>
@@ -201,11 +201,7 @@
 
               </el-col>
 
-              <el-col :span="24">
-                <el-form-item label="响应结果 : " >
-                  <el-input type="textarea" :rows="3" v-model="form.response_result" resize="none" placeholder=""></el-input>
-                </el-form-item>
-              </el-col>
+
 
               <el-col :span="24">
                 <el-form-item label="传染病周期提醒: " >
@@ -975,27 +971,27 @@
               this.form.age = parseInt(this.form.age)
               createPatient(this.form)
                 .then(response => {
-                  // if (response.data.state == 0) {
-                  //   this.$message.error(response.data.msg)
-                  //   this.formSubmit = true
-                  //   return false
-                  // } else {
-                  //   this.formSubmit = true
-                  //   this.$notify({
-                  //     title: '成功',
-                  //     message: this.submitMsg,
-                  //     type: 'success',
-                  //     duration: 2000
-                  //   })
-                  //   this.$refs[formName].resetFields()
-                  //   this.$store.dispatch('SetSubscibePatients')
-                  //   var sub = this.$store.getters.xt_user.subscibe
-                  //   console.log(sub)
-                  //   if (action !== 'renew') {
-                  //     this.$router.back(-1)
-                  //   }
-                  //   return false
-                  // }
+                  if (response.data.state == 0) {
+                    this.$message.error(response.data.msg)
+                    this.formSubmit = true
+                    return false
+                  } else {
+                    this.formSubmit = true
+                    this.$notify({
+                      title: '成功',
+                      message: this.submitMsg,
+                      type: 'success',
+                      duration: 2000
+                    })
+                    this.$refs[formName].resetFields()
+                    this.$store.dispatch('SetSubscibePatients')
+                    var sub = this.$store.getters.xt_user.subscibe
+                    console.log(sub)
+                    if (action !== 'renew') {
+                      this.$router.back(-1)
+                    }
+                    return false
+                  }
                 })
                 .catch(err => {
                   this.$message.error('网络异常')

src/xt_pages/user/inspection.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="patient-container">
-    <patient-sidebar :id="patientID" defaultActive="1-3"></patient-sidebar>
-    <div
-      class="patient-app-container app-container"
-      v-loading="pageLoading"
-      element-loading-text="拼命加载中"
-    >
+    <patient-sidebar :id="patientID" defaultActive="1-3" ></patient-sidebar>
+    <div class="patient-app-container app-container" v-loading="pageLoading" element-loading-text="拼命加载中">
       <el-row :gutter="20">
         <el-col :span="7">
           <el-table
@@ -25,56 +21,25 @@
               <el-table-column
                 prop="project_name"
                 label="检验项目"
-                align="center"
-              >
+                align="center">
               </el-table-column>
               <el-table-column
                 prop="count"
                 label="次数"
                 width="80"
-                align="center"
-              >
+                align="center">
               </el-table-column>
             </el-table-column>
           </el-table>
         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
-            <el-button
-              size="small"
-              class="filter-item"
-              type="primary"
-              @click="openNew()"
-              icon="el-icon-circle-plus-outline"
-              :disabled="project ? false : true"
-              >新增</el-button
-            >
-            <el-button
-              size="small"
-              class="filter-item"
-              type="primary"
-              icon="el-icon-edit-outline"
-              @click="openEdit()"
-              :disabled="itemDate ? false : true"
-              >修改</el-button
-            >
-            <el-button
-              size="small"
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteInspection()"
-              :disabled="itemDate ? false : true"
-              >删除</el-button
-            >
+            <el-button size="small" class="filter-item" type="primary" @click="openNew()" icon="el-icon-circle-plus-outline" :disabled="project?false:true">新增</el-button>
+            <el-button size="small" class="filter-item" type="primary" icon="el-icon-edit-outline" @click="openEdit()" :disabled="itemDate?false:true">修改</el-button>
+            <el-button size="small" class="filter-item" type="danger" icon="el-icon-delete" @click="deleteInspection()" :disabled="itemDate?false:true">删除</el-button>
           </div>
-          <div class="filter-container">
-            <el-button class="filter-item" type="text" style="color:#000"
-              >{{ itemName }}
-              <span v-if="itemDate"
-                >（检查日期：{{ itemDate }}）</span
-              ></el-button
-            >
+          <div class="filter-container" >
+            <el-button class="filter-item" type="text" style="color:#000">{{itemName}} <span v-if="itemDate">（检查日期：{{itemDate}}）</span></el-button>
           </div>
           <el-table
             :header-cell-style="{
@@ -91,72 +56,59 @@
               prop="item_name"
               label="检验项目"
               align="center"
-              min-width="180"
-            >
+              min-width="180">
               <template slot-scope="scope">
-                {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
+                {{scope.row.item_name}} {{scope.row.item_name_addition}}
               </template>
             </el-table-column>
             <el-table-column
               prop="name"
               label="结果"
               align="center"
-              min-width="80"
-            >
+              min-width="80">
               <template slot-scope="scope">
-                <span>{{ scope.row.value }}</span>
-                <span v-if="scope.row.range_type == 1">{{
-                  scope.row.value_direction
-                }}</span>
+                <span>{{scope.row.value}}</span>
+                <span v-if="scope.row.range_type==1">{{scope.row.value_direction}}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="address"
               label="参考值"
               align="center"
-              min-width="120"
-            >
+              min-width="120">
               <template slot-scope="scope">
-                <span v-if="scope.row.range_type == 1"
-                  >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
-                >
-                <span v-else>{{ scope.row.range_value }}</span>
+                <span v-if="scope.row.range_type==1">{{scope.row.range_min}}~{{scope.row.range_max}}</span>
+                <span v-else>{{scope.row.range_value}}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="unit"
               label="单位"
               align="center"
-              min-width="80"
-            >
+              min-width="80">
             </el-table-column>
           </el-table>
           <el-pagination
-            align="right"
+          align="right"
             @current-change="handleCurrentChangePage"
             :current-page="queryParams.page"
             :page-size="1"
             background
             style="margin-top:20px;"
             layout="total, prev, pager, next, jumper"
-            :total="total"
-          >
+            :total="total">
           </el-pagination>
         </el-col>
       </el-row>
     </div>
 
-    <el-dialog
-      :title="formTitle"
-      :visible.sync="dialogFormVisible"
-      width="1000px"
-      id="user-inspection-form"
-      v-loading="formLoading"
-    >
-      <el-form :model="form" ref="form" label-position="top">
+    <el-dialog :title="formTitle" :visible.sync="dialogFormVisible" width="1000px" id="user-inspection-form" v-loading="formLoading">
+
+      <el-form :model="form"  ref="form" label-position="top">
+
         <el-row v-if="form.formItem[0].project_id == 14">
           <el-col :span="24">
-            <el-form-item label="传染病周期提醒: ">
+            <el-form-item label="传染病周期提醒: " >
               <el-radio-group v-model="form.remind_cycle">
                 <el-radio :label="1">一月一次</el-radio>
                 <el-radio :label="2">两月一次</el-radio>
@@ -167,81 +119,54 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="7">
-            <el-form-item
-              label="检验日期"
-              prop="inspect_date"
-              :rules="[
-                { required: true, message: '请输入检验日期', trigger: 'blur' }
-              ]"
-            >
-              <el-date-picker
-                style="width:95%"
+          <el-col :span="7" >
+            <el-form-item label="检验日期" prop="inspect_date" :rules="[
+                  { required: true, message: '请输入检验日期', trigger: 'blur' },
+                ]" >
+              <el-date-picker style="width:95%"
                 v-model="form.inspect_date"
                 type="date"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
                 placeholder="选择日期"
-                :readonly="form.method == 'add' ? false : true"
-              >
+                :readonly="form.method=='add'?false:true"
+                >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="1">&nbsp;</el-col>
 
-          <template v-for="(item, index) in form.formItem">
+          <template v-for="(item, index) in form.formItem" >
             <el-col :span="7" :key="index">
-              <el-form-item
-                :label="item.item_name"
-                v-if="item.range_type == 1"
-                :key="item.item_id"
-                :prop="'formItem.' + index + '.value'"
-              >
-                <el-input
-                  placeholder="请填入"
-                  v-model="item.value"
-                  style="width:95%"
-                  type="number"
-                >
-                  <template slot="append">{{ item.unit }}</template>
+              <el-form-item :label="item.item_name" v-if="item.range_type==1"  :key="item.item_id" :prop="'formItem.' + index + '.value'"
+             >
+                <el-input placeholder="请填入" v-model="item.value" style="width:95%" type="number">
+                  <template slot="append">{{item.unit}}</template>
                 </el-input>
               </el-form-item>
-              <el-form-item
-                :label="item.item_name"
-                v-else
-                :key="item.item_id"
-                :prop="'formItem.' + index + '.value'"
+              <el-form-item :label="item.item_name" v-else :key="item.item_id" :prop="'formItem.' + index + '.value'"
               >
-                <el-select
-                  v-model="item.value"
-                  placeholder="请选择"
-                  style="width:95%"
-                >
+                <el-select  v-model="item.value" placeholder="请选择" style="width:95%">
                   <el-option
                     v-for="(optionItem, oidex) in item.select_options"
                     :key="oidex"
                     :label="optionItem"
-                    :value="optionItem"
-                  >
+                    :value="optionItem">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="1" :key="'form-col' + index">&nbsp;</el-col>
+            <el-col :span="1" :key="'form-col'+index">&nbsp;</el-col>
           </template>
+
         </el-row>
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          v-if="form.method == 'add'"
-          @click="submitNew('form')"
-          >保 存</el-button
-        >
-        <el-button type="primary" v-else @click="submitEdit('form')"
-          >保 存</el-button
-        >
+        <el-button type="primary" v-if="form.method=='add'" @click="submitNew('form')">保 存</el-button>
+        <el-button type="primary" v-else @click="submitEdit('form')">保 存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -249,104 +174,95 @@
 
 <script>
 import PatientSidebar from "./components/PatientSidebar";
-import {
-  fetchInspectionReference,
-  CreatePatientInspection,
-  fetchPatientInspections,
-  EditPatientInspection,
-  DeletePatientInspection
-} from "@/api/inspection";
-import { uParseTime, isPositiveNumber } from "@/utils/tools";
+import {fetchInspectionReference,CreatePatientInspection,fetchPatientInspections,EditPatientInspection,DeletePatientInspection} from "@/api/inspection";
+import {uParseTime,isPositiveNumber} from "@/utils/tools";
 
 export default {
   name: "Inspection",
   components: { PatientSidebar },
   data() {
     return {
-      total: 0,
-      pageLoading: true,
-      itemLoading: false,
-      formLoading: false,
-      itemDate: "",
+      total:0,
+      pageLoading:true,
+      itemLoading:false,
+      formLoading:false,
+      itemDate:'',
       patientID: 0,
       panelClass: "patient-app-container",
       patientInfo: {
         id: 0
       },
-      itemName: "请选择项目",
-      formTitle: "",
-      dialogFormVisible: false,
-      patient_info: null,
-      form: {
-        remind_cycle: "",
-        method: "add",
-        project_id: 0,
-        inspect_date: "",
-        formItem: [{ id: 0, value: "" }]
+      itemName:'请选择项目',
+      formTitle:'',
+      dialogFormVisible:false,
+      patient_info:null,
+      form:{
+        remind_cycle:'',
+        method:'add',
+        project_id:0,
+        inspect_date:'',
+        formItem:[
+          {id:0, value:''},
+        ]
+      },
+      formItem:[],
+      items:[],
+      inspections:[],
+      inspectionsMap:{},
+      projects:[],
+      project:null,
+      queryParams:{
+        patient:0,
+        project_id:0,
+        page:1
       },
-      formItem: [],
-      items: [],
-      inspections: [],
-      inspectionsMap: {},
-      projects: [],
-      project: null,
-      queryParams: {
-        patient: 0,
-        project_id: 0,
-        page: 1
-      }
     };
   },
-  methods: {
-    deleteInspection() {
-      if (this.project == null || this.itemDate == "") {
+  methods:{
+    deleteInspection(){
+
+      if(this.project == null || this.itemDate == "") {
         this.$message.error("请先选择删除删除的记录");
         return false;
       }
 
-      this.$confirm("确认删除此记录?", "删除", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          var params = {
-            patient: this.patientID,
-            date: this.itemDate,
-            project_id: this.project.project_id
-          };
-          DeletePatientInspection(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
-            } else {
-              this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
-                duration: 2000
-              });
+      this.$confirm('确认删除此记录?', '删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+        var params = {patient: this.patientID, date: this.itemDate, project_id: this.project.project_id};
+          DeletePatientInspection(params).then(response=>{
+              if(response.data.state==0) {
+                  this.$message.error(response.data.msg);
+                  return false;
+              }else {
+                this.$notify({
+                    title: "成功",
+                    message: "删除成功",
+                    type: "success",
+                    duration: 2000
+                });
 
-              for (var index in this.projects) {
-                if (this.projects[index].project_id == params.project_id) {
-                  this.projects[index].count--;
-                  break;
+                for( var index in this.projects) {
+                  if (this.projects[index].project_id == params.project_id) {
+                    this.projects[index].count --;
+                    break;
+                  }
+                }
+                this.total -=1;
+                this.itemDate = "";
+                this.items = [];
+                if(this.total > 0) {
+                  this.queryParams.page = 1;
+                  this.fetchPatientInspections(this.queryParams);
                 }
               }
-              this.total -= 1;
-              this.itemDate = "";
-              this.items = [];
-              if (this.total > 0) {
-                this.queryParams.page = 1;
-                this.fetchPatientInspections(this.queryParams);
-              }
-            }
           });
-        })
-        .catch(() => {});
+      }).catch(() => { });
     },
-    openEdit() {
-      if (this.project == null) {
+    openEdit(){
+      if(this.project == null) {
         this.$message.error("请先选择项目");
         return false;
       }
@@ -355,151 +271,131 @@ export default {
       this.formTitle = "修改" + this.project.project_name;
       this.form.project_id = this.project.project_id;
       this.form.inspect_date = this.itemDate;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
-      console.log(this.form.remind_cycle);
+      this.form.remind_cycle = this.patient_info.remind_cycle
+      console.log(this.form.remind_cycle)
 
       this.form.formItem = [];
-      for (var index in this.project.inspection_reference) {
+      for(var index in this.project.inspection_reference){
         this.form.formItem.push({
-          id:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .id
-              : 0,
+          id:  (this.project.inspection_reference[index].id in this.inspectionsMap)? this.inspectionsMap[this.project.inspection_reference[index].id].id:0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value:
-            this.project.inspection_reference[index].id in this.inspectionsMap
-              ? this.inspectionsMap[this.project.inspection_reference[index].id]
-                  .inspect_value
-              : "",
-          select_options: this.project.inspection_reference[
-            index
-          ].range_options.split(","),
-          unit: this.project.inspection_reference[index].unit
+          value:(this.project.inspection_reference[index].id in this.inspectionsMap)? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value:"",
+          select_options: this.project.inspection_reference[index].range_options.split(","),
+          unit: this.project.inspection_reference[index].unit,
         });
       }
 
       this.dialogFormVisible = true;
+
     },
-    openNew() {
-      if (this.project == null) {
+    openNew(){
+      if(this.project == null) {
         this.$message.error("请先选择项目");
         return false;
       }
       this.form.method = "add";
       this.formTitle = "新增" + this.project.project_name;
       this.form.project_id = this.project.project_id;
-      this.form.remind_cycle = this.patient_info.remind_cycle;
+      this.form.remind_cycle = this.patient_info.remind_cycle
 
       var today = new Date();
-      this.form.inspect_date = uParseTime(today, "{y}-{m}-{d}");
+      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d}');
       this.form.formItem = [];
-      for (var index in this.project.inspection_reference) {
+      for(var index in this.project.inspection_reference){
         // var formItem = this.project.inspection_reference[index];
         // formItem["value"] = '';
         // if (formItem.range_type==2) {
         //   formItem["select_options"] = formItem.range_options.split(",");
         // }
         this.form.formItem.push({
-          id: 0,
+          id:    0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
           item_id: this.project.inspection_reference[index].id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
-          value: "",
-          select_options: this.project.inspection_reference[
-            index
-          ].range_options.split(","),
-          unit: this.project.inspection_reference[index].unit
+          value:'',
+          select_options: this.project.inspection_reference[index].range_options.split(","),
+          unit: this.project.inspection_reference[index].unit,
         });
       }
 
       this.dialogFormVisible = true;
     },
-    submitEdit(formName) {
-      this.$refs[formName].validate(valid => {
+    submitEdit(formName){
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.formLoading = true;
-          if (this.form.formItem.length == 0) {
+          if (this.form.formItem.length==0) {
             this.$message.error("未填写项目");
             return false;
           }
-          for (var index in this.form.formItem) {
-            this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+          for( var index in this.form.formItem) {
+            this.form.formItem[index].value = '' + this.form.formItem[index].value;
           }
-          EditPatientInspection(
-            this.patientID,
-            this.form,
-            this.form.remind_cycle
-          )
-            .then(response => {
-              if (response.data.state == 1) {
-                this.$notify({
-                  title: "成功",
-                  message: "修改成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                this.itemDate = this.form.inspect_date;
-                this.items = [];
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
-                if (inspections == null) {
-                  this.inspections = [];
-                  return false;
-                }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
-                for (var index in inspections) {
-                  inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                  this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                }
-                var items = this.project.inspection_reference;
-                for (var index in items) {
-                  if (items[index].id in inspectionsMap) {
-                    var item = {};
-                    for (var key in items[index]) {
-                      item[key] = items[index][key];
-                    }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
-                    if (item.range_type == 1) {
-                      var value = parseFloat(item.value);
-                      var range_min = parseFloat(item.range_min);
-                      var range_max = parseFloat(item.range_max);
-                      if (value < range_min) {
-                        item.value_direction = "↓";
-                      } else if (value > range_max) {
-                        item.value_direction = "↑";
-                      }
+          EditPatientInspection(this.patientID, this.form,this.form.remind_cycle).then(response=>{
+            if (response.data.state==1) {
+              this.$notify({
+                title: "成功",
+                message: "修改成功",
+                type: "success",
+                duration: 2000
+              });
+              this.patient_info.remind_cycle = response.data.data.remind_cycle
+              this.itemDate = this.form.inspect_date;
+              this.items=[];
+              var inspections = response.data.data.inspections;
+              this.inspections = response.data.data.inspections;
+              if (inspections==null) {
+                this.inspections = [];
+                return false;
+              }
+              var inspectionsMap = {};
+              this.inspectionsMap = {};
+              for (var index in inspections) {
+                inspectionsMap[inspections[index].item_id] = inspections[index];
+                this.inspectionsMap[inspections[index].item_id] = inspections[index];
+              }
+              var items = this.project.inspection_reference;
+              for(var index in items) {
+                if (items[index].id in inspectionsMap) {
+                  var item = {};
+                  for(var key in items[index]) {
+                    item[key] = items[index][key];
+                  }
+                  item.value = inspectionsMap[items[index].id].inspect_value;
+                  item.value_direction = "";
+                  if (item.range_type==1) {
+                    var value = parseFloat(item.value);
+                    var range_min = parseFloat(item.range_min);
+                    var range_max = parseFloat(item.range_max);
+                    if (value < range_min) {
+                      item.value_direction = "↓";
+                    }else if (value > range_max) {
+                      item.value_direction = "↑";
                     }
-                    this.items.push(item);
                   }
+                  this.items.push(item);
                 }
-
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
-              } else {
-                this.$message.error(response.data.msg);
-                return false;
               }
-            })
-            .catch(v => {
-              this.$message.error(v);
+
+              this.resetForm(formName);
+              this.dialogFormVisible = false;
+
+            }else {
+              this.$message.error(response.data.msg);
               return false;
-            });
+            }
+          }).catch(v=>{
+            this.$message.error(v);
+            return false;
+          });
           this.formLoading = false;
           return false;
         } else {
@@ -507,116 +403,107 @@ export default {
         }
       });
     },
-    submitNew(formName) {
-      this.$refs[formName].validate(valid => {
+    submitNew(formName){
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.formLoading = true;
-          if (this.form.formItem.length == 0) {
+          if (this.form.formItem.length==0) {
             this.$message.error("未填写项目");
             return false;
           }
-          for (var index in this.form.formItem) {
-            this.form.formItem[index].value =
-              "" + this.form.formItem[index].value;
+          for( var index in this.form.formItem) {
+            this.form.formItem[index].value = '' + this.form.formItem[index].value;
           }
-          CreatePatientInspection(
-            this.patientID,
-            this.form,
-            this.form.remind_cycle
-          )
-            .then(response => {
-              if (response.data.state == 1) {
-                this.$notify({
-                  title: "成功",
-                  message: "新增成功",
-                  type: "success",
-                  duration: 2000
-                });
-                // this.form.remind_reycle = response.data.data.remind_reycc
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle;
-                console.log(this.patient_info.remind_cycle);
+          CreatePatientInspection(this.patientID, this.form, this.form.remind_cycle).then(response=>{
+            if (response.data.state==1) {
+              this.$notify({
+                title: "成功",
+                message: "新增成功",
+                type: "success",
+                duration: 2000
+              });
+              // this.form.remind_reycle = response.data.data.remind_reycc
+              this.patient_info.remind_cycle = response.data.data.remind_cycle
+              console.log( this.patient_info.remind_cycle)
 
-                this.itemDate = this.form.inspect_date;
-                this.items = [];
-                for (var index in this.projects) {
-                  if (this.projects[index].project_id == this.form.project_id) {
-                    this.projects[index].count++;
-                    break;
-                  }
-                }
-                this.total += 1;
-                var inspections = response.data.data.inspections;
-                this.inspections = response.data.data.inspections;
-                if (inspections == null) {
-                  this.inspections = [];
-                  return false;
-                }
-                var inspectionsMap = {};
-                this.inspectionsMap = {};
-                for (var index in inspections) {
-                  inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
-                  this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index];
+              this.itemDate = this.form.inspect_date;
+              this.items=[];
+              for( var index in this.projects) {
+                if (this.projects[index].project_id == this.form.project_id) {
+                  this.projects[index].count ++;
+                  break;
                 }
-                var items = this.project.inspection_reference;
-                for (var index in items) {
-                  if (items[index].id in inspectionsMap) {
-                    var item = {};
-                    for (var key in items[index]) {
-                      item[key] = items[index][key];
-                    }
-                    item.value = inspectionsMap[items[index].id].inspect_value;
-                    item.value_direction = "";
-                    if (item.range_type == 1) {
-                      var value = parseFloat(item.value);
-                      var range_min = parseFloat(item.range_min);
-                      var range_max = parseFloat(item.range_max);
-                      if (value < range_min) {
-                        item.value_direction = "↓";
-                      } else if (value > range_max) {
-                        item.value_direction = "↑";
-                      }
+              }
+              this.total +=1;
+              var inspections = response.data.data.inspections;
+              this.inspections = response.data.data.inspections;
+              if (inspections==null) {
+                this.inspections = [];
+                return false;
+              }
+              var inspectionsMap = {};
+              this.inspectionsMap = {};
+              for (var index in inspections) {
+                inspectionsMap[inspections[index].item_id] = inspections[index];
+                this.inspectionsMap[inspections[index].item_id] = inspections[index];
+              }
+              var items = this.project.inspection_reference;
+              for(var index in items) {
+                if (items[index].id in inspectionsMap) {
+                  var item = {};
+                  for(var key in items[index]) {
+                    item[key] = items[index][key];
+                  }
+                  item.value = inspectionsMap[items[index].id].inspect_value;
+                  item.value_direction = "";
+                  if (item.range_type==1) {
+                    var value = parseFloat(item.value);
+                    var range_min = parseFloat(item.range_min);
+                    var range_max = parseFloat(item.range_max);
+                    if (value < range_min) {
+                      item.value_direction = "↓";
+                    }else if (value > range_max) {
+                      item.value_direction = "↑";
                     }
-                    this.items.push(item);
                   }
+                  this.items.push(item);
                 }
-
-                this.resetForm(formName);
-                this.dialogFormVisible = false;
-              } else {
-                this.$message.error(response.data.msg);
-                return false;
               }
-            })
-            .catch(v => {
-              this.$message.error(v);
+
+              this.resetForm(formName);
+              this.dialogFormVisible = false;
+
+            }else {
+              this.$message.error(response.data.msg);
               return false;
-            });
+            }
+          }).catch(v=>{
+            this.$message.error(v);
+            return false;
+          });
           this.formLoading = false;
           return false;
         } else {
           return false;
         }
       });
+
     },
-    fetchInspectionReference() {
-      fetchInspectionReference(this.patientID)
-        .then(response => {
-          if (response.data.state == 1) {
-            var reference = response.data.data.reference;
-            var patient_info = response.data.data.patient_info;
-            this.projects = reference;
-            this.patient_info = patient_info;
-            this.pageLoading = false;
-            this.form.remind_cycle = this.patient_info.remind_cycle;
-          } else {
-            this.$message.error(response.data.msg);
-            return false;
-          }
-        })
-        .catch(v => {});
+    fetchInspectionReference(){
+      fetchInspectionReference(this.patientID).then(response=>{
+        if(response.data.state==1) {
+          var reference = response.data.data.reference;
+          var patient_info = response.data.data.patient_info;
+          this.projects = reference;
+          this.patient_info = patient_info;
+          this.pageLoading = false;
+          this.form.remind_cycle = this.patient_info.remind_cycle
+        }else {
+          this.$message.error(response.data.msg);
+          return false;
+        }
+      }).catch(v=>{
+      });
     },
     setCurrent(row) {
       this.$refs.singleTable.setCurrentRow(row);
@@ -625,17 +512,17 @@ export default {
       this.$refs[formName].resetFields();
     },
     handleCurrentChange(row) {
-      this.itemDate = "";
-      this.form.method = "add";
-      if (typeof row == "undefined" || row == null) {
+      this.itemDate = '';
+      this.form.method = 'add';
+      if(typeof(row)=="undefined" || row==null) {
         this.project = null;
         this.items = [];
-        this.itemName = "请选择项目";
-      } else {
+        this.itemName='请选择项目';
+      }else {
         this.itemLoading = true;
         this.project = row;
         this.items = row.inspection_reference;
-        this.itemName = row.project_name;
+        this.itemName=row.project_name;
 
         this.queryParams.patient = this.patientID;
         this.queryParams.project_id = this.project.project_id;
@@ -646,59 +533,56 @@ export default {
     },
 
     handleCurrentChangePage(val) {
-      this.itemLoading = true;
+        this.itemLoading = true;
       this.queryParams.page = val;
       this.fetchPatientInspections(this.queryParams);
     },
-    fetchPatientInspections(params) {
+    fetchPatientInspections(params){
       this.items = [];
-      fetchPatientInspections(params)
-        .then(response => {
-          if (response.data.state == 1) {
-            var inspections = response.data.data.inspections;
-            this.total = response.data.data.total;
-            this.itemDate = response.data.data.date;
-            this.inspections = response.data.data.inspections;
-            if (inspections == null) {
-              this.inspections = [];
-              return false;
-            }
-            var inspectionsMap = {};
-            this.inspectionsMap = {};
-            for (var index in inspections) {
-              inspectionsMap[inspections[index].item_id] = inspections[index];
-              this.inspectionsMap[inspections[index].item_id] =
-                inspections[index];
-            }
-            var items = this.project.inspection_reference;
-            for (var index in items) {
-              if (items[index].id in inspectionsMap) {
-                var item = {};
-                for (var key in items[index]) {
-                  item[key] = items[index][key];
-                }
-                item.value = inspectionsMap[items[index].id].inspect_value;
-                item.value_direction = "";
-                if (item.range_type == 1) {
-                  var value = parseFloat(item.value);
-                  var range_min = parseFloat(item.range_min);
-                  var range_max = parseFloat(item.range_max);
-                  if (value < range_min) {
-                    item.value_direction = "↓";
-                  } else if (value > range_max) {
-                    item.value_direction = "↑";
-                  }
+      fetchPatientInspections(params).then(response=>{
+        if(response.data.state==1) {
+          var inspections = response.data.data.inspections;
+          this.total = response.data.data.total;
+          this.itemDate = response.data.data.date;
+          this.inspections = response.data.data.inspections;
+          if (inspections==null) {
+            this.inspections = [];
+            return false;
+          }
+          var inspectionsMap = {};
+          this.inspectionsMap = {};
+          for (var index in inspections) {
+            inspectionsMap[inspections[index].item_id] = inspections[index];
+            this.inspectionsMap[inspections[index].item_id] = inspections[index];
+          }
+          var items = this.project.inspection_reference;
+          for(var index in items) {
+            if (items[index].id in inspectionsMap) {
+              var item = {};
+              for(var key in items[index]) {
+                item[key] = items[index][key];
+              }
+              item.value = inspectionsMap[items[index].id].inspect_value;
+              item.value_direction = "";
+              if (item.range_type==1) {
+                var value = parseFloat(item.value);
+                var range_min = parseFloat(item.range_min);
+                var range_max = parseFloat(item.range_max);
+                if (value < range_min) {
+                  item.value_direction = "↓";
+                } else if (value > range_max) {
+                  item.value_direction = "↑";
                 }
-                this.items.push(item);
               }
+              this.items.push(item);
             }
           }
-        })
-        .catch(v => {});
+        }
+      }).catch(v=>{});
       setTimeout(() => {
         this.itemLoading = false;
       }, 1000);
-    }
+    },
   },
   created() {
     const id = this.$route.query && this.$route.query.id;

src/xt_pages/workforce/components/tableData.vue

@@ -318,7 +318,7 @@
           <el-form-item label="病房: " prop="partition_id">
             <el-select v-model="zone_name" placeholder="请选择" style="width:100%" @change="changePartition">
               <el-option
-                v-for="item,index in zone_names"
+                v-for="(item,index) in zone_names"
                 :key="index"
                 :label="item"
                 :value="item">
@@ -823,7 +823,7 @@
           this.creating_schedule = false
         })
       },
-      clickThis(row, column, cell, event) {
+      clickThis(row, column, cell, event) {debugger
         console.log(column.property)
         var week = this.weekDay(column.property)
         console.log(week)
@@ -1004,6 +1004,7 @@
               zone_device_map[device_number.zone.name].push(device_number)
             }
             this.zone_device_map = zone_device_map
+            debugger
 
             this.zone_names = Object.keys(this.zone_device_map)
             if (this.zone_names.length > 0) {
@@ -1057,7 +1058,8 @@
               this.jihaos = []
             }
             let params = {
-              type: this.currentData.schedule_type
+              type: this.currentData.schedule_type,
+              date: this.currentData.schedule_date
             }
             getUrgentScheduleInitData(params).then(response => {
               if (response.data.state == 0) {
@@ -1075,7 +1077,7 @@
                       }
                     }
                   }
-
+                  debugger
                   var zone_device_map = {}
                   for (let index = 0; index < this.origin_device_numbers.length; index++) {
                     const device_number = this.origin_device_numbers[index]
@@ -1085,7 +1087,7 @@
                     zone_device_map[device_number.zone.name].push(device_number)
                   }
                   this.zone_device_map = zone_device_map
-
+                  
                   this.zone_names = Object.keys(this.zone_device_map)
                   if (this.zone_names.length > 0) {
                     this.zone_name = this.zone_names[0]

src/xt_pages/workforce/components/tableWeeks.vue

@@ -38,7 +38,7 @@
     >
       <el-table-column label="姓名" min-width="100" align="center">
         <template slot-scope="scope">
-          {{ scope.row.patient }}
+          {{ scope.row.patient}}
         </template>
       </el-table-column>
       <el-table-column label="分区" min-width="70" align="center">
@@ -77,202 +77,269 @@
       </el-table-column>
       <el-table-column label="低分子肝素" min-width="100" align="center">
         <template slot-scope="scope">
-          {{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang
-              : ""
-          }}
+          <span v-if="scope.row.prescription.anticoagulant == 1">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'IU':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 4">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 5">{{scope.row.prescription.anticoagulant_zongliang?scope.row.prescription.anticoagulant_zongliang+'mg':''}}</span>
+
         </template>
       </el-table-column>
-      <el-table-column label="长期医嘱" min-width="200" align="center">
-        <template slot-scope="scope"> </template>
+
+      <el-table-column label="长期医嘱" min-width="440" align="center">
+        <template slot-scope="scope">
+           <span style="white-space: pre">{{getAdvice(scope.row.doctor_advice)}}</span>
+        </template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 
 <script>
-import { getSchedules, getScheduleWeekDay } from "@/api/schedule";
-import WeekItem from "./WeekItem";
+  import { getSchedules, getScheduleWeekDay } from '@/api/schedule'
+  import WeekItem from './WeekItem'
 
-export default {
-  name: "tableWeeks",
-  props: {
-    weekTime: {
-      type: String,
-      default: "thisWeek"
-    }
-  },
+  export default {
+    name: 'tableWeeks',
+    props: {
+      weekTime: {
+        type: String,
+        default: 'thisWeek'
+      }
+    },
+
+    data() {
+      return {
+        weekArr: [
+          { id: 1, name: '周一' },
+          { id: 2, name: '周二' },
+          { id: 3, name: '周三' },
+          { id: 4, name: '周四' },
+          { id: 5, name: '周五' },
+          { id: 6, name: '周六' },
+          { id: 7, name: '周日' }
+        ],
+        anticoagulants_confit: null,
 
-  data() {
-    return {
-      weekArr: [
-        { id: 1, name: "周一" },
-        { id: 2, name: "周二" },
-        { id: 3, name: "周三" },
-        { id: 4, name: "周四" },
-        { id: 5, name: "周五" },
-        { id: 6, name: "周六" },
-        { id: 7, name: "周日" }
-      ],
-      anticoagulants_confit: null,
+        week_type: '1',
+        weekTitle: ['', '', '', '', '', '', ''],
+        weekData: {
+          Monday: [],
+          Tuesday: [],
+          Wednesday: [],
+          Thursday: [],
+          Friday: [],
+          Saturday: [],
+          Sunday: []
+        },
+        scheduleData: [],
+        modeOptions: null
+      }
+    },
+    watch: {
+      weekTime: function() {
+        var theType = this.weekType(this.weekTime)
+        this.getSchedules(theType)
+      }
+    },
+
+    methods: {
+      printAction(){
+        console.log("111111")
+        this.$router.push({ path: '/schedule/remind/print?week_type=' + this.week_type })
 
-      week_type: "1",
-      weekTitle: ["", "", "", "", "", "", ""],
-      weekData: {
-        Monday: [],
-        Tuesday: [],
-        Wednesday: [],
-        Thursday: [],
-        Friday: [],
-        Saturday: [],
-        Sunday: []
       },
-      scheduleData: [],
-      modeOptions: null
-    };
-  },
-  watch: {
-    weekTime: function() {
-      var theType = this.weekType(this.weekTime);
-      this.getSchedules(theType);
-    }
-  },
+      getScheduleWeekDay(weekType) {
+        getScheduleWeekDay(weekType).then(response => {
+          this.scheduleData = []
+          if (response.data.state == 1) {
+            this.scheduleData = response.data.data.schdules
+            console.log(this.scheduleData)
+          } else {
+            this.$message.error('网络错误')
+            return false
+          }
+        })
+      },
 
-  methods: {
-    printAction() {
-      console.log("111111");
-      this.$router.push({
-        path: "/schedule/remind/print?week_type=" + this.week_type
-      });
-    },
-    getScheduleWeekDay(weekType) {
-      getScheduleWeekDay(weekType).then(response => {
-        this.scheduleData = [];
-        if (response.data.state == 1) {
-          this.scheduleData = response.data.data.schdules;
-          console.log(this.scheduleData);
-        } else {
-          this.$message.error("网络错误");
-          return false;
+      // getSchedules(weekType) {
+      //   getSchedules(weekType).then(response => {
+      //     this.scheduleData = []
+      //     if (response.data.state == 1) {
+      //       this.weekTitle = response.data.data.weekTitle
+      //       var theSchedules = response.data.data.schdules
+      //       var that = this
+      //       theSchedules.forEach(function(schedule) {
+      //         schedule['mode_name'] = typeof (that.modeOptions[schedule.mode_id]) == 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
+      //         var weekPath = that.weekPath(schedule.schedule_week)
+      //         if (weekPath.length > 0) {
+      //           that.weekData[weekPath].push(schedule)
+      //         }
+      //       })
+      //       var rowNum = 0
+      //       console.log(that.weekData)
+      //       for (var index in that.weekData) {
+      //         var thisLen = that.weekData[index].length
+      //         rowNum = rowNum >= thisLen ? rowNum : thisLen
+      //       }
+      //       console.log(rowNum)
+      //       for (let index = 0; index < rowNum; index++) {
+      //         var dataItem = {}
+      //         for (var weekIndex in that.weekData) {
+      //           var weekItem = that.weekData[weekIndex].shift()
+      //           console.log('weekItem', weekItem)
+      //           if (typeof (weekItem) != 'undefined') {
+      //             dataItem[weekIndex] = weekItem
+      //           }
+      //         }
+      //         that.scheduleData.push(dataItem)
+      //       }
+      //
+      //       console.log(that.scheduleData)
+      //
+      //     } else {
+      //       this.$message.error('网络错误')
+      //       return false
+      //     }
+      //   })
+      // },
+      weekType(weekTime) {
+        var theType = 2
+        switch (weekTime) {
+          case 'lastWeek':
+            theType = 1
+            break
+          case 'thisWeek':
+            theType = 2
+            break
+          case 'nextWeek':
+            theType = 3
+            break
+          case 'nextTwoWeek':
+            theType = 4
+            break
+          default:
+            theType = 2
+            break
         }
-      });
-    },
+        return theType
+      },
+      weekPath(week) {
+        var weekArr = {
+          1: 'Monday',
+          2: 'Tuesday',
+          3: 'Wednesday',
+          4: 'Thursday',
+          5: 'Friday',
+          6: 'Saturday',
+          7: 'Sunday'
+        }
+        if (typeof (weekArr[week]) == 'undefined') {
+          return ''
+        }
+        return weekArr[week]
+      }, selectWeekType(type) {
+        this.week_type = type
+        let params = {
+          week_type: this.week_type
+        }
+        this.getScheduleWeekDay(params)
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
+      },getAdvice:function(doctor_advice) {
+        console.log(doctor_advice)
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++){
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+
+          name = name + doctor_advice[i].advice_name +" "+ drug_spec+" "+ prescribing_number + " "+single_dose+" " + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency +" " + doctor_advice[i].remark +"\n"
+
+          // if (doctor_advice[i].child.length > 0){
+          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
+          //     if(doctor_advice[i].child[a].prescribing_number > 0){
+          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['presc'] = ''
+          //     }
+          //
+          //     if(doctor_advice[i].child[a].single_dose > 0){
+          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+          //     }else{
+          //       doctor_advice[i].child[a]['single'] = ''
+          //     }
+          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+          //       + doctor_advice[i].child[a].advice_desc
+          //       + doctor_advice[i].child[a].drug_spec_unit
+          //       + doctor_advice[i].child[a].presc
+          //       + doctor_advice[i].child[a].single
+          //
+          //
+          //   }
+          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
+          //     + doctor_advice[i].drug_spec_unit
+          //     + prescribing_number
+          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
+          //
+          // }else{
+          //
+          //
+          //
+          // }
+
+
+        }
+
+
+        return name
 
-    // getSchedules(weekType) {
-    //   getSchedules(weekType).then(response => {
-    //     this.scheduleData = []
-    //     if (response.data.state == 1) {
-    //       this.weekTitle = response.data.data.weekTitle
-    //       var theSchedules = response.data.data.schdules
-    //       var that = this
-    //       theSchedules.forEach(function(schedule) {
-    //         schedule['mode_name'] = typeof (that.modeOptions[schedule.mode_id]) == 'undefined' ? '' : that.modeOptions[schedule.mode_id].name
-    //         var weekPath = that.weekPath(schedule.schedule_week)
-    //         if (weekPath.length > 0) {
-    //           that.weekData[weekPath].push(schedule)
-    //         }
-    //       })
-    //       var rowNum = 0
-    //       console.log(that.weekData)
-    //       for (var index in that.weekData) {
-    //         var thisLen = that.weekData[index].length
-    //         rowNum = rowNum >= thisLen ? rowNum : thisLen
-    //       }
-    //       console.log(rowNum)
-    //       for (let index = 0; index < rowNum; index++) {
-    //         var dataItem = {}
-    //         for (var weekIndex in that.weekData) {
-    //           var weekItem = that.weekData[weekIndex].shift()
-    //           console.log('weekItem', weekItem)
-    //           if (typeof (weekItem) != 'undefined') {
-    //             dataItem[weekIndex] = weekItem
-    //           }
-    //         }
-    //         that.scheduleData.push(dataItem)
-    //       }
-    //
-    //       console.log(that.scheduleData)
-    //
-    //     } else {
-    //       this.$message.error('网络错误')
-    //       return false
-    //     }
-    //   })
-    // },
-    weekType(weekTime) {
-      var theType = 2;
-      switch (weekTime) {
-        case "lastWeek":
-          theType = 1;
-          break;
-        case "thisWeek":
-          theType = 2;
-          break;
-        case "nextWeek":
-          theType = 3;
-          break;
-        case "nextTwoWeek":
-          theType = 4;
-          break;
-        default:
-          theType = 2;
-          break;
       }
-      return theType;
     },
-    weekPath(week) {
-      var weekArr = {
-        1: "Monday",
-        2: "Tuesday",
-        3: "Wednesday",
-        4: "Thursday",
-        5: "Friday",
-        6: "Saturday",
-        7: "Sunday"
-      };
-      if (typeof weekArr[week] == "undefined") {
-        return "";
-      }
-      return weekArr[week];
+    components: {
+      WeekItem
     },
-    selectWeekType(type) {
-      this.week_type = type;
+    created() {
+      this.modeOptions = this.$store.getters.treatment_mode
+      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+
+      this.week_type = new Date().getDay()
+      if(this.week_type == 0){
+        this.week_type = 7
+
+      }
       let params = {
         week_type: this.week_type
-      };
-      this.getScheduleWeekDay(params);
-    },
-    getSchedulesType: function(type) {
-      let type_name = "";
-      switch (type) {
-        case 1:
-          type_name = "上午";
-          break;
-        case 2:
-          type_name = "下午";
-          break;
-        case 3:
-          type_name = "晚上";
-          break;
       }
-      return type_name;
+      this.getScheduleWeekDay(params)
     }
-  },
-  components: {
-    WeekItem
-  },
-  created() {
-    this.modeOptions = this.$store.getters.treatment_mode;
-    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
-
-    this.week_type = new Date().getDay();
-    let params = {
-      week_type: this.week_type
-    };
-    this.getScheduleWeekDay(params);
   }
-};
 </script>
 
 <style rel="stylesheet/css" lang="scss">

src/xt_pages/workforce/remind_print.vue

@@ -18,7 +18,7 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
-            <span class="main_title"></span>
+            <span class="main_title">{{day}}排班提醒</span>
           </div>
           <div class="table_panel">
             <table class="table">
@@ -45,44 +45,39 @@
                 </tr>
               </thead>
               <tbody>
-                <tr
-                  v-for="(main_collection, index) in scheduleData"
-                  :key="index"
-                >
-                  <td :width="td_1_width">{{ main_collection.patient }}</td>
-                  <td :width="td_2_width">{{ main_collection.zone.name }}</td>
-                  <td :width="td_3_width">
-                    {{ getSchedulesType(main_collection.schedule_type) }}
-                  </td>
-                  <td :width="td_3_width">
-                    {{ main_collection.number.number }}
-                  </td>
-                  <td :width="td_3_width">
-                    {{ modeOptions[main_collection.mode_id].name }}
-                  </td>
-                  <td :width="td_3_width">
-                    {{
-                      main_collection.prescription.dialyzer_perfusion_apparatus
-                    }}
-                  </td>
-                  <td :width="td_3_width">
-                    {{
-                      main_collection.prescription.anticoagulant
-                        ? anticoagulants_confit[
-                            main_collection.prescription.anticoagulant
-                          ].name
-                        : ""
-                    }}
-                  </td>
-                  <td :width="td_3_width">
-                    {{
-                      main_collection.prescription.anticoagulant_zongliang
-                        ? main_collection.prescription.anticoagulant_zongliang
-                        : ""
-                    }}
-                  </td>
-                  <td :width="td_4_width"></td>
-                </tr>
+              <tr v-for="(main_collection, index) in scheduleData" :key="index">
+                <td :width="td_1_width">{{ main_collection.patient}}</td>
+                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width">
+                  {{getSchedulesType(main_collection.schedule_type)}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.number.number}}
+
+                </td>
+                <td :width="td_1_width">
+                  {{modeOptions[main_collection.mode_id].name}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
+
+
+                </td>
+                <td :width="td_1_width">
+                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+
+                </td>
+                <td :width="td_1_width">
+                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</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>
+                </td>
+                <td :width="td_4_width" >
+                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
+                </td>
+              </tr>
               </tbody>
             </table>
           </div>
@@ -93,80 +88,80 @@
 </template>
 
 <script>
-import { getScheduleWeekDay } from "@/api/schedule";
-import { parseTime } from "@/utils";
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import print from "print-js";
-
-export default {
-  name: "SchedulePrint",
-  data() {
-    return {
-      crumbs: [
-        { path: false, name: "排班提醒" },
-        { path: false, name: "排班提醒打印" }
-      ],
-      scheduleData: [],
-      week_type: 0,
-      td_1_width: "10%",
-      td_2_width: "10%",
-      td_3_width: "25%",
-      td_4_width: "35%",
-      modeOptions: null,
-      anticoagulants_confit: null
-    };
-  },
-  components: {
-    BreadCrumb
-  },
-  created() {
-    this.modeOptions = this.$store.getters.treatment_mode;
-    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
-    this.week_type = this.$route.query.week_type;
-
-    getScheduleWeekDay({ week_type: this.week_type })
-      .then(rs => {
-        var resp = rs.data;
+  import { getScheduleWeekDay } from '@/api/schedule'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班提醒' },
+          { path: false, name: '排班提醒打印' }
+        ],
+        scheduleData:[],
+        week_type: 0,
+        day:'',
+        td_1_width: '10%',
+        td_2_width: '10%',
+        td_3_width: '25%',
+        td_4_width: '45%',
+        modeOptions: null,
+        anticoagulants_confit:null,
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+
+      this.modeOptions = this.$store.getters.treatment_mode
+      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+      this.week_type = this.$route.query.week_type
+
+
+
+      getScheduleWeekDay({week_type: this.week_type}).then(rs => {
+        var resp = rs.data
         if (resp.state == 1) {
-          this.scheduleData = resp.data.schdules;
+          this.scheduleData = resp.data.schdules
         } else {
-          this.$message.error(resp.msg);
+          this.$message.error(resp.msg)
         }
+      }).catch(err => {
+        this.$message.error(err)
       })
-      .catch(err => {
-        this.$message.error(err);
-      });
-  },
-  methods: {
-    printAction: function() {
-      const style =
-        "@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }";
-
-      printJS({
-        printable: "print_content",
-        type: "html",
-        documentTitle: "  ",
-        style: style,
-        scanStyles: false
-      });
     },
-    getSchedulesType: function(type) {
-      let type_name = "";
-      switch (type) {
-        case 1:
-          type_name = "上午";
-          break;
-        case 2:
-          type_name = "下午";
-          break;
-        case 3:
-          type_name = "晚上";
-          break;
+    methods: {
+      printAction: function() {
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+        })
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
       }
-      return type_name;
     }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>