Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/config.js

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

src/api/his/his.js

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

src/xt_pages/data/basicConfig.vue

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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

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

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

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