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

src/lang/zh.js

@@ -237,6 +237,9 @@ export default {
 
     histemplate:'处方模版',
 
+    airDisinfect:'空气消毒',
+    objectTableDisinfect:'物表消毒'
+
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/device.js

@@ -46,6 +46,26 @@ export default {
         title: '设备管理详情页',
         noCache: true,
 
+      }
+    },
+    {
+      path: '/device/airDisinfect',
+      component: () => import('@/xt_pages/device/airDisinfect'),
+      name: 'airDisinfect',
+      meta: {
+        title: 'airDisinfect',
+        noCache: true,
+
+      }
+    },
+    {
+      path: '/device/objectTableDisinfect',
+      component: () => import('@/xt_pages/device/objectTableDisinfect'),
+      name: 'objectTableDisinfect',
+      meta: {
+        title: 'objectTableDisinfect',
+        noCache: true,
+
       }
     }
 

src/xt_pages/device/airDisinfect.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+        <div style="float:right;margin-bottom:10px;">
+            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
+            <el-button type="danger">删除</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column label="时间" width="120"></el-table-column>
+            <el-table-column label="班次" width="120"></el-table-column>
+            <el-table-column label="创建日期" width="120"></el-table-column>
+            <el-table-column label="消毒方式" width="120"></el-table-column>
+            <el-table-column label="消毒液" width="120"></el-table-column>
+            <el-table-column label="顺序号" width="80"></el-table-column>
+            <el-table-column label="创建人" width="80"></el-table-column>
+            <el-table-column label="检查结果" width="180"></el-table-column>
+            <el-table-column label="检查时间" width="120"></el-table-column>
+            <el-table-column label="数据上传时间" width="120"></el-table-column>
+            <el-table-column label="修改标志" width="90"></el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button
+                    size="mini"
+                    type="primary"
+                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button
+                    size="mini"
+                    type="danger"
+                    @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="10"
+            background
+            style="margin-top:20px;float: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+
+        <el-dialog
+        class="centerDialog"
+        width="1000px"
+        title="新增空气消毒表"
+        :visible.sync="dialogFormVisible">
+            <el-form :model="form" class="airForm">
+                <el-form-item label="时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="班次" label-width="110px">
+                    <el-select v-model="form.region" placeholder="请选择活动区域">
+                        <el-option label="区域一" value="shanghai"></el-option>
+                        <el-option label="区域二" value="beijing"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="创建日期" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="消毒方式" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="消毒液" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="顺序号" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="创建人" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="检测时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测结果" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="上传时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测合格" label-width="110px">
+                    <div>
+                        <el-radio v-model="radio" label="1">备选项</el-radio>
+                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                    </div>
+                </el-form-item>
+                <el-form-item label="修改标志" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item> 
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <el-dialog
+        class="centerDialog"
+        width="1000px"
+        title="编辑空气消毒表"
+        :visible.sync="editDialogFormVisible">
+            <el-form :model="form" class="airForm">
+                <el-form-item label="时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="班次" label-width="110px">
+                    <el-select v-model="form.region" placeholder="请选择活动区域">
+                        <el-option label="区域一" value="shanghai"></el-option>
+                        <el-option label="区域二" value="beijing"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="创建日期" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="消毒方式" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="消毒液" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="顺序号" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="创建人" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="检测时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测结果" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="上传时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测合格" label-width="110px">
+                    <div>
+                        <el-radio v-model="radio" label="1">备选项</el-radio>
+                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                    </div>
+                </el-form-item>
+                <el-form-item label="修改标志" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item> 
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="editDialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="editDialogFormVisible = false">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+  export default {
+    name: 'airDisinfect',
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '院感管理' },
+          { path: false, name: '透析室空气消毒记录表' }
+        ],
+        dialogFormVisible:false,
+        editDialogFormVisible:false,
+        tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+        }],
+        form: {},
+        value1:''
+      }
+    },
+    created(){
+
+    },
+    methods: {
+        handleEdit(){
+            this.editDialogFormVisible = true
+        }
+    }
+  }
+</script>
+
+
+<style lang="scss" scoped>
+.airForm{
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    .el-form-item{
+        width:33%;
+    }
+    .el-date-editor.el-input, .el-date-editor.el-input__inner{
+        width: 200px;
+    }
+    .el-input{
+        width: 200px;
+    }
+    .el-select{
+        width: 200px;
+    }
+}
+</style>

src/xt_pages/device/objectTableDisinfect.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+        <div style="float:right;margin-bottom:10px;">
+            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
+            <el-button type="danger">删除</el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+            <el-table-column type="selection" width="55" align="center"></el-table-column>
+            <el-table-column label="时间" width="120"></el-table-column>
+            <el-table-column label="班次" width="120"></el-table-column>
+            <el-table-column label="创建日期" width="120"></el-table-column>
+            <el-table-column label="消毒方式" width="120"></el-table-column>
+            <el-table-column label="消毒液" width="120"></el-table-column>
+            <el-table-column label="顺序号" width="80"></el-table-column>
+            <el-table-column label="创建人" width="80"></el-table-column>
+            <el-table-column label="检查结果" width="180"></el-table-column>
+            <el-table-column label="检查时间" width="120"></el-table-column>
+            <el-table-column label="数据上传时间" width="120"></el-table-column>
+            <el-table-column label="修改标志" width="90"></el-table-column>
+            <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                    <el-button
+                    size="mini"
+                    type="primary"
+                    @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+                    <el-button
+                    size="mini"
+                    type="danger"
+                    @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="10"
+            background
+            style="margin-top:20px;float: right"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+        >
+        </el-pagination>
+
+        <el-dialog
+        class="centerDialog"
+        width="1000px"
+        title="新增空气消毒表"
+        :visible.sync="dialogFormVisible">
+            <el-form :model="form" class="airForm">
+                <el-form-item label="时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="班次" label-width="110px">
+                    <el-select v-model="form.region" placeholder="请选择活动区域">
+                        <el-option label="区域一" value="shanghai"></el-option>
+                        <el-option label="区域二" value="beijing"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="创建日期" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="消毒方式" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="消毒液" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="顺序号" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="创建人" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="检测时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测结果" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="上传时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测合格" label-width="110px">
+                    <div>
+                        <el-radio v-model="radio" label="1">备选项</el-radio>
+                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                    </div>
+                </el-form-item>
+                <el-form-item label="修改标志" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item> 
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+            </div>
+        </el-dialog>
+
+
+        <el-dialog
+        class="centerDialog"
+        width="1000px"
+        title="编辑空气消毒表"
+        :visible.sync="editDialogFormVisible">
+            <el-form :model="form" class="airForm">
+                <el-form-item label="时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="班次" label-width="110px">
+                    <el-select v-model="form.region" placeholder="请选择活动区域">
+                        <el-option label="区域一" value="shanghai"></el-option>
+                        <el-option label="区域二" value="beijing"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="创建日期" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="消毒方式" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="消毒液" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="顺序号" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="创建人" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="检测时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测结果" label-width="110px">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="上传时间" label-width="110px">
+                    <el-date-picker
+                    v-model="value1"
+                    type="datetime"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="检测合格" label-width="110px">
+                    <div>
+                        <el-radio v-model="radio" label="1">备选项</el-radio>
+                        <el-radio v-model="radio" label="2">备选项</el-radio>
+                    </div>
+                </el-form-item>
+                <el-form-item label="修改标志" label-width="110px">
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item> 
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="editDialogFormVisible = false">取 消</el-button>
+                <el-button type="primary" @click="editDialogFormVisible = false">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+  export default {
+    name: 'airDisinfect',
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '院感管理' },
+          { path: false, name: '透析室空气消毒记录表' }
+        ],
+        dialogFormVisible:false,
+        editDialogFormVisible:false,
+        tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+        }],
+        form: {},
+        value1:''
+      }
+    },
+    created(){
+
+    },
+    methods: {
+        handleEdit(){
+            this.editDialogFormVisible = true
+        }
+    }
+  }
+</script>
+
+
+<style lang="scss" scoped>
+.airForm{
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    .el-form-item{
+        width:33%;
+    }
+    .el-date-editor.el-input, .el-date-editor.el-input__inner{
+        width: 200px;
+    }
+    .el-input{
+        width: 200px;
+    }
+    .el-select{
+        width: 200px;
+    }
+}
+</style>

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -874,11 +874,11 @@
                     <td width="150"></td>
                     <td width="30">医生</td>
                     <td width="80">
-                        <div class="under-line">
+                      <div class="under-line">
                         &nbsp;
                         <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
-                        <img class="es-img" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else style="height: 30px;">
-                        </div>
+                        <img class="es-img" v-else style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
+                      </div>
                     </td>
                     <td width="50">穿刺护士</td>
                     <td width="80">
@@ -1220,6 +1220,25 @@ export default {
       })
   },
   methods: {
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','头晕','头痛','呕吐','低血压','发热','抽搐','高血压','心律失常'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     dialysateFormulationName(id) {
       if (id in this.dialysateFormulationOptions) {
         return this.dialysateFormulationOptions[id].name

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -946,7 +946,7 @@
           <td width="80">
             <div class="under-line">
               &nbsp;
-              <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span >
+              <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span>
               <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
             </div>
           </td>

src/xt_pages/user/components/PatientSidebar.vue

@@ -106,10 +106,10 @@ export default {
               name: '1-3',
               label: '检验检查'
             },
-            // {
-            //   name:'1-8',
-            //   label:'传染病管理'
-            // },
+            {
+              name:'1-8',
+              label:'传染病管理'
+            },
             {
               name: '1-5',
               label: '抢救记录'

src/xt_pages/user/dialysisRecord.vue

@@ -195,6 +195,34 @@
               ></template
             >
           </el-table-column>
+          <el-table-column
+            prop="assessment_after_dislysis"
+            width="140"
+            align="center"
+            label="目标超滤量"
+          >
+            <template slot-scope="scope"
+              ><span
+                >{{
+                  scope.row.prescription.target_ultrafiltration
+                }}</span
+              ></template
+            >
+          </el-table-column>
+          <el-table-column
+            prop="assessment_after_dislysis"
+            width="140"
+            align="center"
+            label="实际超滤量"
+          >
+            <template slot-scope="scope"
+              ><span
+                >{{
+                  scope.row.assessment_after_dislysis.actual_ultrafiltration
+                }}</span
+              ></template
+            >
+          </el-table-column>
 
           <!--<el-table-column-->
             <!--prop="access"-->

src/xt_pages/user/inspectionInfectious.vue

@@ -283,7 +283,7 @@ export default {
           var params = {
             patient: this.patientID,
             date: this.itemDate,
-            project_id: this.project.project_id
+            project_id: 14
           }
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
@@ -322,65 +322,60 @@ export default {
       }
 
       this.form.method = 'edit'
-      this.formTitle = '修改' + this.project.project_name
-      this.form.project_id = this.project.project_id
+      this.formTitle = '修改' 
+      this.form.project_id = 14
       this.form.inspect_date = this.itemDate
       this.form.old_inspect_date = this.itemDate
       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) {
         this.form.formItem.push({
-          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
+          id: this.project[index].id in this.inspectionsMap ? this.inspectionsMap[this.project[index].id].id : 0,
+          project_id: this.project[index].project_id,
+          project_name: this.project[index].project_name,
+          item_id: this.project[index].id,
+          item: this.project[index].item,
+          item_name: this.project[index].item_name,
+          range_type: this.project[index].range_type,
+          value: this.project[index].id in this.inspectionsMap ? this.inspectionsMap[this.project[index].id].inspect_value : '',
+          select_options: this.project[index].range_options.split(','),
+          unit: this.project[index].unit
         })
       }
       console.log(this.form.formItem)
       this.dialogFormVisible = true
     },
     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.project_id = 14
       this.form.remind_cycle = this.patient_info.remind_cycle
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
-      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,
-          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
-        })
-      }
 
+      for(let i=0;i<this.project.length;i++){
+          this.form.formItem.push({
+            id:0,
+            project_id: 14,
+            project_name: this.project[i].project_name,
+            item_id: this.project[i].id,
+            item: this.project[i].item,
+            item_name: this.project[i].item_name,
+            range_type: this.project[i].range_type,
+            value: '',
+            select_options: (this.project[i].range_options).split(','),
+            unit: this.project[i].unit
+          })
+      }
       this.dialogFormVisible = true
     },
     submitEdit(formName) {
@@ -421,7 +416,7 @@ export default {
                 this.inspectionsMap[inspections[index].item_id] =
                     inspections[index]
               }
-              var items = this.project.inspection_reference
+              var items = this.project
               for (var index in items) {
                 if (items[index].id in inspectionsMap) {
                   var item = {}
@@ -463,6 +458,7 @@ export default {
       })
     },
     submitNew(formName) {
+     
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formLoading = true
@@ -474,6 +470,10 @@ export default {
             this.form.formItem[index].value =
               '' + this.form.formItem[index].value
           }
+          console.log("22222",this.form)
+          console.log("33333",this.patientID)
+          console.log("444444",this.form.remind_cycle)
+         
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -494,11 +494,12 @@ export default {
 
                 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
-                  }
+              
+                for(let i=0;i<this.projects.length;i++){
+                   if(this.projects[i].project_id == this.form.project_id){
+                      this.projects[i].count ++
+                      break
+                   }
                 }
                 this.total += 1
                 var inspections = response.data.data.inspections
@@ -515,7 +516,7 @@ export default {
                   this.inspectionsMap[inspections[index].item_id] =
                     inspections[index]
                 }
-                var items = this.project.inspection_reference
+                var items = this.project
                 for (var index in items) {
                   if (items[index].id in inspectionsMap) {
                     var item = {}
@@ -542,7 +543,7 @@ export default {
                 this.dialogFormVisible = false
 
                 this.queryParams.patient = this.patientID
-                this.queryParams.project_id = this.project.project_id
+                this.queryParams.project_id = 14
                 this.queryParams.page = 1
                 this.total = 0
                 this.fetchPatientInspections(this.queryParams)
@@ -566,21 +567,21 @@ export default {
       fetchInspectionReference(this.patientID)
         .then(response => {
           if (response.data.state == 1) {
-            var reference = response.data.data.reference
-            console.log("reference22222",reference)
-          
+            // var reference = response.data.data.reference
+            // console.log("reference22222",reference)
+            var list = response.data.data.list
+            console.log("list2222",list)
             var patient_info = response.data.data.patient_info
-            this.projects = reference
+            this.projects = list
             this.patient_info = patient_info
             var project_id = 0
-            for(let i=0;i<reference.length;i++){
-               if(reference[i].project_name == "传染病检查"){
-                 project_id = reference[i].project_id
-                 this.project = reference[i]
-                 this.itemLoading = true
-                 this.items = reference[i].inspection_reference
-                 this.itemName = reference[i].project_name
-               }
+            for(let i=0;i<list.length;i++){
+              project_id = 14
+              this.project = list
+              this.itemLoading = true
+              this.items = list
+              this.itemName =list[i].project_name
+               
             }
             this.queryParams.patient = this.patientID
             this.queryParams.project_id = project_id
@@ -631,7 +632,7 @@ export default {
               inspectionsMap[inspections[index].item_id] = inspections[index]
               this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-            var items = this.project.inspection_reference
+            var items = this.project
             console.log("items222222222",items)
             for (var index in items) {
               if (items[index].id in inspectionsMap || items[index].item_id in inspectionsMap) {