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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/his/his.js

@@ -588,3 +588,13 @@ export function postFaPiaoIsUse(params) {
 
 
 
+export function deleteNCDSRecord(params) {
+  return request({
+    url: '/api/psn/ncds/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+
+

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1867,8 +1867,8 @@ export default {
       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
-      this.curMonthPrescriptions = {}
-      this.curPrescriptions = {}
+      // this.curMonthPrescriptions = {}
+      // this.curPrescriptions = {}
       // this.$refs.tabProjectTeam.clearSelection()
 
       for (let i = 0; i < doctors.length; i++) {

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -0,0 +1,206 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称">
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="频率">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">{{scope.row.day}}天</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="100" label="总量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="单价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{scope.row.delivery_way}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+          {{scope.row.number_days}}天
+
+        </template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}} {{scope.row.unit}}
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}元
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+        共
+        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInitData } from '@/api/his/his'
+import { getDictionaryDataConfig} from "@/utils/data";
+
+export default {
+  props: {
+    prescription: Object
+  },
+  data() {
+    return {
+      drugways: [],
+      efs: []
+    }
+  }, mounted() {
+    getInitData().then(response => {
+      if (response.data.state == 0) {
+        this.$message.error(response.data.msg);
+        return false
+      } else {
+        this.drugways = response.data.data.drugways;
+        this.efs = response.data.data.efs
+      }
+    })
+  }, methods:  {
+
+
+    getGroup(id){
+      var name = "";
+      var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+      console.log("2235",statistics_category);
+      for(let i=0;i<statistics_category.length;i++){
+        if(id == statistics_category[i].id){
+          name = statistics_category[i].name
+        }
+      }
+      return name
+    },
+
+
+  }
+}
+</script>
+
+<style lang="scss">
+.prescriptionTable{
+.additionalBox{
+  margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+.additionalOne{
+  margin-right:20px;
+  margin-bottom:10px;
+  display: flex;
+  align-items: center;
+>span{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width:80px;
+  display: inline-block;
+  font-size: 14px;
+}
+}
+.deleteIcon{
+  color:red;
+  margin-left:5px;
+}
+}
+.el-table th .cell, .el-table td .cell{
+  padding: 0 2px;
+  white-space: pre-line;
+}
+.el-icon-delete{
+  color:red;
+}
+}
+</style>

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -405,6 +405,7 @@
         this.saveLoading = data
       },
       changeTimeTwo() {
+        this.titleType = "电子处方"
         this.getList()
       },
       openPrint() {
@@ -1416,7 +1417,6 @@
 
               }
             }
-            console.log('~~~~~00000222222')
             this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
           }
         })
@@ -3935,10 +3935,7 @@
         if (this.titleType == '电子处方') {
           if (this.radio == 1) {
             this.un_cure_data.map(item => {
-              console.log('~~~~~~~~')
               if (item.id == this.patientid) {
-                console.log('~~~~~~~~22222222')
-
                 this.getPatientInfo(item)
               }
             })

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -15,7 +15,7 @@
             <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
             <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
             <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
+            <div style="display:flex;width:50%;">临床诊断：22222{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
         </div>
         <div class="prescriptionBox">
             <div class="Rp">Rp:</div>
@@ -51,6 +51,7 @@ export default {
     },
     data(){
       return {
+        diagnoses:[],
         doctorList:[],
         advicePrint:{},
         patient:{},
@@ -62,6 +63,15 @@ export default {
       }
     },
    methods:{
+     getInitData(){
+       getInitData().then(response=>{
+         if(response.data.state == 1){
+           this.department = response.data.data.department
+           this.diagnoses = response.data.data.diagnose
+           console.log("争端",this.diagnoses)
+         }
+       })
+     },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''
@@ -88,8 +98,16 @@ export default {
                this.doctorList = doctor
              }
          })
+     },   getDiagnosis(id) {
+       let arr = id.split(',')
+       var name = ''
+       for (let i = 0; i < this.diagnoses.length; i++) {
+         if (arr.indexOf(String(this.diagnoses[i].id)) > -1) {
+           name += this.diagnoses[i].class_name + ' '
+         }
+       }
+       return name
      },
-
       getDoctor(id){
         var name = ""
         for(let i=0;i<this.doctorList.length;i++){
@@ -147,14 +165,7 @@ export default {
           }
        })
      },
-     getInitData(){
-       getInitData().then(response=>{
-          if(response.data.state == 1){
-            this.department = response.data.data.department
 
-          }
-       })
-     },
      getDepart(id){
          var name = ""
        for(let i=0;i<this.department.length;i++){

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -117,6 +117,15 @@
                         <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
                             <span @click="putOnRecord(2,scope.row)">撤消</span>
                         </el-button>
+
+
+                      <el-button type="primary" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                        <span @click="putOnRecord(3,scope.row)">查看备案信息</span>
+                      </el-button>
+
+                      <el-button type="primary" size="small" icon="el-icon-tickets" >
+                        <span @click="putOnRecord(4,scope.row)">删除</span>
+                      </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -201,7 +210,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDoctorList, getInitData, getRecordList } from '@/api/his/his'
+  import { getAllDoctorList, getInitData, getRecordList,deleteNCDSRecord } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
@@ -382,7 +391,7 @@
 
           this.getGdybPatientInfo()
 
-        } else {
+        } else if(type == 2) {
           this.$confirm('是否撤销备案', '撤销备案', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -426,8 +435,65 @@
 
           })
 
-        }
+        }else if(type == 3){
+          let params = {
+            'id': row.record.id,
+            'admin_user_id': this.$store.getters.xt_user.user.id
+          };
+          var that = this;
+          axios.get('http://127.0.0.1:9532/api/psn/info', {
+            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)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.$confirm(response.data.data.result, '医保信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+
+                    })
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+        }else if(type == 4){
+          this.$confirm("是否删除", '删除', {
+            confirmButtonText: '确 定',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              id: row.record.id,
+            }
+            deleteNCDSRecord(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false
+              } else {
+                this.getList()
+              }
+            })
 
+          }).catch(() => {
+          })
+
+
+        }
       },
       changeDoctor(row, id) {
         for (let i = 0; i < this.doctorList.length; i++) {

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -82,6 +82,39 @@
           </ul>
         </div>
       </div>
+
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">转归状态</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+                :class="item.lapseto == lapsetoType ? 'active' : ''"
+                @click="selectLapseTo(item.lapseto)"
+                v-for="item in lapsetoState"
+                :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">患者来源</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+                :class="item.source == originType ? 'active' : ''"
+                @click="selectLapseTo(item.source)"
+                v-for="item in originState"
+                :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
+
       <div class="cell clearfix">
         <p class="chartTitle">统计图</p>
       </div>
@@ -141,7 +174,17 @@ export default {
       modesData: {
         xAxis: [],
         series: []
-      },
+      }, lapsetoType: 0,
+      lapsetoState: [
+        { value: 0, label: '全部', source: 0, lapseto: 0 },
+        { value: 1, label: '转出', source: 0, lapseto: 2 },
+        { value: 2, label: '留治', source: 0, lapseto: 1 }
+      ],originType:0,
+      originState: [
+        { value: 0, label: '全部', source: 0},
+        { value: 1, label: '住院', source: 1},
+        { value: 2, label: '门诊', source: 2}
+      ],
       crumbs: [
         { path: false, name: '质控管理' },
         { path: false, name: '科室质控达标统计' },
@@ -742,7 +785,7 @@ export default {
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
-        }else{
+        } else {
           this.isLoading = false
         }
       })

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))