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

@@ -21,9 +21,10 @@ export function getPatientInfo(params) {
 
 
 export function createCaseHistory(params) {
+  console.log("params",params)
   return request({
     url: "/api/doctorworkstation/casehistory/create",
-    method: "post",
+    method: "get",
     params:params
   });
 }

src/api/project/project.js

@@ -1,4 +1,5 @@
 import request from "@/utils/request";
+import url from "postcss-url";
 
 export function saveProject(params){
 
@@ -270,4 +271,50 @@ export function changePatient(id,params){
       method:"get",
       params:params
     })
-  }
+  }
+
+
+  export function getPatientCaseHistory(params){
+     
+    return request({
+        url:"/api/patient/getpatientcasehistory",
+        method:"get",
+        params:params
+    })
+  }
+
+  export function SaveHisPatientCaseHistoryTemplate(params){
+      
+    return request({
+       url:"/api/doctorworkstation/casehistorytemplate/create",
+       method:"get",
+       params:params
+    })
+  }
+
+  export function getHistoryTemplate(params){
+   
+    return request({
+      url:"/api/doctorworkstation/casehistorytemplate/get",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function getTemplateDetail(id,params){
+     
+     return request({
+        url:"/api/doctorworkstation/gettemplatedetail?id="+id,
+        method:"get",
+        params:params
+     })
+  }
+
+  export function updateRecordTemplate(params){
+    
+    return request({
+        url:"/api/doctorworkstation/updaterecordtemplate",
+        method:"get",
+        params:params  
+    })
+  } 

src/xt_pages/data/components/addInspection.vue

@@ -45,7 +45,8 @@
                 </el-form-item>
   
                  <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择">
+                    <el-select v-model="form.project_detail" placeholder="请选择"
+                     @change="chagneInspection">
                         <el-option
                         v-for="item in projectList"
                         :key="item.id"
@@ -110,7 +111,7 @@
 
 <script>
 import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { saveProjectTeam,getAllProjectList,addProjectList,DeleteProject } from "@/api/project/project"
+import { saveProjectTeam,getAllProjectList,addProjectList,DeleteProject,getProjectDetail } from "@/api/project/project"
 export default {
     data(){
         return{
@@ -142,7 +143,8 @@ export default {
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
            },
            tableData:[],
-           projectList:[]
+           projectList:[],
+           tabList:[],
         }
     },
     methods:{
@@ -168,7 +170,6 @@ export default {
          this.visible = false
         },
         submitAction(formName){
-          
            this.$refs[formName].validate((valid)=>{
                 var arr = []
                 for(let i=0;i<this.tableData.length;i++){
@@ -200,6 +201,8 @@ export default {
                    this.form.tube_color = "",
                    this.form.team_type = "",
                    this.form.remark = ""
+                   this.tableData = []
+                   this.form.number = ""
                    this.$parent.getlist()
                  }else{
                     this.$message.error("项目组套名称已存在!")
@@ -213,28 +216,13 @@ export default {
                var projectList = response.data.data.projectList
                console.log('projectlist33333',projectList)
                this.projectList = projectList
-               var hisprojectlist = response.data.data.hisprojectlist
-               console.log("hisprojectlist",hisprojectlist)
-               this.tableData = hisprojectlist
+            //    var hisprojectlist = response.data.data.hisprojectlist
+            //    console.log("hisprojectlist",hisprojectlist)
+            //    this.tableData = hisprojectlist
              }
           })   
         },
-        addProjectList(){
-            const params = {
-              id:this.form.project_detail,
-              number:parseInt(this.form.number)
-            }
-           console.log("params",params)
-          addProjectList(params).then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               this.$message.success("保存成功")
-               this.form.project_detail = ""
-               this.form.number = ""
-               this.getlist()
-             }
-          })
-        },
+       
         getId(id){
           var name = ""
           var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
@@ -246,6 +234,40 @@ export default {
           }
           return name
         },
+        chagneInspection(id){
+           getProjectDetail(id).then(response=>{
+              if(response.data.state == 1){
+               var projectdetail = response.data.data.projecDetail
+               console.log("projectdetail",projectdetail)
+               this.tableData.push(projectdetail)
+              }
+           })
+        },
+       addProjectList(){
+          for(let i=0;i<this.tabList.length;i++){
+            if(this.form.project_detail == this.tabList[i].id){
+                this.tabList[i].number = this.form.number
+            }
+         }
+         this.tableData = []
+         this.tableData = this.tabList
+         
+       
+        //     const params = {
+        //       id:this.form.project_detail,
+        //       number:parseInt(this.form.number)
+        //     }
+        //    console.log("params",params)
+        //   addProjectList(params).then(response=>{
+        //      if(response.data.state == 1){
+        //        var projectList = response.data.data.projectList
+        //        this.$message.success("保存成功")
+        //        this.form.project_detail = ""
+        //        this.form.number = ""
+        //        this.getlist()
+        //      }
+        //   })
+        },
         DeleteProject(id,index){
            this.$confirm("确认删除此项目吗?", "删除", {
             confirmButtonText: "确 定",

src/xt_pages/data/components/inspection.vue

@@ -115,7 +115,9 @@ export default {
         this.page = val
         this.getlist()
       },
-        searchAction(){},
+        searchAction(){
+          this.getlist()  
+        },
         clickSelfPayment(){
             this.$refs.selfPayment.show();
         },

src/xt_pages/data/components/project.vue

@@ -4,7 +4,7 @@
             <div class="cell clearfix" style="margin-bottom:0;">
                 <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' 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>
-                <label class="title"><span class="name">是否启用</span> : </label>
+                <label class="title"><span class="name">状态</span> : </label>
                 <el-select v-model="is_start" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeStart">
                     <el-option
                     v-for="item in options"
@@ -13,8 +13,8 @@
                     :value="item.value">
                     </el-option>
                 </el-select>
-                <label class="title"><span class="name">是否收费</span> : </label>
-                <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择">
+                <label class="title"><span class="name">是否收费预估项:</span> : </label>
+                <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeOption">
                     <el-option
                     v-for="item in optionOne"
                     :key="item.value"
@@ -116,8 +116,8 @@ export default {
         }
     },
     methods:{
-        changeStart(id){
-          console.log("id",id)
+        changeStart(){
+         this.getlist()
         },
         handleSizeChange(val) {
             this.limit = val
@@ -127,7 +127,9 @@ export default {
             this.page = val
             this.getlist()
         },
-        searchAction(){},
+        searchAction(){
+           this.getlist()   
+        },
         clickSelfPayment(){
             this.$refs.selfPayment.show();
         },
@@ -194,6 +196,9 @@ export default {
              });
             })
             .catch(() => {});
+        },
+        changeOption(){
+          this.getlist()
         }
         
     },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -257,7 +257,7 @@
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
   import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
-
+ 
   export default {
     props: {
       patientInfo: Object,
@@ -864,6 +864,7 @@
         })
       },
       selectTeam(row) {
+        console.log("row------",row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].project_id)
@@ -889,6 +890,7 @@
         const params = {
           project_id: idstr
         }
+        console.log("params",params)
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -10,7 +10,7 @@
     </div> -->
     <div class="backColor"></div>
     <div class="mainTitle">基本信息：</div>
-    <el-form class="basicForm" :model="patientInfo" :rules="rules" ref="form" label-width="120px">
+    <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
         <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
       </el-form-item>
@@ -37,14 +37,14 @@
         <el-input v-model="patientInfo.phone" placeholder="" readonly></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
-        <!-- <el-select v-model="scope.row.delivery_way" placeholder="请选择">
-          <el-option
-            v-for="(item,index) in arr"
-            :key="index"
-            :label="item.name"
-            :value="item.name">
-          </el-option>
-        </el-select> -->
+        <el-select v-model="delivery_way" placeholder="请选择">
+         <el-option
+            v-for="item in wayOptions"
+           :key="item.id"
+           :label="item.name"
+           :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
@@ -54,7 +54,7 @@
       </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>
-    <el-form class="physiqueForm" :model="case_history" :rules="rules" ref="form" label-width="80px">
+    <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="体温:" prop="name">
         <el-input v-model="case_history.temperature" placeholder=""></el-input>
         <span>℃</span>
@@ -64,7 +64,7 @@
         (次/分)
       </el-form-item>
       <el-form-item label="呼吸: " prop="name">
-        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        <el-input v-model="case_history.breathing" placeholder=""></el-input>
         (次/分)
       </el-form-item>
       <el-form-item label="血压:" prop="name">
@@ -75,11 +75,11 @@
       </el-form-item>
     </el-form>
     <div class="mainTitle">病历信息：</div>
-    <el-form class="recordForm" :model="case_history" :rules="rules" ref="form" label-width="80px">
+    <el-form class="recordForm" :model="case_history" ref="form" label-width="80px">
       <el-form-item label="发病日期: " prop="name">
         <el-date-picker
           style="width:100%;"
-          v-model="case_history.sick_date"
+          v-model="start_time"
           type="date"
           placeholder="选择日期">
         </el-date-picker>
@@ -135,19 +135,35 @@
           v-model="case_history.diagnostic">
         </el-input>
       </el-form-item>
+       <el-form-item label="医嘱:" prop="doctor_advice" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="doctor_advice">
+        </el-input>
+      </el-form-item>
+       <el-form-item label="备注:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="remark">
+        </el-input>
+      </el-form-item>
     </el-form>
-    <medicalRecord ref='medicalRecord'></medicalRecord>
-    <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+   
   </div>
 </template>
 
 <script>
+  const moment = require('moment')
   import medicalRecord from './medicalRecord'
   import saveRecordTemplate from './saveRecordTemplate'
   import { getDictionaryDataConfig } from "@/utils/data";
   import {  createCaseHistory } from '@/api/his/his'
-
-
+  import { getDataConfig } from "@/utils/data";
+  import { getTemplateDetail } from "@/api/project/project"
   export default {
     props: {
       case_history: Object,
@@ -161,6 +177,8 @@
     },
     data() {
       return {
+        id:0,
+        delivery_way:"",
         case_history:{
           sick_type:'',
           symptom:"",
@@ -185,7 +203,11 @@
         },
         form: {
           name: ''
-        }
+        },
+        wayOptions:[],
+        start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+        doctor_advice:"",
+        remark:""
       }
     },
     methods: {
@@ -193,20 +215,27 @@
         return getDictionaryDataConfig(module, filed_name)
 
       },
-      setData(case_history,patientInfo,hisPatientInfo){
-        this.form.name = patientInfo.name
+      // setData(case_history,patientInfo,hisPatientInfo){
+      //   this.form.name = patientInfo.name
 
 
 
-      },
-      open(index) {
-        if (index == 1) {
+      // },
+      createCaseHistory() {
+        console.log("触发了吗")
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
           }
-
+          if(this.case_history.is_infect == true){
+            this.case_history.is_infect = 1
+          }
+          if(this.case_history.is_infect == false){
+             this.case_history.is_infect = 2
+          }
           let params = {
+            "his_patient_id":this.hisPatientInfo.id,
+            "delivery_way":this.delivery_way?"":0,
             "patient_id":this.patientInfo.id,
             "temperature":this.case_history.temperature,
             "blood_sugar":this.case_history.blood_sugar,
@@ -217,7 +246,7 @@
             "height":this.case_history.height,
             "sick_type":this.case_history.sick_type,
             "symptom":this.case_history.symptom,
-            "sick_date":this.case_history.sick_date,
+            "sick_date":this.start_time,
             "is_infect":this.case_history.is_infect,
             "chief_conplaint":this.case_history.chief_conplaint,
             "history_of_present_illness":this.case_history.history_of_present_illness,
@@ -225,26 +254,49 @@
             "personal_history":this.case_history.personal_history,
             "family_history":this.case_history.family_history,
             "record_date":this.record_date,
-
-
+            "diagnostic":this.case_history.diagnostic,
+            "breathing":this.case_history.breathing,
+            "doctor_advice":this.doctor_advice,
+            "remark":this.remark
           }
+        
           createCaseHistory(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
+              this.$message.error("患者病历已存在")
               return false
             } else {
               this.$message.success("保存成功")
             }
           })
-        } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint')
-        } else if (index == 3) {
-          this.$refs.medicalRecord.show()
-        } else if (index == 4) {
-          this.$refs.saveRecordTemplate.show()
-        }
+       
 
-      }
+      },
+      getMsgFormSon(data){
+       this.getTemplateDetail(data)
+     },
+
+      getTemplateDetail(id){
+          getTemplateDetail(id).then(response=>{
+              if(response.data.state == 1){  
+                var templatedetail =  response.data.data.templateDetail
+                console.log("templatedetail",templatedetail)
+            
+                this.case_history.chief_conplaint =  templatedetail.chief_conplaint 
+                this.case_history.history_of_present_illness =  templatedetail.history_of_present_illness 
+                this.case_history.past_history =  templatedetail.past_history 
+                this.case_history.personal_history =    templatedetail.personal_history 
+                this.case_history.family_history = templatedetail.family_history 
+                this.case_history.diagnostic = templatedetail.diagnostic 
+               
+              }
+          })
+        },
+    },
+    created(){
+       this.wayOptions = getDataConfig("patient", "reimbursement_ways");
+
+       console.log("2222",this.wayOptions)
+     
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -7,10 +7,10 @@
         class="recordDialog"
     >
         <div>
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="历史病历" name="first">
+            <el-tabs v-model="activeName">
+                <!-- <el-tab-pane label="历史病历" name="first">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
-                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item" style="width:140px;"/>
+                        <el-input size="small" v-model.trim="search_input" class="filter-item" style="width:140px;"/>
                         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
                         <span>日期：</span>
                         <el-date-picker
@@ -31,7 +31,7 @@
                     <el-table :data="tableData" border height="300" :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="60" label="序号"></el-table-column>
                         <el-table-column align="center" prop="name" label="病历编号">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.id }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="名称">
                             <template slot-scope="scope">{{ scope.row.date }}</template>
@@ -52,48 +52,50 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                </el-tab-pane>
-                <el-tab-pane label="病历模板" name="second">
+                </el-tab-pane> -->
+                <el-tab-pane label="病历模板" name="first">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
-                        <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item" style="width:140px;"/>
-                        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                        <el-input size="small"  v-model.trim="search_input" class="filter-item" style="width:140px;"/>
+                        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary"  @click="searchAction">搜索</el-button>
                         <span>日期：</span>
                         <el-date-picker
                         size="small"
                         style="width:140px;margin:0 10px;"
-                        v-model="value1"
+                        v-model="start_time"
                         type="date"
-                        placeholder="选择日期">
+                        placeholder="选择日期"
+                        @change="changeStarTime">
                         </el-date-picker>
                         <el-date-picker
                         style="width:140px;"
                         size="small"
-                        v-model="value1"
+                        v-model="end_time"
                         type="date"
-                        placeholder="选择日期">
+                        placeholder="选择日期"
+                        @change="changeEndTime">
                         </el-date-picker>
                     </div>
-                    <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                    <el-table :data="tempalateData" border height="300" :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="60" label="序号"></el-table-column>
                         <el-table-column align="center" prop="name" label="病历编号">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.id }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="名称">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.template_name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="创建人">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.user_name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="创建日期">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.record_date }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="模板说明">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
+                            <template slot-scope="scope">{{ scope.row.template_remark }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width='200'>
                             <template slot-scope="scope">
-                                <el-button type="primary" size="mini">调用</el-button>
-                                <el-button type="primary" size="mini" @click="totemplateDetail">详情</el-button>
+                                <el-button type="primary" size="mini" @click="totemplateDetailTwo(scope.row.id)">调用</el-button>
+                                <el-button type="primary" size="mini" @click="totemplateDetail(scope.row.id)">详情</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -104,7 +106,7 @@
         <record-template-detail ref="recordTemplateDetail"></record-template-detail>
         <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>
@@ -112,6 +114,7 @@
 <script>
 import recordHistoryDetail from './recordHistoryDetail'
 import recordTemplateDetail from './recordTemplateDetail'
+import { getHistoryTemplate } from "@/api/project/project"
 export default {
     components:{
         recordHistoryDetail,
@@ -119,29 +122,17 @@ export default {
     },
     data(){
         return{
-          submitLoading:false,
             visible:false,
             activeName:'first',
             form:{
                 name:''
             },
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
+            tempalateData:[],
+            value1:"",
+            search_input:"",
+            start_time:"",
+            end_time:"",
         }
     },
     methods:{
@@ -165,9 +156,43 @@ export default {
         toHistoryDetail(){
             this.$refs.recordHistoryDetail.show()
         },
-        totemplateDetail(){
-            this.$refs.recordTemplateDetail.show()
+        totemplateDetail(id){
+            this.$refs.recordTemplateDetail.show(id)
+        },
+        totemplateDetailTwo(id){
+         this.$emit('func',id)
+         this.visible = false
+        },
+        //获取历史数据历史模板
+        getlist(){
+            const params = {
+               keyword:this.search_input,
+               start_time:this.start_time,
+               end_time:this.end_time
+            }
+          getHistoryTemplate(params).then(response=>{
+            if(response.data.state == 1){
+              var template =  response.data.data.template
+              console.log("templagte",template)
+              this.tempalateData = template
+              var history =  response.data.data.history
+              console.log("history",history)
+              this.tableData = history
+            }
+          })
+        },
+        searchAction(){
+          this.getlist()
+        },
+        changeStarTime(){
+           this.getlist()
+        },
+        changeEndTime(){
+          this.getlist()
         }
+    },
+    created(){
+       this.getlist()
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/recordHistoryDetail.vue

@@ -52,7 +52,7 @@
         </div>
         <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/recordTemplateDetail.vue

@@ -7,19 +7,19 @@
         class="recordDialog"
         append-to-body
     >
-        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
+        <el-form class="recordForm" :model="form" ref="form" label-width="80px">
             <el-form-item label="模板名称: " prop="name" style="width:100%;">
-                <el-input v-model="form.name" placeholder=""></el-input>
+                <el-input v-model="form.template_name" placeholder=""></el-input>
             </el-form-item>
             <el-form-item label="模板说明: " prop="name" style="width:100%;">
-                <el-input v-model="form.name" placeholder=""></el-input>
+                <el-input v-model="form.template_remark" placeholder=""></el-input>
             </el-form-item>
             <el-form-item label="主诉:" prop="name" style="width:100%;">
                 <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.chief_conplaint">
                 </el-input>
             </el-form-item>
             <el-form-item label="现病史:" prop="name" style="width:100%;">
@@ -27,7 +27,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.history_of_present_illness">
                 </el-input>
             </el-form-item>
             <el-form-item label="既往史:" prop="name" style="width:100%;">
@@ -35,7 +35,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.past_history">
                 </el-input>
             </el-form-item>
             <el-form-item label="个人史:" prop="name" style="width:100%;">
@@ -43,7 +43,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.personal_history">
                 </el-input>
             </el-form-item>
             <el-form-item label="家族史:" prop="name" style="width:100%;">
@@ -51,7 +51,7 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.family_history">
                 </el-input>
             </el-form-item>
             <el-form-item label="诊断信息:" prop="name" style="width:100%;">
@@ -59,25 +59,36 @@
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="form.diagnostic">
                 </el-input>
             </el-form-item>
         </el-form>
         <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>
 
 <script>
+import { getTemplateDetail,updateRecordTemplate } from "@/api/project/project"
 export default {
     data(){
         return{
             visible:false,
             form:{
-                name:''
+              id:0,
+              template_name:'',
+              template_remark:"",
+              chief_conplaint:"",
+              history_of_present_illness:"",
+              past_history:"",
+              personal_history:"",
+              family_history:"",
+              diagnostic:""
             },
+            textarea:"",
+            templatedetail:{}
         }
     },
     methods:{
@@ -90,14 +101,54 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show() {
-            // this.clear()
-            this.visible = true
+        show(id) {
+          this.getTemplateDetail(id)
+          this.visible = true
+          
         },
         hide() {
             // this.clear()
             this.visible = false
         },
+        getTemplateDetail(id){
+          getTemplateDetail(id).then(response=>{
+              if(response.data.state == 1){  
+                var templatedetail =  response.data.data.templateDetail
+                console.log("templatedetail",templatedetail)
+                this.form.id = templatedetail.id
+                this.form.template_name =   templatedetail.template_name 
+                this.form.template_remark = templatedetail.template_remark 
+                this.form.chief_conplaint =  templatedetail.chief_conplaint 
+                this.form.history_of_present_illness =  templatedetail.history_of_present_illness 
+                this.form.past_history =  templatedetail.past_history 
+                this.form.personal_history =    templatedetail.personal_history 
+                this.form.family_history = templatedetail.family_history 
+                this.form.diagnostic = templatedetail.diagnostic 
+               
+              }
+          })
+        },
+        submitAction(){
+          var params = {
+            id:this.form.id,
+            template_name:this.form.template_name,
+            template_remark:this.form.template_remark,
+            chief_conplaint:this.form.chief_conplaint,
+            history_of_present_illness:this.form.history_of_present_illness,
+            past_history:this.form.past_history,
+            personal_history:this.form.personal_history,
+            family_history:this.form.family_history,
+            diagnostic:this.form.diagnostic
+          }  
+          updateRecordTemplate(params).then(response=>{
+             if(response.data.state == 1){
+                var template =  response.data.data.templateDetail
+                this.$message.success("保存成功")
+                this.visible = false
+                this.$parents.getlist()
+             }
+          }) 
+        }
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/saveRecordTemplate.vue

@@ -6,35 +6,39 @@
         :before-close="_close"
         class="recordDialog"
     >
-        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
-            <el-form-item label="模板类别:" prop="name" style="width:100%;">
-                <el-radio v-model="radio" label="1">私人模板</el-radio>
-                <el-radio v-model="radio" label="2">公共模板</el-radio>
-            </el-form-item>
+        <el-form class="recordForm" :model="form"  ref="form" label-width="80px">
+            <!-- <el-form-item label="模板类别:" prop="name" style="width:100%;">
+                <el-radio v-model="mode_type" label="1">私人模板</el-radio>
+                <el-radio v-model="mode_type" label="2">公共模板</el-radio>
+            </el-form-item> -->
             <el-form-item label="模板名称: " prop="name" style="width:100%;">
-                <el-input v-model="form.name" placeholder=""></el-input>
+                <el-input v-model="form.template_name" placeholder=""></el-input>
             </el-form-item>
             <el-form-item label="模板说明:" prop="name" style="width:100%;">
                 <el-input
                 type="textarea"
                 :rows="2"
                 placeholder="请输入内容"
-                v-model="textarea">
+                v-model="template_remark">
                 </el-input>
             </el-form-item>
             <el-form-item label="创建人:" prop="name" style="width:49%;">
+                <span>{{user_name}}</span>
             </el-form-item>
             <el-form-item label="创建时间:" prop="name" style="width:49%;">
+                {{start_time}}
             </el-form-item>
         </el-form>
         <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>
 
 <script>
+const moment = require('moment')
+import { SaveHisPatientCaseHistoryTemplate } from "@/api/project/project"
 export default {
     data(){
         return{
@@ -42,8 +46,22 @@ export default {
             form:{
                 name:''
             },
+            mode_type:"1",
+            textarea:"",
+            chief_conplain:"",
+            past_history:"",
+            history_of_present_illness:"",
+            personal_history:"",
+            family_history:"",
+            diagnostic:"",
+            mode_type:"",
+            start_time:"",
+            user_name:"",
+            template_name:"",
+            template_remark:""
         }
-    },
+     },
+    
     methods:{
         _close: function(done) {
             // this.clear()
@@ -54,14 +72,46 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show() {
-            // this.clear()
-            this.visible = true
+        show(obj) {
+         console.log("obj",obj)
+         this.chief_conplain= obj.chief_conplain
+         this.past_history = obj.past_history
+         this.history_of_present_illness = obj.history_of_present_illness
+         this.personal_history = obj.personal_history
+         this.family_history = obj.family_history
+         this.diagnostic = obj.diagnostic
+         this.visible = true
         },
         hide() {
             // this.clear()
             this.visible = false
         },
+
+        submitAction(){
+          var params = {
+             template_name:this.template_name,
+             template_remark:this.template_remark,
+             user_name:this.user_name,
+             record_date:this.start_time,
+             chief_conplain:this.chief_conplain,
+             past_history:this.past_history,
+             history_of_present_illness:this.history_of_present_illness,
+             personal_history:this.personal_history,
+             family_history:this.family_history,
+             diagnostic:this.diagnostic,
+            }
+            console.log("params",params)
+          SaveHisPatientCaseHistoryTemplate(params).then(response=>{
+              if(response.data.state == 1){
+                 this.$message.success("保存成功")
+                 this.visible = false
+              }
+          })   
+        }
+    },
+    created(){
+      this.start_time = moment().format("YYYY-MM-DD HH:mm:ss")
+      this.user_name = this.$store.getters.xt_user.user.user_name
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -46,7 +46,7 @@
         </div>
         <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/selectTemplate.vue

@@ -43,7 +43,7 @@
         </div>
         <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/doctorDesk.vue

@@ -51,10 +51,10 @@
             <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
-            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
-            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
-            <el-button size="small" @click="open(3)" type="primary">病历调用</el-button>
-            <el-button size="small" @click="open(4)" type="primary">存模板</el-button>
+            <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>
+            <el-button size="small" @click="opentwo(4)" type="primary">存模板</el-button>
           </div>
         </div>
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
@@ -64,7 +64,11 @@
                            :hisPatientInfo="hisPatientInfo"
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo" v-if="titleType == '病历'"></desk-record>
+                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '病历'"  ref="child"></desk-record>
+                    
+        <!-- <medicalRecord ref='medicalRecord'  @func="getMsgFormSon"></medicalRecord> -->
+         <medicalRecord ref='medicalRecord' ></medicalRecord>
+       <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
 
     </div>
@@ -75,16 +79,19 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import deskPrescription from './components/deskPrescription'
   import deskRecord from './components/deskRecord'
-  import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList,createCaseHistory } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
-
+  import medicalRecord from './components/medicalRecord'
+  import saveRecordTemplate from './components/saveRecordTemplate'
   import { uParseTime } from '@/utils/tools'
 
   export default {
     components: {
       BreadCrumb,
       deskPrescription,
-      deskRecord
+      deskRecord,
+      medicalRecord,
+      saveRecordTemplate
     },
     data() {
       return {
@@ -178,7 +185,7 @@
             console.log("999888811111")
 
             this.prescriptions = []
-            this.$refs.prescriptions.clearData()
+            // this.$refs.prescriptions.clearData()
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
@@ -299,13 +306,75 @@
         //     psn_name:"杨美英",
         //     age:60.7
         // }
-      }
+      },
+      opentwo(index) {
+        console.log("index===",index)
+        if (index == 1) {
+          if(this.patientInfo.id == undefined){
+            this.$message.error("请先选择病人")
+            return
+          }
+          this.$refs.child.createCaseHistory()
+          // if(this.case_history.is_infect == true){
+          //   this.case_history.is_infect = 1
+          // }
+          // if(this.case_history.is_infect == false){
+          //    this.case_history.is_infect = 2
+          // }
+          // let params = {
+          //   "his_patient_id":this.hisPatientInfo.id,
+          //   "delivery_way":this.delivery_way?"":0,
+          //   "patient_id":this.patientInfo.id,
+          //   "temperature":this.case_history.temperature,
+          //   "blood_sugar":this.case_history.blood_sugar,
+          //   "pulse":this.case_history.pulse,
+          //   "sbp":this.case_history.sbp,
+          //   "dbp":this.case_history.dbp,
+          //   "blood_fat":this.case_history.blood_fat,
+          //   "height":this.case_history.height,
+          //   "sick_type":this.case_history.sick_type,
+          //   "symptom":this.case_history.symptom,
+          //   "sick_date":this.start_time,
+          //   "is_infect":this.case_history.is_infect,
+          //   "chief_conplaint":this.case_history.chief_conplaint,
+          //   "history_of_present_illness":this.case_history.history_of_present_illness,
+          //   "past_history":this.case_history.past_history,
+          //   "personal_history":this.case_history.personal_history,
+          //   "family_history":this.case_history.family_history,
+          //   "record_date":this.record_date,
+          //   "diagnostic":this.case_history.diagnostic,
+          //   "breathing":this.case_history.breathing,
+          //   // "doctor_advice":this.doctor_advice,
+          //   // "remark":this.remark
+          //   "doctor_advice":this.$ref.doctor_advice,
+          //   // "remark":this.remark
+          // }
+          // console.log("params",params)
+          // return
+          // createCaseHistory(params).then(response => {
+          //   if (response.data.state == 0) {
+          //     this.$message.error("患者病历已存在")
+          //     return false
+          //   } else {
+          //     this.$message.success("保存成功")
+          //   }
+          // })
+        } else if (index == 2) {
+          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
+        } else if (index == 3) {
+          this.$refs.medicalRecord.show()
+        } else if (index == 4) {
+          this.$refs.saveRecordTemplate.show(this.case_history)
+        }
+
+      },
       // changePatient(val){
       //   console.log("患者val",val)
       //   this.hisPatientInfo = val.hisPatientInfo
       //   console.log("333333",this.hisPatientInfo)
       // }
-    }, created() {
+    }, 
+    created() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -4,7 +4,6 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
        <template>
         <el-button
-          :loading="loading"
           size="small"
           icon="el-icon-printer"
           @click="printThisPage"
@@ -17,25 +16,25 @@
         <el-container class="newContainer">
             <div style="width:270px;margin-right:20px;">
                 <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
+                    <el-button size="small" class="filter-item" type="primary" :model="keyword" @click="searchAction">搜索</el-button>
                 </div>
-                <el-table ref="tab" @row-click="changePatient" highlight-current-row :data="tableData" height="480" border style="width: 100%">
+                <el-table ref="tab" @row-click="changePatient" highlight-current-row :data="patientTableData" height="480" border style="width: 100%">
                     <el-table-column prop="date"  label="患者">
                         <template slot-scope="scope">
-                            {{ scope.row.patient.name }}
+                            {{scope.row.patients.name?scope.row.patients.name:''}}
                         </template>
                     </el-table-column>
-                    <el-table-column prop="name" label="透析号">
+                    <el-table-column prop="name" label="就诊号">
                         <template slot-scope="scope">
-                            {{ scope.row.patient.dialysis_no }}
+                           {{ scope.row.his_patient.number ?scope.row.his_patient.number:''}}
                         </template>
                     </el-table-column>
                 </el-table>
             </div>
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
-              <printOne v-bind:childResponse="childResponse"></printOne>
+              <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>
             </div>
         </el-container>
     </div>
@@ -44,17 +43,13 @@
 
 <script>
 
-import {
-  getDialysisRecordInitData,
-  getDialysisSchedules
-} from "@/api/dialysis_record";
 import { parseTime } from "@/utils";
-import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
-// import LabelBox from "./printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
+import { getSchedulePatientList } from '@/api/his/his'
+import { getPatientCaseHistory } from "@/api/project/project"
 import printOne from "./recordTemplate/printOne"
 export default {
   name: "dialysisPrintOrder",
@@ -69,6 +64,13 @@ export default {
         { path: false, name: "打印单" }
       ],
       childResponse: {},
+      patientTableData: [],
+      search_input:"",
+      patient:{},
+      hispatient:{},
+      educationOptions:[],
+      history:{},
+      keyword:""
     };
   },
   methods: {
@@ -106,46 +108,88 @@ export default {
         style: style,
         scanStyles: false
       });
+    },
+
+     //患者列表
+      getPatientList(){
+        
+         let params = {
+           'record_date':this.$route.query.record,
+        }
+     
+      getSchedulePatientList(params).then(response => {
+         if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+         } else {
+            this.patientTableData = []
+            console.log("list0000000",response.data.data.list)
+            // for (let i = 0; i < response.data.data.list.length; i++) {
+            //   if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+            //      this.patientTableData.push(response.data.data.list[i])
+            //     }
+            //   }
+              this.patientTableData = response.data.data.list
+             }  
+          })
+      },
+
+    changePatient(val){
 
-      // if (this.org_template_info.template_id == 1) {
-      //   printJS({
-      //     printable: "dialysis-print-box",
-      //     type: "html",
-      //     style: style,
-      //     scanStyles: false
-      //   });
-      // }
+        const params = {
+          patient_id:val.patient_id
+        }
+        console.log("params",params)
+      getPatientCaseHistory(params).then(response=>{
+         if(response.data.state == 1){
+           var patient = response.data.data.patient
+           console.log("patinet",patient)
+           this.patient = patient
+           var history = response.data.data.history
+           console.log("history",history)
+           this.history = history
+           var hispatient = response.data.data.hispatient
+           console.log("hispatient",hispatient)
+           this.hispatient = hispatient
+         }
+      })
+    },
+    searchAction(){
+      this.getPatientList()
     },
+    
   },
   created() {
+    this.getPatientList() 
+   
   },
-  computed:{
-    filtedSchedules: function() {
-      var search_keyword = this.search_keyword
-      if (search_keyword.length > 0) {
-        var schedules = []
-        for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
-        const scheduleInfo = this.zone_schedules[o_i]
-        var originSchedules = scheduleInfo.schedules
-        if (originSchedules.length == 0) {
-            continue
-        }
-        var filtedSchedules = []
-        for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-            const schedule = originSchedules[s_i]
-            if (schedule.patient.name.indexOf(search_keyword) != -1) {
-            filtedSchedules.push(schedule)
-            // break
-            }
-        }
-        if (filtedSchedules.length > 0) {
-            schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
-        }
-        }
-        return schedules
-      }
-    }
-  },
+  // computed:{
+  //   filtedSchedules: function() {
+  //     var search_keyword = this.search_keyword
+  //     if (search_keyword.length > 0) {
+  //       var schedules = []
+  //       for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
+  //       const scheduleInfo = this.zone_schedules[o_i]
+  //       var originSchedules = scheduleInfo.schedules
+  //       if (originSchedules.length == 0) {
+  //           continue
+  //       }
+  //       var filtedSchedules = []
+  //       for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+  //           const schedule = originSchedules[s_i]
+  //           if (schedule.patient.name.indexOf(search_keyword) != -1) {
+  //           filtedSchedules.push(schedule)
+  //           // break
+  //           }
+  //       }
+  //       if (filtedSchedules.length > 0) {
+  //           schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
+  //       }
+  //       }
+  //       return schedules
+  //     }
+  //   }
+  // },
 };
 </script>
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -2,86 +2,148 @@
     <div id='prescription-print' class="prescription-print">
         <div class="printTitle">门诊病历</div>
         <div class="infoTitle">
-            <p>姓名：阿萨德</p>
-            <p>性别：男</p>
-            <p>年龄：12岁</p>
+            <p>姓名：{{patient.name}}</p>
+            <p>性别：
+                <span v-if="patient.gender == 1">男</span>
+                <span v-if="patient.gender == 2">女</span>
+            </p>
+            <p>年龄：{{patient.age}}岁</p>
         </div>
         <div class="infoTitle">
-            <p>婚姻状况：婚姻状况保密</p>
-            <p>职业：未分类</p>
+            <p>婚姻状况：
+              <span v-if="patient.marital_status == 1">已婚 </span>
+              <span v-if="patient.marital_status == 2">未婚 </span>
+            </p>
+            <p>职业：{{getProfession(patient.profession)}}</p>
         </div>
         <div class="otherInfo">
             <p>医保号：</p>
-            <p style="flex:1;">7938749234</p>
+            <p style="flex:1;">{{patient.health_care_no}}</p>
         </div>
         <div class="otherInfo">
             <p>联系电话：</p>
-            <p style="flex:1;">23234343234</p>
+            <p style="flex:1;">{{patient.phone}}</p>
         </div>
         <div class="otherInfo">
             <p>通讯地址：</p>
-            <p style="flex:1;">奥数都我阿苏do一按实际的福克斯</p>
+            <p style="flex:1;">{{patient.home_address}}</p>
         </div>
         <div class="otherInfo">
             <p>药物过敏史：</p>
-            <p style="flex:1;">奥数都我阿苏do一按实际的福克斯</p>
+            <p style="flex:1;">{{patient.past_history}}</p>
         </div>
         <div class="otherInfo">
             <p>病历编号：</p>
-            <p style="flex:1;">2020110300002525</p>
+            <p style="flex:1;">{{patient.id}}</p>
         </div>
         <div style="page-break-after:always;margin-top:50px;"></div>
 
 
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
-            <p>科别：全科</p>
-            <p>姓名：阿萨德</p>
-            <p>性别：男</p>
-            <p>年龄：12岁</p>
+            <p>科别：{{hispatient.departments}}</p>
+            <p>姓名：{{hispatient.name}}</p>
+            <p>性别：
+                <span v-if="hispatient.gender == 1">男</span>
+                <span v-if="hispatient.gender == 2">女</span>
+            </p>
+            <p>年龄：{{hispatient.age}}岁</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">主诉：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.chief_conplaint}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">现病史：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.history_of_present_illness}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">既往史：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.past_history}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">药物过敏史：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.past_history}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">个人史：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.personal_history}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">家族史：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.family_history}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">体格检查：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">无</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">门诊诊断：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;">{{history.diagnostic}}</p>
         </div>
         <div class="otherInfo">
             <p class="otherName">门诊医嘱：</p>
-            <p style="flex:1;">爱神的箭了卡萨建档立卡加上来得及阿斯利康的</p>
+            <p style="flex:1;"></p>
         </div>
         <div style="margin-top:20px;text-align:right;">
-            医生签名：阿斯加德
+            医生签名：{{getDoctor(history.doctor)}}
         </div>
     </div>
 </template>
+<script>
+import { getDataConfig } from "@/utils/data";
+import { getAllDoctorList } from "@/api/project/project"
+export default {
+    props:{
+      patient:Object,
+      hispatient:Object,
+      history:Object,
+    },
+    return:{
+      educationOptions:[]
+    },
+    data(){
 
+    },
+    methods:{
+      getProfession(id){
+        var name = ""
+        for(let i=0;i<this.educationOptions.length;i++){
+           if(id == this.educationOptions[i].id){
+              name = this.educationOptions[i].name
+           }
+        }
+        return name
+      },
+      getAllDoctorList(){
+           getAllDoctorList().then(response=>{
+             if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+
+               this.doctorList = doctor
+            //    var department = response.data.data.department
+            //    console.log("department",department)
+            //    this.departmentList = department
+             }
+           })   
+       },
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      }
+    },
+    created(){
+      this.educationOptions = getDataConfig("patient", "education_types");
+      console.log("22222",this.educationOptions)
+      this.getAllDoctorList()
+    }
+}
+</script>
 
 
 <style lang="scss" scoped>

src/xt_pages/outpatientRegistration/index.vue

@@ -6,7 +6,7 @@
         <div class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" :model="form" :rules="rules" ref="form"  label-width="100px">
+                <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
                     <el-form-item label="结算类型：">
                         <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
@@ -64,16 +64,13 @@
                     </el-form-item>
                     <el-form-item label="证件号码：" required prop="idCard">
                         <el-input v-model="form.idCard"></el-input>
-                        <!-- <div class="el-form-item__error" v-show="show">
-                          请填写证件号码
-                        </div> -->
                     </el-form-item>
    
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" :model="form" :rules="rules" label-width="100px">
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
                     <el-form-item label="挂号类型："  prop="register">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
@@ -248,7 +245,7 @@ export default {
             },
 
             rules: {
-              idCard: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
+              idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
@@ -361,6 +358,9 @@ export default {
            })   
         },
         saveHisPatient(formName){   
+           if(this.form.idCard == ""){
+             this.$message.error("证件号码不能为空")
+           }
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){
@@ -405,7 +405,7 @@ export default {
                      this.form.medicalCare = "",
                      this.form.birthday ="",
                      this.form.age ="",
-                     this.form.idCard = "",
+                    //  this.form.idCard = "",
                      this.form.register = "",
                      this.form.doctor = "",
                      this.form.department = "",

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -88,7 +88,7 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)" >退号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
                     </template>
@@ -206,12 +206,14 @@ export default {
         // },
         changeStart(val){
           this.start_time = val
+          this.getlist()
         },
         changeEnd(val){
-           this.end_time = val
+          this.end_time = val
+          this.getlist()
         },
         changeRegister(val){
-
+          this.getlist()
         },
        handleSizeChange(val) {
           this.limit = val