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

src/api/his/his.js

@@ -355,6 +355,19 @@ export function getList (params) {
 
 
 
+export function getRecordList (params) {
+  return request({
+    url: '/api/record/list',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+
+
+
+
 
 
 

src/lang/zh.js

@@ -216,6 +216,7 @@ export default {
     outpatientCharges:'门诊收费',
     outpatientChargesManagement:'门诊收费管理',
     outpatientInvoice:'门诊发票',
+    outpatientRecord:'门诊备案',
     advancePayment:'预交金',
     labelPrinting:'标签打印',
     summary:'项目消费明细汇总',
@@ -236,7 +237,7 @@ export default {
     basicConfig:'基础配置',
 
     histemplate:'处方模版',
-
+    outpatientSickRecord:"人员定点病种备案",
     airDisinfect:'空气消毒',
     objectTableDisinfect:'物表消毒'
 

src/router/index.js

@@ -27,6 +27,7 @@ import outpatientRegistration from './modules/outpatientRegistration'
 import outpatientDoctorStation from './modules/outpatientDoctorStation'
 import outpatientCharges from './modules/outpatientCharges'
 import outpatientPharmacy from './modules/outpatientPharmacy'
+import outpatientRecord from './modules/outpatientRecord'
 import kuyiShopping from './modules/kuyiShopping'
 import createPatient from './modules/createPatient'
 import dialysisRecord from './modules/dialysisRecord'
@@ -151,7 +152,7 @@ var _asy_router_map = [
   slow,
   scrm,
   shop,
-  
+
   systems,
   DepartManage,
   roleManage,
@@ -169,6 +170,7 @@ var _asy_router_map = [
   outpatientDoctorStation,
   outpatientCharges,
   outpatientPharmacy,
+  outpatientRecord,
   // kuyiShopping,
   integration,
   basicConfig

src/router/modules/outpatientRecord.js

@@ -0,0 +1,22 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/outpatientRecord',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'outpatientRecord',
+  alwaysShow: true,
+  meta: {
+    title: 'outpatientRecord',
+    icon: 'outpatientRecord',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/outpatientRecord/outpatientRecord',
+        component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
+        name: 'outpatientSickRecord',
+        meta: { title: 'outpatientSickRecord', noCache: true }
+    },
+  ]
+}

src/views/layout/Layout.vue

@@ -123,7 +123,7 @@ export default {
   },
   created(){
     console.log('permission_routers',this.permission_routers)
-    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
+    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord']
     let bingli = ['User','createPatient']
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement']

src/views/layout/components/Sidebar/index.vue

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == '门诊管理'){
-          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy']
+          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {

src/xt_pages/data/components/consumables.vue

@@ -59,7 +59,12 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
-        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+        <!--<el-button type="primary" @click="BatchDelete()">批量备案</el-button>-->
+
+
+        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+
       </div>
     </div>
 
@@ -74,7 +79,7 @@
           align="center"
           type="selection"
           width="55">
-      </el-table-column>    
+      </el-table-column>
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
       <el-table-column label="耗材名称" align="center">
         <template slot-scope="scope">
@@ -128,10 +133,15 @@
           <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
              <span v-if="scope.row.is_mark == 0">备案</span>
              <span v-if="scope.row.is_mark == 1">撤销</span>
           </el-button>
+
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -279,6 +289,88 @@
       }
     },
     methods: {
+      putOnUnRecord(id){
+        var that = this
+        let params = {
+          ids:id.toString(),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      putOnRecord(id){
+        var that = this
+
+        let params = {
+          ids:id.toString(),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      GDYBBatchPutOnRecord(){
+        var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        let params = {
+          ids:ids.join(','),
+          record_type: 2,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+      },
+
       changeKind(val){
         this.getList()
 
@@ -341,12 +433,12 @@
               this.goodInfo.goodInfoDialog.formValue.good_unit =
                 response.data.data.goodInfo.good_unit
             }
-           
+
             if (response.data.data.goodInfo.manufacturer <= 0) {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = ''
             } else {
               this.goodInfo.goodInfoDialog.formValue.manufacturer = response.data.data.goodInfo.manufacturer
-             
+
             }
 
             if (response.data.data.goodInfo.dealer <= 0) {
@@ -512,9 +604,9 @@
             this.goodInfo.goodInfoDialog.formValue.agent =response.data.data.goodInfo.agent
 
             this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.good_number
-            
+
             this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code
-            
+
             if(response.data.data.production_type<=0){
                this.goodInfo.goodInfoDialog.production_type = ''
             }else{
@@ -526,7 +618,7 @@
             }else{
               this.goodInfo.goodInfoDialog.formValue.special_medical = response.data.data.goodInfo.special_medical.toString()
             }
-        
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
           }
         })
@@ -868,7 +960,7 @@
               admin_user_id:this.$store.getters.xt_user.user.id
             }
             console.log("paramsw2",params)
-        
+
             var that = this
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
             if (response.data.state == 0) {
@@ -889,7 +981,7 @@
           });
      },
       toReturn(id,isMark){
-        
+
          var that = this
          let params = {
              'id':id,

src/xt_pages/data/components/drugs.vue

@@ -56,7 +56,8 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
-        <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
+        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button>
       </div>
     </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
@@ -138,10 +139,17 @@
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
           <el-button type="danger" size="small" @click="deleteDurg(scope.row.id,scope.$index)">删除</el-button>
-        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+
+        <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >
           <span v-if="scope.row.is_mark == 0">备案</span>
           <span v-if="scope.row.is_mark == 1">撤消</span>
         </el-button>
+
+
+          <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -333,6 +341,35 @@
       }
     },
     methods: {
+      GDYBBatchPutOnRecord(){
+        var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        let params = {
+          ids:ids.join(','),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+
+      },
       handleSizeChange(val) {
         this.limit = val
         this.getList()
@@ -628,6 +665,59 @@
      getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
       },
+      putOnUnRecord(id){
+        var that = this
+        let params = {
+          ids:id.toString(),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      putOnRecord(id){
+        var that = this
+
+        let params = {
+          ids:id.toString(),
+          record_type: 1,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
+      },
       // toRecord(){
       //    var that = this
       //    axios.get('http://127.0.0.1:9532/sz/api/drug/get').then(function(response) {
@@ -663,7 +753,7 @@
                   that.$message.error(response.data.data.msg)
                   that.getList()
                }
-              
+
              }
            }).catch(function(error) {
         })
@@ -675,7 +765,7 @@
           return false;
         } else {
           this.dealer = response.data.data.dealer;
-  
+
         }
        });
       },
@@ -709,7 +799,7 @@
           type: "warning"
         }
       ).then(() => {
-        var ids = [];
+               var ids = [];
         var idMap = {};
         for (const index in this.selectDrug) {
           ids.push(this.selectDrug[index].id);
@@ -725,7 +815,7 @@
         var that = this
         axios.get('http://127.0.0.1:9532/sz/api/drug/get',{ params: params }).then(function(response) {
          if (response.data.state == 0) {
-              
+
                that.$message.error(response.data.data.msg)
                return false
             } else {

src/xt_pages/data/components/project.vue

@@ -34,7 +34,9 @@
             </div>
             <div>
              <el-button type="primary" @click="openForm(0)">新增</el-button>
-             <el-button type="primary" @click="BatchDelete()">批量备案</el-button>
+             <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+                <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+
             </div>
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
@@ -42,7 +44,7 @@
               align="center"
               type="selection"
               width="55">
-            </el-table-column>  
+            </el-table-column>
             <el-table-column prop="date" label="序号" width="80" align="center">
                  <template  slot-scope="scope">
                       {{scope.$index+1}}
@@ -89,10 +91,15 @@
                 <template slot-scope="scope">
                     <el-button @click="editHisProject(scope.row.id)" type="primary" size="small">编辑</el-button>
                     <el-button type="danger" size="small" @click="deleteProject(scope.row.id,scope.$index)">删除</el-button>
-                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)">
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" @click="toReturn(scope.row.id,scope.row.is_mark)" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">
                       <span v-if="scope.row.is_mark ==0">备案</span>
                       <span v-if="scope.row.is_mark ==1">撤销</span>
                     </el-button>
+
+                    <el-button type="primary" size="small" icon="el-icon-refresh-left" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028">
+                        <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
+                        <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -164,7 +171,89 @@ export default {
         }
     },
     methods:{
-        changeStart(){
+      putOnUnRecord(id){
+        var that = this
+        let params = {
+          ids:id.toString(),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/uncheckcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+              // for (let i = 0; i < that.tableData.length; i++) {
+              //   if (that.tableData[i].id == that.currentObject.id) {
+              //     that.tableData[i].record.is_cancel == 1
+              //   }
+              // }
+            }
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      putOnRecord(id){
+        var that = this
+
+        let params = {
+          ids:id.toString(),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+
+
+
+          }
+        }).catch(function(error) {
+        })
+      },
+      GDYBBatchPutOnRecord(){
+        var that = this
+        var ids = [];
+        var idMap = {};
+        for (const index in this.selectDrug) {
+          ids.push(this.selectDrug[index].id);
+          idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
+        }
+        let params = {
+          ids:ids.join(','),
+          record_type: 3,
+          admin_user_id:this.$store.getters.xt_user.user.id
+        }
+        axios.get('http://127.0.0.1:9532/api/checkcode/get',{params:params}).then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.data.msg)
+            return false
+          } else {
+            if(response.data.data.failed_code == -10){
+              that.$message.error(response.data.data.msg)
+            }else{
+
+
+            }
+          }
+        }).catch(function(error) {
+        })
+      },
+
+      changeStart(){
          this.getlist()
         },
         handleSizeChange(val) {
@@ -176,7 +265,7 @@ export default {
             this.getlist()
         },
         searchAction(){
-           this.getlist()   
+           this.getlist()
         },
         clickSelfPayment(){
             this.$refs.selfPayment.show();
@@ -209,7 +298,7 @@ export default {
           }
           return name
         },
-      
+
         getlist(){
             var params = {
                keyword:this.search_input,
@@ -229,7 +318,7 @@ export default {
                console.log("total",total)
                this.total = total
              }
-          })  
+          })
         },
         deleteProject(id,index){
             this.$confirm("确认删除此项目吗?", "删除", {
@@ -275,7 +364,7 @@ export default {
              'admin_user_id':this.$store.getters.xt_user.user.id,
           }
           console.log("params22222222",params)
-         
+
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
                that.$message.error(response.data.data.msg)
@@ -295,11 +384,11 @@ export default {
       },
       handleSelectionChange(val) {
         this.selectDrug = val;
-      }, 
+      },
     changeRecord(){
       this.getlist()
     },
-      
+
     BatchDelete() {
       if (this.selectDrug.length == 0) {
         this.$message.error("请选择要备案的信息");
@@ -321,7 +410,7 @@ export default {
           ids.push(this.selectDrug[index].id);
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
         }
-       
+
         var idss = ids.join(',')
         let params = {
           ids:idss,
@@ -365,7 +454,7 @@ export default {
     created(){
       this.getlist()
       this.getDartmentList()
-     
+
     }
 }
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -153,8 +153,10 @@
                         <tbody>
                         <tr>
                             <td width="100">导管穿刺口:</td>
-                            <td width="280">
+                            <td width="380">
                             <div style="display:flex;justify-content:space-between;">
+                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('正常') > -1 ? true : false" showValue="正常"></label-box>
+                                &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
                                 &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
@@ -164,15 +166,23 @@
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
                             </div>
                             </td>
-                            <td width="40"></td>
+                            <td width=""></td>
                             
-                            <td width="50">体位:</td>
-                            <td style="text-align:left;">
-                              <label-box v-for="(item, index) in posture_arr" :key="index" :isChecked="record.receive_assessment.posture == item.id ? true : false" :showValue="item.name"></label-box>
-                            </td>
                         </tr>
                         </tbody>
                         </table>
+                        <table class="table-box">
+                          <tbody>
+                            <tr>
+                              <td width="50">体位:</td>
+                              <td style="text-align:left;">
+                                <label-box style="margin-right:10px;" v-for="(item, index) in posture_arr" :key="index" :isChecked="record.receive_assessment.posture == item.id ? true : false" :showValue="item.name"></label-box>
+                              </td>
+                              <td></td>
+                            </tr>
+                          </tbody>
+                        </table>
+                          
 
                         <table class="table-box">
                         <tbody>
@@ -214,7 +224,7 @@
                         <tbody>
                         <tr>
                             <td width="50">皮肤:</td>
-                            <td width="660">
+                            <td width="760">
                             <div>
                                 <label-box showValue="完整" :isChecked="record.assessment_before_dislysis.skin.indexOf('完整')>-1 ? true : false"></label-box>
                                 <label-box showValue="干燥" :isChecked="record.assessment_before_dislysis.skin.indexOf('干燥')>-1? true : false"></label-box>
@@ -225,6 +235,7 @@
                                 <label-box showValue="出血点" :isChecked="record.assessment_before_dislysis.skin.indexOf('出血点')>-1 ? true : false"></label-box>
                                 <label-box showValue="压疮" :isChecked="record.assessment_before_dislysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
                                 <label-box showValue="皮下淤血" :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
+                                <label-box showValue="皮下出血" :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下出血')>-1 ? true : false"></label-box>
                             </div>
                             </td>
                            

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -158,18 +158,15 @@
               <tbody>
               <tr>
                 <td width="100">导管穿刺口:</td>
-                <td width="280">
+                <td width="330">
                   <div style="display:flex;justify-content:space-between;">
+                    <label-box :isChecked="predialysis.catheter.indexOf('正常') > -1 ? true : false" showValue="正常"></label-box>
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-分泌物') > -1 ? true : false" showValue="分泌物"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
                   </div>
                 </td>
-                <td width="40"></td>
                 <!-- <td width="65">导管打折</td>
                 <td width="10">(</td>
                 <td width="80">
@@ -193,6 +190,13 @@
                 <td></td> -->
 
                 <!-- 体位 -->
+                <td></td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table-box">
+              <tbody>
+              <tr>
                 <td width="50">体位:</td>
                 <td width="440">
                   <div style="display:flex;justify-content:space-between;">
@@ -219,7 +223,6 @@
               </tr>
               </tbody>
             </table>
-
             <table class="table-box">
               <tbody>
               <tr>
@@ -256,7 +259,7 @@
               <tbody>
                 <tr>
                   <td width="50">皮肤:</td>
-                  <td width="700">
+                  <td width="780">
                     <div style="display:flex;justify-content:space-between;">
                       <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
                       <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
@@ -276,6 +279,7 @@
                       <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点')>-1 ? true : false"></label-box>
                       <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
                       <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
+                      <label-box showValue="皮下出血" :isChecked="predialysis.skin.indexOf('皮下出血')>-1 ? true : false"></label-box>
                       &ensp;
                     </div>
                   </td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -649,7 +649,10 @@
 
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
-            params: form
+            params: form,
+            headers: {
+              'Permission': 5
+            }
           })
             .then(function(response) {
               if (response.data.state == 0) {
@@ -710,7 +713,10 @@
         var that = this
         if ( this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
-            params: forms
+            params: forms,
+            headers: {
+              'Permission': 5
+            }
           })
             .then(function(response) {
               if (response.data.state == 0) {
@@ -792,7 +798,10 @@
         if ( this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 9504 ) {
          
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
-            params: forms
+            params: forms,
+            headers: {
+              'Permission': 5
+            }
           })
             .then(function(response) {
               if (response.data.state == 0) {
@@ -862,7 +871,10 @@
         } else if (this.$store.getters.xt_user.org_id == 9919  ||  this.$store.getters.xt_user.org_id == 9671   ) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
-            params: forms
+            params: forms,
+            headers: {
+              'Permission': 5
+            }
           })
             .then(function(response) {
               if (response.data.state == 0) {
@@ -2515,7 +2527,10 @@
               'admin_user_id': this.$store.getters.xt_user.user.id
             }
             axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
-              params: params
+              params: params,
+              headers: {
+                'Permission': 5,
+              }
             })
               .then(function(response) {
                 if (response.data.state == 0) {

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -0,0 +1,409 @@
+<template>
+    <div class="main-contain incomeStatistics">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class="app-container">
+            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+                <div>
+                    <el-input size="small" style="width:150px;" v-model="keywords"
+                              class="filter-item"/>
+                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                               @click="searchAction">
+                        搜索
+                    </el-button>
+                </div>
+                <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</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'}"
+                      v-loading="patientLoading"
+                      highlight-current-row>
+                <el-table-column
+                        prop="date"
+                        label="序号"
+                        width="60"
+                        align="center"
+                        type="index"
+                >
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="流水号">
+                    <template slot-scope="scope">{{scope.row.trt_dcla_detl_sn}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="时间">
+                    <template slot-scope="scope" v-if="scope.row.ctime > 0">{{getTimes(scope.row.ctime)}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="姓名">
+                    <template slot-scope="scope">{{scope.row.name}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="人员编号">
+                    <template slot-scope="scope">
+                        <div>{{scope.row.psn_no}}</div>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="联系电话">
+                    <template slot-scope="scope">{{scope.row.phone}}</template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="地址">
+                    <template slot-scope="scope">
+                        {{scope.row.home_address}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" width="160" label="鉴定定点医药机构">
+                    <template slot-scope="scope">
+                        {{$store.getters.xt_user.org.org_name}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="医生">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.record.doctor_id" placeholder="请选择"
+                                   @change="changeDoctor(scope.row,scope.row.record.doctor_id)">
+                            <el-option
+                                    v-for="(item,index) in doctorList"
+                                    :key="index"
+                                    :label="item.user_name"
+                                    :value="item.admin_user_id">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="科室">
+                    <template slot-scope="scope">
+                        <el-select style="margin-right:5px;width:140px;" v-model="scope.row.record.department_id"
+                                   placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in department"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+
+
+                <el-table-column align="center" prop="name" label="险种类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.insutype == '310'">职工基本医疗保险</div>
+                        <div v-if="scope.row.insutype == '320'">公务员医疗补助</div>
+                        <div v-if="scope.row.insutype == '330'">大额医疗费用补助</div>
+                        <div v-if="scope.row.insutype == '340'">离休人员医疗保障</div>
+                        <div v-if="scope.row.insutype == '390'">城乡居民基本医疗保险</div>
+                        <div v-if="scope.row.insutype == '392'">城乡居民大病医疗保险</div>
+                        <div v-if="scope.row.insutype == '510'">生育保险</div>
+                    </template>
+                </el-table-column>
+
+                <el-table-column align="center" prop="name" label="疾病类型">
+                    <template slot-scope="scope">
+                        <el-select style="width:100%;" v-model="scope.row.sick_type" placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in sick"
+                                    :key="index"
+                                    :label="item.class_name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="date" label="操作" width="80" align="center" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button type="primary" size="small" icon="el-icon-refresh-left">
+                            <span v-if="scope.row.record.is_cancel == 0 ||scope.row.record.is_cancel == 2" @click="putOnRecord(1,scope.row)">备案</span>
+                            <span v-if="scope.row.record.is_cancel == 1" @click="putOnRecord(2,scope.row)">撤消</span>
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-dialog title="备案" :visible.sync="dialogFormVisible">
+                <el-form :model="form" label-width="100px">
+                    <el-form-item label="险种类型" :label-width="formLabelWidth">
+                        <el-select v-model="insutype" placeholder="请选择" style="width: 200px;">
+                            <el-option
+                                    v-for="item in insutypes"
+                                    :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="confirm">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
+        <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-sizes="[10, 50, 100]"
+                :page-size="10"
+                background
+                style="margin-top:20px;float: right"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="total"
+
+        >
+        </el-pagination>
+    </div>
+</template>
+
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getAllDoctorList, getInitData, getRecordList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers } from '@/api/doctor'
+  import axios from 'axios'
+
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        currentObject: null,
+        crumbs: [
+          { path: false, name: '门诊收费' },
+          { path: false, name: '医保费用对照' }
+        ],
+        tableData: [],
+        doctorList: [],
+        department: [],
+        patientLoading: false,
+        sick: [],
+        limit: 10,
+        page: 1,
+        dialogFormVisible: false,
+        total: 0,
+        adminUserOptions: [],
+        start_time: '',
+        end_time: '',
+        insutype: '',
+        check_type: '',
+        keywords: '',
+        options: [
+          {
+            value: 1,
+            label: '总账'
+          }, {
+            value: 2,
+            label: '明细'
+          }
+        ],
+
+        insutypes: [
+          {
+            value: '310',
+            label: '职工基本医疗保险'
+          }, {
+            value: '320',
+            label: '公务员医疗补助'
+          }, {
+            value: '330',
+            label: '大额医疗费用补助'
+          }, {
+            value: '340',
+            label: '离休人员医疗保障'
+          },
+          {
+            value: '390',
+            label: '城乡居民基本医疗保险'
+          }, {
+            value: '392',
+            label: '城乡居民大病医疗保险'
+          }, {
+            value: '510',
+            label: '生育保险'
+          }
+
+        ]
+
+      }
+    },
+    methods: {
+      putOnRecord(type, row) {
+        if (type == 1) {
+          this.dialogFormVisible = true
+          this.currentObject = row
+        } else {
+          this.$confirm('是否撤销备案', '撤销备案', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              'id': row.id,
+              'admin_user_id': this.$store.getters.xt_user.user.id
+
+            }
+            var that = this
+            axios.get('http://127.0.0.1:9532/api/psn/ncds/unputonrecord', {
+              params: params
+            })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg)
+                  return false
+                } else {
+
+                  if(response.data.data.failed_code == -10){
+                    that.$message.error(response.data.data.msg)
+                  }else{
+                    row.record.is_cancel = 2
+                    that.$message({ message: '撤销成功', type: 'success' })
+                  }
+                }
+              })
+              .catch(function(error) {
+
+              })
+
+          }).catch(() => {
+
+          })
+
+        }
+
+      },
+      changeDoctor(row, id) {
+        for (let i = 0; i < this.doctorList.length; i++) {
+          if (id == this.doctorList[i].admin_user_id) {
+            if (this.doctorList[i].department_id == 0) {
+              row.record.department_id = ''
+            } else {
+              row.record.department_id = this.doctorList[i].department_id
+            }
+          }
+        }
+      },
+      getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.doctorList = response.data.data.doctors
+            this.department = response.data.data.department
+            this.sick = response.data.data.sick
+
+          }
+        })
+
+      },
+      getSickName(id) {
+
+      },
+      confirm() {
+        let params = {
+          record_type: 0,
+          patient_id: this.currentObject.id,
+          admin_user_id: this.$store.getters.xt_user.user.id
+        }
+
+        var that = this
+        axios.get('http://127.0.0.1:9532/api/psn/ncds/putonrecord', {
+          params: params
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$message.error(response.data.data.msg)
+              }else{
+                for (let i = 0; i < that.tableData.length; i++) {
+                  if (that.tableData[i].id == that.currentObject.id) {
+                    that.tableData[i].record.is_cancel == 1
+                  }
+                }
+              }
+
+            }
+          })
+          .catch(function(error) {
+
+          })
+      },
+      getInsutype(type) {
+
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+
+          }
+        })
+      },
+      getName(admin_user_id) {
+        for (let i = 0; i < this.adminUserOptions.length; i++) {
+          if (this.adminUserOptions[i].id == admin_user_id) {
+            return this.adminUserOptions[i].name
+          }
+        }
+
+      },
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
+      },
+      getList() {
+        let params = {
+          'page': this.page,
+          'limit': this.limit,
+          'keywords': this.keywords
+        }
+        this.tableData = []
+        this.patientLoading = true
+        getRecordList(params).then(response => {
+          if (response.data.state == 0) {
+            this.patientLoading = false
+
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientLoading = false
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+
+            for (let i = 0; i < this.tableData.length; i++) {
+
+              if (this.tableData[i].record.doctor_id == 0) {
+                this.tableData[i].record.doctor_id = ''
+
+              }
+              if (this.tableData[i].record.department_id == 0) {
+                this.tableData[i].record.department_id = ''
+              }
+
+            }
+
+          }
+        })
+
+      },
+      handleSizeChange(limit) {
+        this.limit = limit
+        this.getList()
+      },
+      handleCurrentChange(page) {
+        this.page = page
+        this.getList()
+
+      }, searchAction() {
+        this.getList()
+      }
+    },
+    created() {
+      this.getList()
+      this.getInitData()
+      this.fetchAllAdminUsers()
+
+    }
+  }
+</script>

src/xt_pages/outpatientRegistration/index.vue

@@ -941,7 +941,10 @@
             if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
               var that = this
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
-                params: params
+                params: params,
+                headers: {
+                  'Permission': 5
+                }
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
@@ -966,7 +969,10 @@
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
-                params: params
+                params: params,
+                headers: {
+                  'Permission': 5
+                }
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
@@ -1137,7 +1143,10 @@
               var that = this
 
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
-                params: params
+                params: params,
+                headers: {
+                  'Permission': 5
+                }
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
@@ -1167,7 +1176,10 @@
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
-                params: params
+                params: params,
+                headers: {
+                  'Permission': 5
+                }
               })
                 .then(function(response) {
                   if (response.data.state == 0) {

src/xt_pages/user/patient.vue

@@ -4,8 +4,9 @@
       <el-input   style="width: 400px;" v-model="searchKey" class="filter-item" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
       <!-- <el-button  class="filter-item" type="primary" style="float:right;" icon="el-icon-download" >批量导入</el-button> -->
-      <!-- <el-button  type="primary" plain style="float:right;" icon="el-icon-download" >批量导入</el-button>       -->
       <el-button @click="$router.push({path:'/patients/create'})" class="filter-item" style="float:right;" type="primary" icon="el-icon-edit" >新增病人</el-button>
+
+
     </div>
   	<!-- <div class="search-component clearfix">
       <input type="text" class="searchBox" placeholder="姓名/首拼/透析号" v-model="searchVal">
@@ -286,6 +287,11 @@ export default {
     this.reimbursement_ways = this.$store.getters.reimbursement_ways;
   },
   methods: {
+    putOnRecord(){
+
+
+
+    },
     getCount(row){
       console.log(row)
       return row.total_dialysis + row.user_sys_before_count

src/xt_pages/user/patients.vue

@@ -134,6 +134,7 @@
         </el-button>
       </div>
 
+      <el-button  type="primary" plain style="float:right;" icon="el-icon-download" @click="putOnRecord(2,{})" >备案</el-button>
 
     </div>
     <div class="app-container">
@@ -451,6 +452,22 @@
                 "
               ></el-button>
             </el-tooltip>
+
+            <el-tooltip
+                    class="item"
+                    effect="dark"
+                    content="备案"
+                    placement="top"
+            >
+              <el-button
+                      type="danger"
+                      icon="el-icon-tickets"
+                      size="small"
+                      @click="
+                  putOnRecord(1,scope.row)
+                "
+              ></el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -506,7 +523,7 @@
           <!-- <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
               <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">转出</el-radio>
               <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">死亡</el-radio>
-              
+
           </el-form-item> -->
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
             <el-date-picker
@@ -765,7 +782,7 @@
     },
     created() {
       if(sessionStorage.getItem('patientPageSize')){
-        this.listQuery.limit = parseInt(sessionStorage.getItem('patientPageSize')) 
+        this.listQuery.limit = parseInt(sessionStorage.getItem('patientPageSize'))
       }
       this.getList()
       this.contagionList = this.$store.getters.contagions
@@ -781,6 +798,17 @@
     },
 
     methods: {
+      putOnRecord:function(type,row){
+        if(type == 1){
+
+
+        }else{
+
+
+
+
+        }
+      },
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -1499,7 +1527,7 @@
         }else {
           return uParseTime(val, '{y}-{m}-{d}')
         }
-       
+
       },
     }
   }