HIS 系统提交

src/api/project/project.js

@@ -242,4 +242,22 @@ export function getAllProjectTeam(params){
      methods:"get",
      params:params
   })
+}
+
+export function getPojectListById(params){
+  
+  return request({
+    url:"/api/his/getprojectlistbyid",
+    methods:"get",
+    params:params 
+  })
+}
+
+export function getHisPatientHistory(params){
+  
+    return request({
+        url:"/api/his/gethispatienthistory",
+        methods:"get",
+        params:params
+    })
 }

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -18,7 +18,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary"  @click="submitAction()">保 存</el-button>
         </div>
     </el-dialog>         
 </template>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -11,7 +11,7 @@
     <div class="backColor"></div>
     <div class="mainCenter">
       <div class="centerLeft">
-        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
+        <el-form :model="form"  ref="form" label-width="80px">
           <el-form-item label="姓名:" prop="name">
             <el-input v-model="patientInfo.name" placeholder=""></el-input>
           </el-form-item>
@@ -28,7 +28,6 @@
               v-model="state1"
               :fetch-suggestions="querySearch"
               placeholder="请输入内容"
-              @select="handleSelect"
             ></el-autocomplete>
           </el-form-item>
           <el-form-item label="大病类别: " prop="name">
@@ -105,7 +104,7 @@
               </el-option>
             </el-select>
           </div>
-          <div style="height:84%;overflow-y: auto;margin-bottom: 60px;">
+          <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
                 <el-table :data="drugs" border @select='selectDrugs' style="width: 100%;"
@@ -123,6 +122,7 @@
                     <template slot-scope="scope">{{ scope.row.retail_price }}</template>
                   </el-table-column>
                 </el-table>
+
               </el-tab-pane>
               <el-tab-pane label="医嘱模板" name="2">
                 <el-table :data="advices_template" border style="width: 100%;" :row-style="{ color: '#303133' }"
@@ -145,6 +145,40 @@
               </el-tab-pane>
             </el-tabs>
           </div>
+
+         <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 :data="tabProject" border @select='selectChange' style="width: 100%;"
+                          :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row >
+                  <el-table-column align="center" type="selection" width="40"></el-table-column>
+                  <el-table-column align="center" prop="name" label="名称">
+                    <template slot-scope="scope">{{ scope.row.project_name }}</template>
+                  </el-table-column>
+                  <el-table-column align="center" label="规格" width="60">
+                    <template slot-scope="scope">{{ scope.row.single_dose }}</template>
+                  </el-table-column>
+                  <el-table-column align="center" label="单价" width="40">
+                    <template slot-scope="scope">{{ scope.row.price }}</template>
+                  </el-table-column>
+                </el-table>
+              </el-tab-pane>
+              <el-tab-pane label="项目组套" name="2">
+                <el-table :data="tabPrjectTeam" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row
+                         @select='selectTeam'>
+                  <el-table-column align="center" type="selection" width="40"></el-table-column>
+                  <el-table-column align="center" prop="name" label="名称">
+                    <template slot-scope="scope">{{scope.row.project_team}}</template>
+                  </el-table-column>
+                </el-table>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+
           <div class="comfirmBox">
             <div>
               <span>药品类型：</span>
@@ -154,7 +188,7 @@
                   value="0">
                 </el-option>
                 <el-option
-                  v-for="item,index in getDictionaryDataConfig('system','drug_type')"
+                  v-for="(item,index) in getDictionaryDataConfig('system','drug_type')"
                   :key="index"
                   :label="item.name"
                   :value="item.id">
@@ -180,7 +214,7 @@
   import selectTemplate from './selectTemplate'
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
-  import { getHisProject,addProjectTeam } from '@/api/project/project'
+  import { getHisProject,addProjectTeam,getAllProjectTeam,getPojectListById } from '@/api/project/project'
   // import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
 
   export default {
@@ -229,7 +263,12 @@
         customTabIndex:1,
         options:[],
         tabProject:[],
-        strids:""
+        strids:"",
+        showOne:true,
+        showTwo:false,
+        tableData:[],
+        tabPrjectTeam:[],
+        teamList:[],
       }
     },
     methods: {
@@ -274,6 +313,7 @@
                 this.customTabIndex = 1
               }
               if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+               
                 this.customTabIndex = 2
               }
 
@@ -349,19 +389,26 @@
           this.$nextTick(() => {
             this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length-1])
           });
+         this.customTabIndex = 1
         }
         if(index == 2){
           this.showTwo = true
           this.showOne = false
+           this.$nextTick(() => {
+            this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length-1])
+          });
+         this.customTabIndex = 2
         }
         this.rightTab = index
 
 
         //用来区分处方属于项目还是药品
         if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
+        
           this.customTabIndex = 1
         }
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+         
           this.customTabIndex = 2
         }
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
@@ -381,39 +428,23 @@
       },
       comfirm() {
         this.preDrugs = this.curDrugs
-        console.log(this.editableTabsValue)
+        
         for (let i = 0; i < this.prescriptions.length; i++){
+          console.log("名称",this.prescriptions[i].name)
+          console.log("名称2",this.editableTabsValue)
           if(this.prescriptions[i].name == this.editableTabsValue){
             this.prescriptions[i].advices = this.preDrugs
+            this.prescriptions[i].project = this.teamList
             this.curPrescriptions = this.prescriptions[i]
             // this.$refs.prescription_tables.setNewData(this.prescriptions[i])
           }
         }
-
-
-        // console.log(this.prescriptions)
+        console.log("222222",this.prescriptions)
       },
       selectChange(row){
-        // console.log("row222",row)
-        var ids = []
-        for(let i=0;i<row.length;i++){
-          ids.push(row[i].id)
-        }
-        console.log("ids",ids)
-        var strids = ids.join(",")
-        this.strids = strids
+        this.teamList = row
       },
-      addProjectTeam(){
-        var params = {
-          strids:this.strids
-        }
-        addProjectTeam(params).then(response=>{
-          if(response.data.state == 1){
-            var team = response.data.data.team
-            console.log("team",team)
-          }
-        })
-      }, getlist(){
+      getlist(){
         getHisProject().then(response=>{
           if(response.data.state == 1){
             var project = response.data.data.project
@@ -422,10 +453,66 @@
           }
         })
       },
-    },created(){
+      querySearch(){
+
+      },
+      getAllProjectTeam(){
+        getAllProjectTeam().then(response=>{
+          if(response.data.state == 1){
+            var team =  response.data.data.team
+            console.log("team",team)
+            this.tabPrjectTeam = team
+          }
+        })  
+      },
+      selectTeam(row){
+          var arr = []
+          for(let i=0;i<row.length;i++){
+             arr.push(row[i].project_id)
+          }
+        var ids =  arr.join(",")
+        console.log("ids",ids)
+        var strArr = ids.split(",")
+        var res = [];//接收不重复的数据
+      
+        for (var i = 0; i<strArr.length; i++){
+        var flag = true;
+       
+        for (var j = 0; j<i; j++){
+          if(strArr[i]===strArr[j]){
+            flag = false;
+            break;
+           }
+         }
+        if(flag){
+          res.push(strArr[i])
+         }
+        }
+        console.log("res",res)
+      
+        var idstr =  res.join(",")
+        console.log("idstr",idstr)
+        const params = {
+           project_id:idstr
+        }
+        getPojectListById(params).then(response=>{
+           if(response.data.state == 1){
+             var project =  response.data.data.project
+             console.log("project222",project)
+             this.teamList = []
+             this.teamList = project
+           }
+        })
+      }
+    },
+    created(){
       this.getInitData()
       //获取所有项目
       this.getlist()
+      //获取所以项目组套
+      this.getAllProjectTeam()
+
+   
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -80,100 +80,58 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="activeType  == 2" :data="prescription.project" border style="width: 98%;" :row-style="{ color: '#303133' }"
+
+    <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 98%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" type="selection" width="40"></el-table-column>
-      <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">{{ scope.row.name }}</template>
+      <el-table-column align="center" type="index" width="40" label="序号">
+         <template slot-scope="scope">
+            {{scope.$index + 1}}
+         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="组套">
+      <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="50" label="组">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          {{getGroup(scope.row.statistical_classification)}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="130" label="用法">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-input v-model="scope.row.delivery_way" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="130" label="天数">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-input v-model="scope.row.number_days" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="总量">
+      <el-table-column align="center" prop="total" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="input" style="width:50%" placeholder=""></el-input>
-            <!-- <el-select v-model="value" style="width:50%" placeholder="">
-                <el-option
-                v-for="item in newoptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                </el-option>
-            </el-select> -->
-            <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+            <el-input v-model="scope.row.total" style="width:50" placeholder=""></el-input>
           </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.unitPrice" placeholder=""></el-input>
+          <el-input v-model="scope.row.price" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="name" width="120" label="备注">
         <template slot-scope="scope">
-          <!-- <el-autocomplete
-          class="inline-input"
-          v-model="state1"
-          :fetch-suggestions="querySearch"
-          placeholder=""
-          @select="handleSelect"
-          ></el-autocomplete> -->
+           <el-input v-model="scope.row.remark"></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
@@ -183,24 +141,27 @@
       </el-table-column>
     </el-table>
 
+
+    
+
   </div>
 </template>
 
 <script>
+  import { getDictionaryDataConfig} from "@/utils/data";
   export default {
     props: {
       preDrugs: Array,
-      activeType: String,
+      activeType: Number,
       prescription:{
         type:Object,
         default: function () {
           return {
             name:"",
             advices:[],
-            projects:[],
+            project:[],
           };
         }
-
       },
     },
     data() {
@@ -224,14 +185,32 @@
           label: '5'
         }],
         value: '1',
-        input: 1
+        input: 1,
       }
-    },methods:{
+    },
+    methods:{
       setNewData:function(data){
 
         // this.prescription.advices = data.advices
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      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
       }
     },
+    created(){
+      
+    },
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -6,7 +6,7 @@
         :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form"  class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="创建人 : " style="width: 100%;margin-bottom:0;">
                     医生
                 </el-form-item>
@@ -59,6 +59,8 @@ export default {
             form:{
                 name:''
             },
+            radio:"1",
+            options:[]
         }
     },
     methods:{

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -194,7 +194,7 @@
               }
               this.prescriptions.push(obj)
             }
-            console.log()
+            console.log("中国22222222",this.prescriptions)
             this.$refs.prescriptions.setData(this.prescriptions)
           }
         })

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -5,9 +5,9 @@
         </div>
         <div class="app-container">
             <div class="cell clearfix">
-                <el-input style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
+                <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/>
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
-                <el-date-picker
+                <!-- <el-date-picker
                 v-model="value1"
                 @change="changeTime"
                 style="margin-right:10px;"
@@ -15,16 +15,26 @@
                 range-separator="-"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期">
+                </el-date-picker> -->
+                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    placeholder="选择时间" v-model="start_time" style="width:200px"
+                    @change="changeStart"
+                 >
+                </el-date-picker> -
+                <el-date-picker type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    placeholder="选择时间" v-model="end_time" style="width:200px"
+                    @change="changeEnd"
+                 >
                 </el-date-picker>
-                <!-- <label class="title"><span class="name">挂号类型</span> : </label>
-                <el-select v-model="value" placeholder="请选择" style="width:150px;">
+                <label class="title"><span class="name">挂号类型</span> : </label>
+                <el-select v-model="register_type" placeholder="请选择" style="width:150px;" @change="changeRegister">
                     <el-option
-                    v-for="item in options"
+                    v-for="item in register"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select> -->
+                </el-select>
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                 <el-table-column align="center" type="index" label="序号" width="60">
@@ -97,6 +107,7 @@
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getHisPatientHistory } from "@/api/project/project"
 export default {
     components:{
         BreadCrumb
@@ -107,56 +118,91 @@ export default {
                 { path: false, name: '门诊挂号' },
                 { path: false, name: '挂号历史' }
             ],
+            register_type:0,
             search_input:'',
             value1:'',
-            tableData: []
+            tableData: [],
+            register: [
+                {value: 0,label:"全部"},
+                {value: 1,label: '普通'},
+                {value: 2,label: "主治"},
+                {value: 3,label: "主任"},
+                {value: 4,label: "免收诊金"},
+                {value: 5,label: "专家"}
+            ],
+            start_time:"",
+            end_time:"",
+            limit:20,
+            page:1,
         }
     },
     created(){
-        let a = JSON.parse(localStorage.getItem("temp"))
-        let arr = []
-        a.map(item => {
-            if(item.org_id == this.$store.getters.xt_user.org_id){
-                item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
-                arr.push(item)
-            }
+        // let a = JSON.parse(localStorage.getItem("temp"))
+        // let arr = []
+        // a.map(item => {
+        //     if(item.org_id == this.$store.getters.xt_user.org_id){
+        //         item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+        //         arr.push(item)
+        //     }
             
-        })
-        console.log('aaaaaaaaaaaaaa',a)
-        this.tableData = arr
+        // })
+        // this.tableData = arr
+       this.getlist()
     },
     methods:{
-        searchAction(){
-            let arr = this.tableData
-            let a = []
-            arr.map(item => {
-                if(item.name.indexOf(this.search_input) > -1 && item.org_id == this.$store.getters.xt_user.org_id){
-                    a.push(item)
-                }
-            })
-            this.tableData = a
+        // searchAction(){
+        //     let arr = this.tableData
+        //     let a = []
+        //     arr.map(item => {
+        //         if(item.name.indexOf(this.search_input) > -1 && item.org_id == this.$store.getters.xt_user.org_id){
+        //             a.push(item)
+        //         }
+        //     })
+        //     this.tableData = a
+        // },
+        // changeTime(val){
+        //     let arr = JSON.parse(localStorage.getItem("temp"))
+        //     arr.map(item => {
+        //         item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+        //     })
+        //     this.tableData = arr
+        //     console.log(new Date(val[0]).getTime() / 1000)
+        //     console.log(new Date(val[1]).getTime() / 1000)
+        //     let arr1 = this.tableData
+        //     let a = []
+        //     arr1.map(item => {
+        //      if(new Date(item.create_time).getTime() / 1000 > new Date(val[0]).getTime() / 1000 && new Date(item.create_time).getTime() / 1000 < new Date(val[1]).getTime() / 1000 && item.org_id == this.$store.getters.xt_user.org_id){
+        //         a.push(item)
+        //       }
+        //     })
+        //     this.tableData = a
+        // },
+        changeStart(val){
+          this.start_time = val
+        },
+        changeEnd(val){
+           this.end_time = val
+        },
+        changeRegister(val){
+
         },
-        changeTime(val){
-            let arr = JSON.parse(localStorage.getItem("temp"))
-            arr.map(item => {
-                item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
-            })
-            this.tableData = arr
-            console.log(new Date(val[0]).getTime() / 1000)
-            console.log(new Date(val[1]).getTime() / 1000)
-            let arr1 = this.tableData
-            let a = []
-            arr1.map(item => {
-                // if(new Date(val[0]).getTime() / 1000){
-                //     a.push(item)
-                // }
-                if(new Date(item.create_time).getTime() / 1000 > new Date(val[0]).getTime() / 1000 && new Date(item.create_time).getTime() / 1000 < new Date(val[1]).getTime() / 1000 && item.org_id == this.$store.getters.xt_user.org_id){
-                    a.push(item)
-                }
-            })
-            this.tableData = a
+        getlist(){
+            var params = {
+               keyword:this.search_input,
+               start_time:this.start_time,
+               end_time:this.end_time,
+               register_type:this.register_type,
+               limit:this.limit,
+               page:this.page,
+            }
+           console.log("params",params)
+          getHisPatientHistory(params).then(response=>{
+
+          })
+ 
         }
 
+
     }
 }
 </script>