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

@@ -0,0 +1,81 @@
+import request from "@/utils/request";
+
+
+
+export function getSchedulePatientList(params) {
+  return request({
+    url: "/api/hispatient/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPatientInfo(params) {
+  return request({
+    url: "/api/hispatient/get",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function createCaseHistory(params) {
+  return request({
+    url: "/api/doctorworkstation/casehistory/create",
+    method: "post",
+    params:params
+  });
+}
+
+
+
+
+
+
+
+export function getInitData(params) {
+  return request({
+    url: "/api/hisprescription/config",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getDoctors() {
+  return request({
+    url: "/api/admin/get",
+    method: "get",
+  });
+}
+
+
+
+export function createHisPrescription(data, params) {
+  return request({
+    url: "/api/hisprescription/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+
+
+
+// export function createCaseHistory(params) {
+//   return request({
+//     url: "/api/doctorworkstation/casehistory/create",
+//     method: "post",
+//     params:params
+//   });
+// }
+
+
+
+
+
+

src/api/patient.js

@@ -373,7 +373,7 @@ export function modifyDryWeightData(params) {
 }
 
 export function deleteDryWeight(id, data) {
-  console.log('id', id)
+ 
   return request({
     url: '/api/patient/deletedryweight?id=' + id,
     method: 'delete',

src/api/project/project.js

@@ -160,4 +160,114 @@ export function saveCharges(data){
        method:"post",
        data:data
     })
-}
+}
+
+
+export function getAllProjectList(params){
+    return request({
+       url:"/api/his/getallprojectlist",
+       methods:"get",
+       params:params
+    })
+}
+
+export function addProjectList(params){
+  
+    return request({
+       url:"/api/his/addprojectlist",
+       methods:"get",
+       params:params
+    })
+}
+
+export function getPatientInformation(id,params){
+   
+   return request({
+     url:"/api/his/getpatientinformation?id="+id,
+     methods:"Get",
+     params:params
+   })
+}
+
+export function DeleteProject(id,params){
+   
+    return request({
+       url:"/api/his/deleteproject?id="+id,
+       methods:"Get",
+       params:params
+    })
+}
+
+
+export function getHisProject(params){
+  
+    return request({
+       url:"/api/his/gethisproject",
+       methods:"get",
+       params:params
+    })
+}
+
+export function addProjectTeam(params){
+   
+  return request({
+      url:"/api/his/getprojectteam",
+      methods:"Get",
+      params:params
+  })
+}
+
+export function getAllDoctorList(params){
+   
+  return request({
+      url:"/api/his/getalldoctorlist",
+      methods:"Get",
+      params:params
+  })
+} 
+
+export function saveHisPatient(params){
+   
+    return request({
+        url:"/api/his/savehispatient",
+        methods:"get",
+        params:params
+    })
+}
+
+export function getAllProjectTeam(params){
+  
+  return request({
+     url:"/api/hist/getallprojecteam",
+     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
+    })
+}
+
+
+export function changePatient(id,params){
+   
+    return request({
+      url:"/api/patient/changepatient?id="+id,
+      method:"get",
+      params:params
+    })
+  }

src/xt_pages/data/components/addInspection.vue

@@ -43,6 +43,60 @@
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
+  
+                 <el-form-item label="组套明细" style="width:50%;">
+                    <el-select v-model="form.project_detail" placeholder="请选择">
+                        <el-option
+                        v-for="item in projectList"
+                        :key="item.id"
+                        :label="item.project_name"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
+
+                    </el-form-item>
+                 <el-form-item label="数量" style="width:50%;"> 
+                      <div style="display:flex;"> 
+                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                         <el-button type="primary" @click="addProjectList">添加</el-button>
+                      </div>
+                  </el-form-item>
+            </el-form>
+            <el-form>
+                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                    <el-table-column align="center" prop="name" label="分类" width="120">
+                        <template slot-scope="scope">{{getId(scope.row.cost_classify)}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="组套明细" width="120">
+                        <template slot-scope="scope">{{scope.row.project_name}}</template>
+                    </el-table-column>
+                     <el-table-column align="center" prop="name" label="数量" width="120">
+                        <template slot-scope="scope">{{scope.row.number}}</template>
+                    </el-table-column>
+                     <el-table-column align="center" prop="name" label="单位" width="120">
+                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="单价" width="120">
+                        <template slot-scope="scope">{{scope.row.price}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="操作">
+                        <template slot-scope="scope">
+                          <el-tooltip
+                            class="item"
+                            effect="dark"
+                            content="删除"
+                            placement="top"
+                            >
+                            <el-button
+                                type="danger"
+                                icon="el-icon-delete"
+                                size="small"
+                                @click="DeleteProject(scope.row.id,scope.$index)"
+                            ></el-button>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
+                </el-table>
             </el-form>
         </div>
 
@@ -56,7 +110,7 @@
 
 <script>
 import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { saveProjectTeam } from "@/api/project/project"
+import { saveProjectTeam,getAllProjectList,addProjectList,DeleteProject } from "@/api/project/project"
 export default {
     data(){
         return{
@@ -70,7 +124,9 @@ export default {
               wubi:"",
               tube_color:"",
               team_type:"",
-              remark:""
+              remark:"",
+              project_detail:"",
+              number:""
             },
             options: [
             {value: 1,label: '是'},
@@ -84,7 +140,9 @@ export default {
               wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           }
+           },
+           tableData:[],
+           projectList:[]
         }
     },
     methods:{
@@ -110,23 +168,30 @@ export default {
          this.visible = false
         },
         submitAction(formName){
+          
            this.$refs[formName].validate((valid)=>{
-               var params = {
+                var arr = []
+                for(let i=0;i<this.tableData.length;i++){
+                    arr.push(this.tableData[i].id)
+                }
+                console.log("arr",arr)
+                var ids = arr.join(",")
+                var params = {
                  project_team:this.form.project_team,
                  price:this.form.price,
                  pinyin:this.form.pinyin,
                  wubi:this.form.wubi,
                  tube_color:this.form.tube_color,
                  team_type:this.form.team_type,
-                 remark:this.form.remark
+                 remark:this.form.remark,
+                 ids:ids,
                }
                console.log("params",params)
               saveProjectTeam(params).then(response=>{
                  if(response.data.state == 1){
                    var projectTeam = response.data.data.projectTeam
                    console.log("projectTeam",projectTeam)
-                   this.$message.success("保存成功")
-                  
+                   this.$message.success("保存成功")  
                    this.visible = false
                    this.form.project_team = "",
                    this.form.price = "",
@@ -136,10 +201,72 @@ export default {
                    this.form.team_type = "",
                    this.form.remark = ""
                    this.$parent.getlist()
+                 }else{
+                    this.$message.error("项目组套名称已存在!")
                  }
               }) 
            })
+        },
+        getlist(){
+          getAllProjectList().then(response=>{
+             if(response.data.state == 1){
+               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
+             }
+          })   
+        },
+        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') 
+          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
+        },
+        DeleteProject(id,index){
+           this.$confirm("确认删除此项目吗?", "删除", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning"
+         }).then(() => {
+          DeleteProject(id).then(response => {
+            if (response.data.state == 1) {
+               this.tableData.splice(index, 1);
+            } else {
+             
+            }
+          });
+        })
+        .catch(() => {});
         }
+    },
+    created(){
+      //获取所以的项目
+      this.getlist()
+   
     }
 }
 </script>

src/xt_pages/data/components/addProject.vue

@@ -104,6 +104,21 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item label="单次用量 : " prop="medical_code">
+                            <el-input v-model="form.single_dose" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="用法 : " prop="medical_code">
+                            <el-input v-model="form.delivery_way" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="频率 : " prop="medical_code">
+                            <el-input v-model="form.execution_frequency" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="天数 : " prop="medical_code">
+                            <el-input v-model="form.number_days" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="总量 : " prop="medical_code">
+                            <el-input v-model="form.total" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
                         <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
                             <el-radio-group v-model="form.medical_status">
                                 <el-radio :label="1">停用</el-radio>
@@ -233,6 +248,11 @@ export default {
               is_workload:"",
               sort:"",
               is_advice:"",
+              single_dose:"",
+              delivery_way:"",
+              execution_frequency:"",
+              number_days:"",
+              total:""
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -300,7 +320,12 @@ export default {
                     is_workload:this.form.is_workload,
                     sort:this.form.sort,
                     is_advice:this.form.is_advice,
-                    is_default:this.form.is_default
+                    is_default:this.form.is_default,
+                    single_dose:this.form.single_dose,
+                    delivery_way:this.form.delivery_way,
+                    execution_frequency:this.form.execution_frequency,
+                    number_days:this.form.number_days,
+                    total:this.form.total,
                }
            
               saveProject(params).then(response=>{
@@ -332,6 +357,13 @@ export default {
                    this.form.sort = ""
                    this.form.is_advice = ""
                    this.form.is_default = ""
+                   this.form.single_dose = ""
+                   this.form.delivery_way = ""
+                   this.form.execution_frequency = ""
+                   this.form.number_days = ""
+                   this.form.total = ""
+                 }else {
+                    this.$message.error("项目名称已存在!")
                  }
               })
             }

src/xt_pages/data/components/editInspection.vue

@@ -43,6 +43,59 @@
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
+                 <el-form-item label="组套明细" style="width:50%;">
+                    <el-select v-model="form.project_detail" placeholder="请选择">
+                        <el-option
+                        v-for="item in projectList"
+                        :key="item.id"
+                        :label="item.project_name"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
+
+                    </el-form-item>
+                 <el-form-item label="数量" style="width:50%;"> 
+                      <div style="display:flex;"> 
+                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                         <el-button type="primary" @click="addProjectList">添加</el-button>
+                      </div>
+                  </el-form-item>
+            </el-form>
+            <el-form>
+                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                    <el-table-column align="center" prop="name" label="分类" width="120">
+                        <template slot-scope="scope">{{getId(scope.row.cost_classify)}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="组套明细" width="120">
+                        <template slot-scope="scope">{{scope.row.project_name}}</template>
+                    </el-table-column>
+                     <el-table-column align="center" prop="name" label="数量" width="120">
+                        <template slot-scope="scope">{{scope.row.number}}</template>
+                    </el-table-column>
+                     <el-table-column align="center" prop="name" label="单位" width="120">
+                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="单价" width="120">
+                        <template slot-scope="scope">{{scope.row.price}}</template>
+                    </el-table-column>
+                    <el-table-column align="center" prop="name" label="操作">
+                        <template slot-scope="scope">
+                          <el-tooltip
+                            class="item"
+                            effect="dark"
+                            content="删除"
+                            placement="top"
+                            >
+                            <el-button
+                                type="danger"
+                                icon="el-icon-delete"
+                                size="small"
+                                @click="DeleteProject(scope.row.id,scope.$index)"
+                            ></el-button>
+                            </el-tooltip>
+                        </template>
+                    </el-table-column>
+                </el-table>
             </el-form>
         </div>
 
@@ -55,7 +108,7 @@
 </template>
 
 <script>
-import { getProjectTeamDetail,updatedProjectTeam } from "@/api/project/project"
+import { getProjectTeamDetail,updatedProjectTeam,getAllProjectList,addProjectList,DeleteProject } from "@/api/project/project"
 import { getDictionaryDataConfig,getDataConfig} from "@/utils/data";
 export default {
     data(){
@@ -71,7 +124,9 @@ export default {
               wubi:"",
               tube_color:"",
               team_type:"",
-              remark:""
+              remark:"",
+              project_detail:"",
+              number:"",
             },
             options: [{
             value: 1,
@@ -88,7 +143,8 @@ export default {
               wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           }
+           },
+           tableData:[]
         }
     },
     methods:{
@@ -133,7 +189,13 @@ export default {
         },
         submitAction(formName){
            this.$refs[formName].validate((valid)=>{
-              if(valid){
+               var arr = []
+                for(let i=0;i<this.tableData.length;i++){
+                    arr.push(this.tableData[i].id)
+                }
+               console.log("arr",arr)
+               var ids = arr.join(",")
+               if(valid){
                 var params = {
                     id:this.form.id,
                     project_team:this.form.project_team,
@@ -142,8 +204,10 @@ export default {
                     wubi:this.form.wubi,
                     tube_color:this.form.tube_color,
                     team_type:this.form.team_type,
-                    remark:this.form.remark
+                    remark:this.form.remark,
+                    ids:ids,
                 }
+                console.log("params",params)
                  updatedProjectTeam(params).then(response=>{
                    if(response.data.state == 1){
                      var projectTeam = response.data.data.projectTeam
@@ -155,7 +219,65 @@ export default {
               }
            })  
         
+        },
+       getlist(){
+          getAllProjectList().then(response=>{
+             if(response.data.state == 1){
+               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
+             }
+          })   
+        },
+        getId(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
+        },
+       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()
+             }
+          })
+        },
+        DeleteProject(id,index){
+           this.$confirm("确认删除此项目吗?", "删除", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning"
+         }).then(() => {
+          DeleteProject(id).then(response => {
+            if (response.data.state == 1) {
+               this.tableData.splice(index, 1);
+            } else {
+             
+            }
+          });
+        })
+        .catch(() => {});
         }
+    },
+    created(){
+       this.getlist()   
     }
 }
 </script>

src/xt_pages/data/components/editProject.vue

@@ -103,6 +103,21 @@
                                 :value="item.id">
                                 </el-option>
                             </el-select>
+                        </el-form-item>
+                         <el-form-item label="单次用量 : " prop="medical_code">
+                            <el-input v-model="form.single_dose" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="用法 : " prop="medical_code">
+                            <el-input v-model="form.delivery_way" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="频率 : " prop="medical_code">
+                            <el-input v-model="form.execution_frequency" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="天数 : " prop="medical_code">
+                            <el-input v-model="form.number_days" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                        </el-form-item>
+                          <el-form-item label="总量 : " prop="medical_code">
+                            <el-input v-model="form.total" style="width:160px;" placeholder="" maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="状态 : " prop="medical_status" style="width:100%;">
                             <el-radio-group v-model="form.medical_status">
@@ -113,6 +128,8 @@
                         <el-form-item label="备注 : " prop="remark" style="width:100%;">
                             <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                         </el-form-item>
+
+                        
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -235,6 +252,11 @@ export default {
               is_workload:"",
               sort:"",
               is_advice:"",
+              single_dose:"",
+              delivery_way:"",
+              execution_frequency:"",
+              number_days:"",
+              total:""
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -302,6 +324,11 @@ export default {
               this.form.is_workload = projecDetail.is_workload
               this.form.sort = projecDetail.sort
               this.form.is_advice = projecDetail.doctor_advice
+              this.form.single_dose = projecDetail.single_dose
+              this.form.delivery_way = projecDetail.delivery_way
+              this.form.execution_frequency = projecDetail.execution_frequency
+              this.form.number_days = projecDetail.number_days
+              this.form.total = projecDetail.total
             }
          })
        },
@@ -334,7 +361,12 @@ export default {
                     is_workload:this.form.is_workload,
                     sort:this.form.sort,
                     is_advice:this.form.is_advice,
-                    is_default:this.form.is_default
+                    is_default:this.form.is_default,
+                    single_dose:this.form.single_dose,
+                    delivery_way:this.form.delivery_way,
+                    execution_frequency:this.form.execution_frequency,
+                    number_days:this.form.number_days,
+                    total:this.form.total,
                }
               
               updatedProject(params).then(response=>{

src/xt_pages/data/components/inspection.vue

@@ -4,15 +4,15 @@
             <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>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
+                <!-- <label class="title"><span class="name">是否启用</span> : </label> -->
+                <!-- <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
             </div>
             <el-button type="primary" @click="openForm(0)">新增</el-button>
         </div>
@@ -75,6 +75,7 @@
 <script>
 import addInspection from './addInspection'
 import editInspection from './editInspection'
+import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
 import { getProjectTeamList,DeleteProjectTeam } from "@/api/project/project"
 export default {
     components:{
@@ -100,6 +101,12 @@ export default {
         }
     },
     methods:{
+       getDataConfig(module, filed_name){
+         return getDataConfig(module, filed_name)
+       },
+        getDictionaryDataConfig(module, filed_name) {
+          return getDictionaryDataConfig(module, filed_name)
+       },
       handleSizeChange(val) {
         this.limit = val
         this.getlist()
@@ -123,6 +130,7 @@ export default {
         },
         getlist(){
             const params = {
+               keyword:this.search_input,
                limit:this.limit,
                page:this.page,
             }
@@ -154,7 +162,8 @@ export default {
         }
     },
     created(){
-       this.getlist()  
+       this.getlist() 
+      
     }
 }
 </script>

src/xt_pages/data/components/project.vue

@@ -3,9 +3,9 @@
         <div style="display:flex;justify-content: space-between;width:100%;margin-bottom:20px;">
             <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>
+                <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>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
+                <el-select v-model="is_start" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeStart">
                     <el-option
                     v-for="item in options"
                     :key="item.value"
@@ -14,9 +14,9 @@
                     </el-option>
                 </el-select>
                 <label class="title"><span class="name">是否收费</span> : </label>
-                <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
+                <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择">
                     <el-option
-                    v-for="item in options"
+                    v-for="item in optionOne"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
@@ -96,21 +96,29 @@ export default {
     data(){
         return{
             search_input:'',
-            options: [{
-            value: '1',
-            label: '是'
-            }, {
-            value: '2',
-            label: '否'
-            },],
+            options: [
+             {value:0,label:'全部'},
+             {value:1,label: '停用'},
+             {value:2,label: '收费'}
+            ],
+            optionOne:[
+              {value:0,label:'全部'},
+              {value:1,label:'是'},
+              {value:2,label:'否'}
+            ],
             value: '',
             limit:20,
             page:1,
             total:0,
-            tableData: []
+            tableData: [],
+            is_start:0,
+            is_charge:0
         }
     },
     methods:{
+        changeStart(id){
+          console.log("id",id)
+        },
         handleSizeChange(val) {
             this.limit = val
             this.getlist()
@@ -154,9 +162,13 @@ export default {
       
         getlist(){
             var params = {
+               keyword:this.search_input,
+               is_charge:this.is_charge,
+               is_start:this.is_start,
                limit:this.limit,
                page:this.page,
             }
+           console.log("222",params)
           getProjectList(params).then(response=>{
              if(response.data.state == 1){
                var projecList = response.data.data.projecList

src/xt_pages/data/specialDictionary.vue

@@ -1,4 +1,4 @@
-<template>
+ <template>
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>

src/xt_pages/outpatientCharges/components/additionalCharges.vue

@@ -39,8 +39,9 @@ export default {
                 name:''
             },
             tableData:[
-              {id:1,name:"zs",money:50},
-              {id:2,name:"ls",money:60}  
+              {id:1,name:"工本费",money:""},
+              {id:2,name:"挂号费",money:""},
+              {id:3,name:"诊疗费",money:""}  
             ],
             patient_id:0,
             chargeTable:[]

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -10,10 +10,10 @@
                     <p>已就诊：<span>0</span>人</p>
                 </div>
                 <div class="mainCell">
-                    <el-radio-group v-model="radio">
-                        <el-radio :label="1">未就诊</el-radio>
-                        <el-radio :label="2">已就诊</el-radio>
-                        <el-radio :label="3">全部</el-radio>
+                    <el-radio-group v-model="radio" @change="changeRadio">
+                        <el-radio :label=1>未就诊</el-radio>
+                        <el-radio :label=2>已就诊</el-radio>
+                        <el-radio :label=3>全部</el-radio>
                     </el-radio-group>
                 </div>
                 <div class="mainCell" style="margin-bottom:10px;">
@@ -21,12 +21,15 @@
                     <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
                 </div>
                 <div style="flex:1;overflow-y:auto;">
-                    <el-table :data="patientTableData" border @row-click='choosePatient' style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                    <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 ref="tab"
+                    @current-change="handleCurrentChange">
                         <el-table-column align="center" prop="name" label="患者姓名">
                             <template slot-scope="scope">{{ scope.row.name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="就诊号" width="90">
-                            <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
+                            <template slot-scope="scope">3222</template>
                         </el-table-column>
                     </el-table>
                 </div>
@@ -66,11 +69,11 @@
                     <div class="centerRight">
                         <p class="centerRightTitle">人员信息</p>
                         <div style="display:flex;justify-content: space-between;line-height:30px;">
-                            <span style="font-size:14px;">人员编码:{{ patientInfo.psn_no }}</span>
-                            <span style="font-size:14px;">日期:2020-11-13</span>
+                            <span style="font-size:14px;">人员编码:</span>
+                            <span style="font-size:14px;">日期:{{start_time}}</span>
                         </div>
                         <ul class="basicUl">
-                            <li style="width:50%;">姓名：{{ patientInfo.psn_name }}</li>
+                            <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
                             <li style="width:50%;">性别：{{ patientInfo && patientInfo.gend == 1 ? '男' : "女" }}</li>
                             <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
                             <li style="width:50%;">身高：</li>
@@ -107,6 +110,8 @@ import charged from './components/charged'
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import prescriptionTable from './components/prescriptionTable'
 import additionalCharges from './components/additionalCharges'
+import { getPatientList,getPatientInformation } from "@/api/project/project"
+const moment = require('moment')
 export default {
     components:{
         BreadCrumb,
@@ -122,67 +127,7 @@ export default {
                 { path: false, name: '门诊收费' },
                 { path: false, 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 弄'
-            },{
-            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 弄'
-            },{
-            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 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
+            tableData: [],
             editableTabsValue: '1',
             editableTabs: [{
             title: '处方1',
@@ -197,11 +142,17 @@ export default {
             patientInfo:{},
             doctor:{},
             total:0,
-            state:'未收费'
+            state:'未收费',
+            radio:1,
+            radioStatus:1,
+            search_input:"",
+            start_time:moment().locale('zh-cn').format('YYYY-MM-DD')
         }
     },
     created(){
-        
+       
+       //获取患者信息
+       this.getPatientList()
     },
     methods:{
         moreState(tab, event){
@@ -255,21 +206,72 @@ export default {
             this.preTableData.map(item => {
                 this.total += item.unitPrice
             })
-            this.patientInfo = {
-                certno:"440221195903290027",
-                psn_no:"0221201972",
-                gend:"2",
-                brdy:"1960-03-29",
-                naty:"01",
-                psn_cert_type:"01",
-                psn_name:"杨美英",
-                age:60.7
-            }
-            this.doctor = {
-                name:'刘志刚',
-                department:'血透中心',
-                total:20,
-            }
+            // this.patientInfo = {
+            //     certno:"440221195903290027",
+            //     psn_no:"0221201972",
+            //     gend:"2",
+            //     brdy:"1960-03-29",
+            //     naty:"01",
+            //     psn_cert_type:"01",
+            //     psn_name:"杨美英",
+            //     age:60.7
+            // }
+            // this.doctor = {
+            //     name:'刘志刚',
+            //     department:'血透中心',
+            //     total:20,
+            // }
+        },
+       changeRadio(id){ 
+         console.log(id)
+         this.radioStatus = id
+         this.getPatientList()
+       },
+
+        //患者列表
+        getPatientList(){
+           getPatientList().then(response=>{
+               if(response.data.state == 1){
+                 var hisPatient = response.data.data.hisPatient
+                 console.log("his",hisPatient)
+                 var scheduleList = response.data.data.scheduleList
+                 hisPatient.push(...scheduleList)
+                 console.log("arrr",hisPatient)
+                 var tabArr = this.unique(hisPatient)
+                 console.log("22222",tabArr)
+                 if(this.radioStatus == 1){
+                    this.tableData = tabArr
+                    this.$refs.tab.setCurrentRow(this.tableData[0])
+                 }
+                 if(this.radioStatus == 2){
+                    var prescription = response.data.data.prescription
+                    this.tableData = prescription
+                    this.$refs.tab.setCurrentRow(this.tableData[0])
+                 }
+                
+               }  
+           })
+        },
+
+        unique(arr) {
+            const res = new Map();
+            return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
+        },
+        handleCurrentChange(val){
+          console.log("val",val)
+          this.getPatientInformation(val.id)
+        },
+        
+        //获取患者的基本信息
+        getPatientInformation(id){
+            console.log(id)
+            getPatientInformation(id).then(response=>{
+               if(response.data.state == 1){
+                  var information = response.data.data.information
+                  console.log("information",information)
+                  this.patientInfo = information
+               }
+            })
         }
     }
 }

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -5,32 +5,45 @@
         :visible.sync="visible"
         :before-close="_close"
     >
-        <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" 
+        :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+          @selection-change="handleSelectionChange">
             <el-table-column align="center" type="selection" width="40"></el-table-column>
             <el-table-column align="center" prop="name" label="名称" width="100">
-                <template slot-scope="scope">{{ scope.row.date }}</template>
+                <template slot-scope="scope">{{ scope.row.name }}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="金额(元)">
                 <template slot-scope="scope">
-                    <el-input v-model="input" placeholder=""></el-input>
+                    <el-input v-model="scope.row.money" placeholder=""></el-input>
                 </template>
             </el-table-column>
         </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>
 
 <script>
+ import { saveCharges } from "@/api/project/project"
 export default {
+   props: {
+      hisPatientInfo: Object,
+      patientInfo:Object,
+    },
     data(){
         return{
             visible:false,
             form:{
                 name:''
             },
+            tableData:[
+              {id:1,name:"工本费",money:""},
+              {id:2,name:"挂号费",money:""},
+              {id:3,name:"诊疗费",money:""}  
+            ],
+            chargeTable:[]
         }
     },
     methods:{
@@ -51,6 +64,31 @@ export default {
             // this.clear()
             this.visible = false
         },
+        handleSelectionChange(val){
+          console.log("val",val)
+          this.chargeTable = val
+        },
+        submitAction(){
+          var params = {
+             his_patient_id:this.hisPatientInfo.id,
+             patient_id:this.patientInfo.id,
+             medicineData:this.chargeTable
+           }
+           console.log("params",params)
+          saveCharges(params).then(response=>{
+             if(response.data.state == 1){
+               var additionalCharge =  response.data.data.additionalCharge
+               console.log("additionalchar",additionalCharge)
+               this.visible = false
+               this.$message.success("保存成功")
+             }
+          })      
+        }
+    },
+    watch:{
+       hisPatientInfo:function(val){
+         console.log("患者ID",this)  
+       }
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -1,245 +1,327 @@
 <template>
-    <div class="deskRecord">
-        <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
-            <div class="mainCell" style="margin-bottom:10px;float:right">
-                <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>
-            </div>
-        </div>
-        <div class="backColor"></div>
-        <div class="mainTitle">基本信息：</div>
-        <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="120px">
-            <el-form-item label="姓名:" prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="性别: " prop="name">
-                <el-select style="width:100%;" v-model="value" placeholder="">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="年龄: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="证件号:" prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="出生日期: " prop="name">
-                <el-date-picker
-                style="width:100%;"
-                v-model="value1"
-                type="date"
-                placeholder="选择日期">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="联系电话: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="关系联系人: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="关系联系人电话: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="家庭住址: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-        </el-form>
-        <div class="mainTitle">体格信息：</div>
-        <el-form class="physiqueForm" :model="form" :rules="rules" ref="form" label-width="80px">
-            <el-form-item label="体温:" prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input><span>℃</span>
-            </el-form-item>
-            <el-form-item label="血糖: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>mmol/L
-            </el-form-item>
-            <el-form-item label="脉搏: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>(次/分)
-            </el-form-item>
-            <el-form-item label="血压:" prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>/
-                <el-input v-model="form.name" placeholder=""></el-input>mmHg
-            </el-form-item>
-            <el-form-item label="身高: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>cm
-            </el-form-item>
-            <el-form-item label="血脂: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>mmol/L
-            </el-form-item>
-            <el-form-item label="脉搏: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>(次/分)
-            </el-form-item>
-            <el-form-item label="体重: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>kg
-            </el-form-item>
-        </el-form>
-        <div class="mainTitle">病历信息：</div>
-        <el-form class="recordForm" :model="form" :rules="rules" ref="form" label-width="80px">
-            <el-form-item label="病历分类:" prop="name">
-                <el-select style="width:100%;" v-model="value" placeholder="">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="症状: " prop="name">
-                <el-input v-model="form.name" placeholder=""></el-input>
-            </el-form-item>
-            <el-form-item label="发病日期: " prop="name">
-                <el-date-picker
-                style="width:100%;"
-                v-model="value1"
-                type="date"
-                placeholder="选择日期">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="" prop="name">
-                <el-checkbox v-model="checked">是否传染</el-checkbox>
-            </el-form-item>
-            <el-form-item label="主诉:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="现病史:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="既往史:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="个人史:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="家族史:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-            <el-form-item label="诊断信息:" prop="name" style="width:100%;">
-                <el-input
-                type="textarea"
-                :rows="2"
-                placeholder="请输入内容"
-                v-model="textarea">
-                </el-input>
-            </el-form-item>
-        </el-form>
-        <medicalRecord ref='medicalRecord'></medicalRecord>
-        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+  <div class="deskRecord">
+    <div style="overflow:hidden;border-top:1px solid #e5e5e5;margin-top:5px;">
+      <div class="mainCell" style="margin-bottom:10px;float:right">
+        <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>
+      </div>
     </div>
+    <div class="backColor"></div>
+    <div class="mainTitle">基本信息：</div>
+    <el-form class="basicForm" :model="patientInfo" :rules="rules" ref="form" label-width="120px">
+      <el-form-item label="姓名:" prop="name">
+        <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
+      </el-form-item>
+      <el-form-item label="性别: " prop="name">
+        <div v-if="patientInfo.gender == 1">男</div>
+        <div v-if="patientInfo.gender == 2">女</div>
+      </el-form-item>
+      <el-form-item label="年龄: " prop="name">
+        <el-input v-model="patientInfo.age" placeholder="" readonly></el-input>
+      </el-form-item>
+      <el-form-item label="证件号:" prop="name">
+        <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
+      </el-form-item>
+      <el-form-item label="出生日期: " prop="name">
+        <el-date-picker
+          style="width:100%;"
+          v-model="patientInfo.birth"
+          type="date"
+          readonly
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="联系电话: " prop="name">
+        <el-input v-model="patientInfo.phone" placeholder="" readonly></el-input>
+      </el-form-item>
+
+      <el-form-item label="关系联系人电话: " prop="name">
+        <el-input v-model="patientInfo.relative_phone" placeholder="" readonly></el-input>
+      </el-form-item>
+      <el-form-item label="家庭住址: " prop="name">
+        <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
+      </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-item label="体温:" prop="name">
+        <el-input v-model="case_history.temperature" placeholder=""></el-input>
+        <span>℃</span>
+      </el-form-item>
+      <el-form-item label="血糖: " prop="name">
+        <el-input v-model="case_history.blood_sugar" placeholder=""></el-input>
+        mmol/L
+      </el-form-item>
+      <el-form-item label="脉搏: " prop="name">
+        <el-input v-model="case_history.pulse" placeholder=""></el-input>
+        (次/分)
+      </el-form-item>
+      <el-form-item label="血压:" prop="name">
+        <el-input v-model="case_history.sbp" placeholder=""></el-input>
+        /
+        <el-input v-model="case_history.dbp" placeholder=""></el-input>
+        mmHg
+      </el-form-item>
+      <el-form-item label="身高: " prop="name">
+        <el-input v-model="case_history.height" placeholder=""></el-input>
+        cm
+      </el-form-item>
+      <el-form-item label="血脂: " prop="name">
+        <el-input v-model="case_history.blood_fat" placeholder=""></el-input>
+        mmol/L
+      </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-item label="疾病分类:" prop="name">
+        <el-select style="width:100%;" v-model="case_history.sick_type" placeholder="">
+          <el-option
+            v-for="item,index in getDictionaryDataConfig('system','sick_type')"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="症状: " prop="name">
+        <el-input v-model="case_history.symptom" placeholder=""></el-input>
+      </el-form-item>
+      <el-form-item label="发病日期: " prop="name">
+        <el-date-picker
+          style="width:100%;"
+          v-model="case_history.sick_date"
+          type="date"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="name">
+        <el-checkbox v-model="case_history.is_infect">是否传染</el-checkbox>
+      </el-form-item>
+      <el-form-item label="主诉:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.chief_conplaint">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="现病史:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.history_of_present_illness">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="既往史:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.past_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="个人史:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.personal_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="家族史:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.family_history">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="诊断信息:" prop="name" style="width:100%;">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="case_history.diagnostic">
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <medicalRecord ref='medicalRecord'></medicalRecord>
+    <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+  </div>
 </template>
 
 <script>
-import medicalRecord from './medicalRecord'
-import saveRecordTemplate from './saveRecordTemplate'
-export default {
-    components:{
-       medicalRecord,
-       saveRecordTemplate 
+  import medicalRecord from './medicalRecord'
+  import saveRecordTemplate from './saveRecordTemplate'
+  import { getDictionaryDataConfig } from "@/utils/data";
+  import {  createCaseHistory } from '@/api/his/his'
+
+
+  export default {
+    props: {
+      case_history: Object,
+      patientInfo: Object,
+      hisPatientInfo: Object,
+      record_date:String,
     },
-    data(){
-        return{
-            form:{
-                name:''
-            },
+    components: {
+      medicalRecord,
+      saveRecordTemplate
+    },
+    data() {
+      return {
+        case_history:{
+          sick_type:'',
+          symptom:"",
+          sick_date:"",
+          is_infect:"",
+          chief_conplaint:"",
+          history_of_present_illness:"",
+          past_history:"",
+          diagnostic:"",
+          personal_history:"",
+          family_history:"",
+
+        },
+        formValue:{
+          temperature:"",
+          blood_sugar:"",
+          pulse:"",
+          sbp:"",
+          dbp:"",
+          height:"",
+          blood_fat:"",
+        },
+        form: {
+          name: ''
         }
+      }
     },
-    methods:{
-        open(index){
-            if(index == 1){
-                
-            }else if(index == 2){
-                
-            }else if(index == 3){
-                this.$refs.medicalRecord.show()
-            }else if(index == 4){
-                this.$refs.saveRecordTemplate.show()
+    methods: {
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },
+      setData(case_history,patientInfo,hisPatientInfo){
+        this.form.name = patientInfo.name
+
+
+
+      },
+      open(index) {
+        if (index == 1) {
+          if(this.patientInfo.id == undefined){
+            this.$message.error("请先选择病人")
+            return
+          }
+
+          let params = {
+            "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.case_history.sick_date,
+            "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,
+
+
+          }
+          createCaseHistory(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$message.success("保存成功")
             }
-            
-        },
+          })
+        } else if (index == 2) {
+
+        } else if (index == 3) {
+          this.$refs.medicalRecord.show()
+        } else if (index == 4) {
+          this.$refs.saveRecordTemplate.show()
+        }
+
+      }
     }
-}
+  }
 </script>
 
 
 <style lang="scss" scoped>
-.mainTitle{
-    font-size:18px;
-    font-weight:bold;
+  .mainTitle {
+    font-size: 18px;
+    font-weight: bold;
     margin-bottom: 10px;
-}
-.backColor{
+  }
+
+  .backColor {
     background: #f6f8f9;
     height: 5px;
     margin-bottom: 5px;
-}
-.deskRecord{
-    .basicForm{
-        display: flex;
-        flex-wrap: wrap;
-        .el-form-item{
-            width:32%;
-            margin-right: 1%;
-        }
-    }
-    .physiqueForm{
-        display: flex;
-        flex-wrap: wrap;
-        .el-form-item{
-            width:24%;
-            margin-right: 1%;
-        }
-    }
-    .recordForm{
-        display: flex;
-        flex-wrap: wrap;
-        .el-form-item{
-            width:24%;
-            margin-right: 1%;
-        }
-    }
-    
-}
+  }
+
+  .deskRecord {
+
+  .basicForm {
+    display: flex;
+    flex-wrap: wrap;
+
+  .el-form-item {
+    width: 32%;
+    margin-right: 1%;
+  }
+
+  }
+  .physiqueForm {
+    display: flex;
+    flex-wrap: wrap;
+
+  .el-form-item {
+    width: 24%;
+    margin-right: 1%;
+  }
+
+  }
+  .recordForm {
+    display: flex;
+    flex-wrap: wrap;
+
+  .el-form-item {
+    width: 24%;
+    margin-right: 1%;
+  }
+
+  }
+
+  }
 </style>
 
 <style lang="scss">
-.physiqueForm{
-    .el-form-item__content{
-        display: flex;
-    }
-    .el-input{
-        width:80px;
-        margin-right:5px;
-    }
-}
+  .physiqueForm {
+
+  .el-form-item__content {
+    display: flex;
+  }
+
+  .el-input {
+    width: 80px;
+    margin-right: 5px;
+  }
+
+  }
 </style>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -1,148 +1,247 @@
 <template>
-    <div class="prescriptionTable">
-        <el-table :data="preDrugs" 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>
-            <el-table-column align="center" prop="name" 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>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
-                <template slot-scope="scope">
-                    <el-input v-model="input" placeholder=""></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" 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>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" 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>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" 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>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" 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>
-                    </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>
-                </template>
-            </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="备注">
-                <template slot-scope="scope">
-                    <!-- <el-autocomplete
-                    class="inline-input"
-                    v-model="state1"
-                    :fetch-suggestions="querySearch"
-                    placeholder=""
-                    @select="handleSelect"
-                    ></el-autocomplete> -->
-                </template>
-            </el-table-column>
-            <el-table-column align="center" width="40" prop="name" label="操作">
-                <template slot-scope="scope">
-                    <i class="el-icon-delete"></i>
-                </template>
-            </el-table-column>
-        </el-table>
-    </div>
+  <div class="prescriptionTable">
+    <el-table v-if="activeType  == 1" :data="prescription.advices" 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" prop="name" label="名称">
+        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+        <template slot-scope="scope">
+          <el-input  v-model="scope.row.single_dose"></el-input>
+          <div> {{scope.row.min_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="用法">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              v-for="item,index in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="频率">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择">
+            <el-option
+              v-for="item in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="100" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
+            <div> {{scope.row.min_unit}}</div>
+          </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.retail_price" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteDrug(scope.row)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <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="序号">
+         <template slot-scope="scope">
+            {{scope.$index + 1}}
+         </template>
+      </el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
+        <template slot-scope="scope">
+          {{getGroup(scope.row.statistical_classification)}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="130" label="用法">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.delivery_way" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="number_days" width="130" label="天数">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.number_days" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="100" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <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.price" placeholder=""></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="120" label="备注">
+        <template slot-scope="scope">
+           <el-input v-model="scope.row.remark"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" width="40" prop="name" label="操作">
+        <template slot-scope="scope">
+          <i class="el-icon-delete" @click="deleteProject(scope.row)"></i>
+        </template>
+      </el-table-column>
+    </el-table>
+
+
+
+
+  </div>
 </template>
 
 <script>
-export default {
-    props:{
-        preDrugs:Array,
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData } from '@/api/his/his'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
     },
-    data(){
-        return{
-            tableData: [],
-            newoptions: [{
-            value: '1',
-            label: '1'
-            }, {
-            value: '2',
-            label: '2'
-            }, {
-            value: '3',
-            label: '3'
-            }, {
-            value: '4',
-            label: '4'
-            }, {
-            value: '5',
-            label: '5'
-            }],
-            value:'1',
-            input:1
+   methods:{
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+
+      },deleteDrug:function(row){
+        for (let i = 0; i < this.prescription.advices.length; i++){
+          if(this.prescription.advices[i].id == row.id){
+              this.prescription.advices.splice(i, 1)
+          }
+        }
+      },
+    
+      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
+      },
+      deleteProject(row){
+       
+        for (let i = 0; i < this.prescription.project.length; i++){
+          if(this.prescription.project[i].id == row.id){
+              this.prescription.project.splice(i, 1)
+          }
         }
+      },
+    },mounted(){
+      this.getInitData()
+    },
+    watch:{
+      prescription:function(){
+        console.log("8888888",this)
+        console.log("9999999",this.prescription)
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss">
-.prescriptionTable{
-    .el-table th .cell, .el-table td .cell{
-        padding: 0 2px;
-        white-space: pre-line;
-    }
-    .el-icon-delete{
-        color:red;
-    }
-}
+  .prescriptionTable {
+
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+
+  .el-icon-delete {
+    color: red;
+  }
+
+  }
 </style>

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

@@ -1,324 +1,449 @@
 <template>
-    <div class="main-contain new-main-contain">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
+  <div class="main-contain new-main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+      <div class="mainLeft">
+        <div class="mainCell" style="justify-content: space-between;">
+          <p>未就诊：<span>{{cal_one}}</span>人</p>
+          <p>已就诊：<span>{{cal_two}}</span>人</p>
+        </div>
+        <div class="mainCell">
+          <el-radio-group v-model="radio" @change="change">
+            <el-radio :label="1">未就诊</el-radio>
+            <el-radio :label="2">已就诊</el-radio>
+            <el-radio :label="0">全部</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="mainCell" style="margin-bottom:10px;">
+          <el-input size="small" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
+            搜索
+          </el-button>
         </div>
-        <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
-            <div class="mainLeft">
-                <div class="mainCell" style="justify-content: space-between;">
-                    <p>未就诊：<span>1</span>人</p>
-                    <p>已就诊：<span>0</span>人</p>
-                </div>
-                <div class="mainCell">
-                    <el-radio-group v-model="radio">
-                        <el-radio :label="1">未就诊</el-radio>
-                        <el-radio :label="2">已就诊</el-radio>
-                        <el-radio :label="3">全部</el-radio>
-                    </el-radio-group>
-                </div>
-                <div class="mainCell" style="margin-bottom:10px;">
-                    <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                </div>
-                <div style="flex:1;overflow-y:auto;">
-                    <el-table :data="patientTableData" @row-click='choosePatient' 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" prop="name" label="患者姓名">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="就诊号" width="90">
-                            <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
-                        </el-table-column>
-                    </el-table>
-                </div>
-            </div> 
-            <div class="mainRight">
-                <div class="mainHeader">
-                    <el-radio-group v-model="titleType">
-                        <el-radio-button label="处方"></el-radio-button>
-                        <el-radio-button label="病历"></el-radio-button>
-                    </el-radio-group>
-                </div>
-                <desk-prescription :patientInfo="patientInfo" v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
-                <desk-record v-if="titleType == '病历'"></desk-record>
-            </div>
-            
+        <div style="flex:1;overflow-y:auto;">
+          <el-table :data="patientTableData" @row-click='choosePatient' border style="width: 100%;"
+                    :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                     highlight-current-row
+                    ref="tab"
+                   >
+            <el-table-column align="center" prop="name" label="患者姓名">
+              <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="就诊号" width="90">
+              <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+            </el-table-column>
+          </el-table>
         </div>
+      </div>
+      <div class="mainRight">
+        <div class="mainHeader">
+          <el-radio-group v-model="titleType" @change="changeTab">
+            <el-radio-button label="处方"></el-radio-button>
+            <el-radio-button label="病历"></el-radio-button>
+          </el-radio-group>
+        </div>
+        <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
+                   <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
+        <desk-prescription :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :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>
+      </div>
+
     </div>
+  </div>
 </template>
 
 <script>
-import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import deskPrescription from './components/deskPrescription'
-import deskRecord from './components/deskRecord'
-export default {
-    components:{
-        BreadCrumb,
-        deskPrescription,
-        deskRecord
+  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 { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: {
+      BreadCrumb,
+      deskPrescription,
+      deskRecord
     },
-    data(){
-        return{
-            crumbs: [
-                { path: false, name: '门诊医生站' },
-                { path: false, name: '医生工作台' }
-            ],
-            titleType:'处方',
-            patientTableData:[{
-                name:'杨美英',
-                mdtrt_id:"1709946",
-            }],
-            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 弄'
-            },{
-            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 弄'
-            },{
-            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 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
-            patientInfo:{}
-        }
+    data() {
+      return {
+        prescriptions: [
+          {
+            name: '处方1',
+            advice: [],
+            project: []
+          }
+        ],
+        search_input: '',
+        cal_one: 0,
+        cal_two: 0,
+        radio: 0,
+        record_date: '',
+        crumbs: [
+          { path: false, name: '门诊医生站' },
+          { path: false, name: '医生工作台' }
+        ],
+        titleType: '处方',
+        patientTableData: [{}],
+        patientInfo: {},
+        hisPatientInfo: {},
+        case_history: {},
+        patient_id:0,
+      }
     },
-    methods:{
-        choosePatient(){
-            this.patientInfo = {
-                certno:"440221195903290027",
-                psn_no:"0221201972",
-                gend:"2",
-                brdy:"1960-03-29",
-                naty:"01",
-                psn_cert_type:"01",
-                psn_name:"杨美英",
-                age:60.7
+    methods: {
+      changeTab(val) {
+
+      },
+      searchAction() {
+
+      },
+      change(val) {
+        this.getList()
+
+      },
+      getList() {
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        }
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = response.data.data.list
+            console.log("222",this.patientTableData)
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            let cal_one = 0
+            let cal_two = 0
+            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) {
+                cal_one = cal_one + 1
+              }
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                cal_two = cal_two + 1
+              }
             }
+
+            this.cal_one = cal_one
+            this.cal_two = cal_two
+          }
+        })
+      },
+      choosePatient(val) {
+        let params = {
+          'record_date': this.record_date,
+          'patient_id': val.patients.id
         }
+        getPatientInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientInfo = response.data.data.xt_info
+            this.hisPatientInfo = response.data.data.his_info
+            this.case_history = response.data.data.case_history
+            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
+            if (this.case_history.temperature <= 0) {
+              this.case_history.temperature = ''
+            }
+            if (this.case_history.blood_sugar <= 0) {
+              this.case_history.blood_sugar = ''
+            }
+            if (this.case_history.pulse <= 0) {
+              this.case_history.pulse = ''
+            }
+            if (this.case_history.sbp <= 0) {
+              this.case_history.sbp = ''
+            }
+            if (this.case_history.dbp <= 0) {
+              this.case_history.dbp = ''
+            }
+            if (this.case_history.height <= 0) {
+              this.case_history.height = ''
+            }
+            if (this.case_history.blood_fat <= 0) {
+              this.case_history.blood_fat = ''
+            }
+            if (this.case_history.sick_type <= 0) {
+              this.case_history.sick_type = ''
+            }
+            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
+            if (this.case_history.is_infect == 1) {
+              this.case_history.is_infect = true
+            } else {
+              this.case_history.is_infect = false
+            }
+            this.prescriptions = []
+            if (response.data.data.prescription.length > 0) {
+              for (let i = 0; i < response.data.data.prescription.length; i++) {
+                var prescription = response.data.data.prescription[i]
+                let index = i + 1
+                let obj = {
+                  name: "处方" + index,
+                  advices: prescription.advices,
+                  projects: prescription.project,
+                }
+                this.prescriptions.push(obj)
+              }
+            }else{
+              let obj = {
+                name: "处方" + 1,
+                advices: [],
+                projects: [],
+              }
+              this.prescriptions.push(obj)
+            }
+           
+            this.$refs.prescriptions.setData(this.prescriptions)
+          }
+        })
+
+        // this.patientInfo = {
+        //     certno:"440221195903290027",
+        //     psn_no:"0221201972",
+        //     gend:"2",
+        //     brdy:"1960-03-29",
+        //     naty:"01",
+        //     psn_cert_type:"01",
+        //     psn_name:"杨美英",
+        //     age:60.7
+        // }
+      },
+      // changePatient(val){
+      //   console.log("患者val",val)
+      //   this.hisPatientInfo = val.hisPatientInfo
+      //   console.log("333333",this.hisPatientInfo)
+      // }
+    }, created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.getList()
+
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.new-main-contain{
+  .new-main-contain {
     height: 100%;
     display: flex;
     flex-direction: column;
-}
-.app-container{
-    height:100%;
-}
-.mainCell{
-    height:36px;
+  }
+
+  .app-container {
+    height: 100%;
+  }
+
+  .mainCell {
+    height: 36px;
     display: flex;
     align-items: center;
-}
-.mainLeft{
-    width:200px;
+  }
+
+  .mainLeft {
+    width: 200px;
     height: 100%;
     display: flex;
     flex-direction: column;
-    .el-radio{
-        margin-right:5px;
-    }
-    
-}
-.mainRight{
-    margin-left:20px;
-    flex:1;
+
+  .el-radio {
+    margin-right: 5px;
+  }
+
+  }
+  .mainRight {
+    margin-left: 20px;
+    flex: 1;
     height: 100%;
     display: flex;
     flex-direction: column;
     overflow-y: auto;
-    .cellSpan{
-        min-width: 80px;
-        display: inline-block;
-        margin-right: 10px;
-    }
-}
-.mainCenter{
+
+  .cellSpan {
+    min-width: 80px;
+    display: inline-block;
+    margin-right: 10px;
+  }
+
+  }
+  .mainCenter {
     display: flex;
-    flex:1;
-}
-.centerLeft{
+    flex: 1;
+  }
+
+  .centerLeft {
     flex: 1;
     display: flex;
     flex-direction: column;
     position: relative;
-    .el-form-item{
-        width:32%;
-        margin-right: 1%;
-        float: left;
-    }
-    .el-form-item__label{
-        text-align: left;
-    }
-}
-.backColor{
+
+  .el-form-item {
+    width: 32%;
+    margin-right: 1%;
+    float: left;
+  }
+
+  .el-form-item__label {
+    text-align: left;
+  }
+
+  }
+  .backColor {
     background: #f6f8f9;
     height: 5px;
     margin-bottom: 5px;
-}
-.tabsBox{
+  }
+
+  .tabsBox {
     position: relative;
     height: 76%;
     overflow-y: auto;
     margin-bottom: 60px;
-    .el-tabs__item{
-        padding: 0 10px;
-    }
-}
-.preTabs{
-    height:100%;
-}
-.costBox{
-    width:100%;
-    height:60px;
-    background:#fff;
+
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  }
+  .preTabs {
+    height: 100%;
+  }
+
+  .costBox {
+    width: 100%;
+    height: 60px;
+    background: #fff;
     position: absolute;
-    bottom:0;
+    bottom: 0;
     display: flex;
     align-items: center;
-}
-.addTab{
+  }
+
+  .addTab {
     position: absolute;
     right: 0;
     top: 14px;
     z-index: 20;
-}
-.centerRight{
+  }
+
+  .centerRight {
     width: 300px;
     margin-left: 5px;
     display: flex;
     flex-direction: column;
     position: relative;
-}
-.rightTab{
+  }
+
+  .rightTab {
     height: 40px;
     width: 100%;
     border: 1px solid #d2d2d2;
     box-sizing: border-box;
-    
-    p{
-        width: 50%;
-        height: 40px;
-        line-height: 40px;
-        text-align: center;
-        background: #eee;
-        float: left;
-    }
-    >p:last-child{
-      border-left: 1px solid #d2d2d2;  
-      float: right;
-    }
-    .activeP{
-        background: #409EFF;
-        color:#fff;
-    }
-}
-.comfirmBox{
-    width:100%;
-    height:60px;
-    background:#fff;
+
+  p {
+    width: 50%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #eee;
+    float: left;
+  }
+
+  > p:last-child {
+    border-left: 1px solid #d2d2d2;
+    float: right;
+  }
+
+  .activeP {
+    background: #409EFF;
+    color: #fff;
+  }
+
+  }
+  .comfirmBox {
+    width: 100%;
+    height: 60px;
+    background: #fff;
     position: absolute;
-    bottom:0;
+    bottom: 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
-}
+  }
 </style>
 
 <style lang="scss">
-.centerLeft{
-    .el-form-item__label{
-        text-align: left;
-    }
-}
-.tabsBox{
-    .el-tabs__item{
-        padding: 0 10px;
-    }
-    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:nth-child(2){
-        padding: 0 10px;
-    }
-    .el-tabs--bottom .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card>.el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card>.el-tabs__header .el-tabs__item:last-child{
-        padding: 0 10px;
-    }
-    .el-tabs--card>.el-tabs__header .el-tabs__item.is-active.is-closable{
-        padding: 0 10px;
-    }
-}
-.centerRight{
-    .el-tabs__nav-scroll{
-        display: flex;
-    }
-    .el-tabs__nav{
-        margin: 0 auto;
-    }
-    .el-table th .cell, .el-table td .cell{
-        padding: 0 2px;
-    }
-}
-.preTabs{
-    // .el-tabs__content{
-    //     height:69%;
-    //     overflow-y: auto;
-    // }
-}
-.rightTabs{
+  .centerLeft {
+
+  .el-form-item__label {
+    text-align: left;
+  }
+
+  }
+  .tabsBox {
+
+  .el-tabs__item {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+    padding: 0 10px;
+  }
+
+  .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+    padding: 0 10px;
+  }
+
+  .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+    padding: 0 10px;
+  }
+
+  }
+  .centerRight {
+
+  .el-tabs__nav-scroll {
+    display: flex;
+  }
+
+  .el-tabs__nav {
+    margin: 0 auto;
+  }
+
+  .el-table th .cell, .el-table td .cell {
+    padding: 0 2px;
+  }
+
+  }
+  .preTabs {
+
+  .el-tabs__content {
+
+  }
+
+  }
+  .rightTabs {
     height: 100%;
-    // .el-tabs__content{
-    //     height:72%;
-    //     overflow-y: auto;
-    // }
-}
+
+
+  .el-tabs__content {
+
+  }
+
+  }
 </style>

src/xt_pages/outpatientRegistration/index.vue

@@ -6,8 +6,8 @@
         <div class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" ref="form" :model="form" label-width="80px">
-                    <el-form-item label="结算类型">
+                <el-form class="basicForm"  :rules="rules" ref="form" :model="form" label-width="100px">
+                    <el-form-item label="结算类型：">
                         <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
                             v-for="item in settlement"
@@ -17,14 +17,14 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item class="specialFormItem" label="医保卡号">
+                    <el-form-item class="specialFormItem" label="医保卡号：">
                         <el-input v-model="form.medicalInsuranceCard"></el-input>
                         <el-button type="primary" @click="reading">读卡</el-button>
                     </el-form-item>
-                    <el-form-item label="患者姓名">
+                    <el-form-item label="患者姓名：">
                         <el-input v-model="form.name"></el-input>
                     </el-form-item>
-                    <el-form-item label="性别">
+                    <el-form-item label="性别：">
                         <el-select v-model="form.sex" placeholder="请选择">
                             <el-option
                             v-for="item in sex"
@@ -34,7 +34,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="证件类型">
+                    <el-form-item label="证件类型：">
                         <el-select v-model="form.certificates" placeholder="请选择">
                             <el-option
                             v-for="item in certificates"
@@ -44,7 +44,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医疗类别">
+                    <el-form-item label="医疗类别：">
                         <el-select v-model="form.medicalCare" placeholder="请选择">
                             <el-option
                             v-for="item in medicalCare"
@@ -54,22 +54,22 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="出生日期">
+                    <el-form-item label="出生日期：">
                         <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
-                    <el-form-item label="年龄">
-                        <el-input v-model="form.age" readonly=""></el-input>
+                    <el-form-item label="年龄：">
+                        <el-input v-model="form.age"></el-input>
                     </el-form-item>
-                    <el-form-item label="证件号码">
+                    <el-form-item label="证件号码：" required prop="idCard">
                         <el-input v-model="form.idCard"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" ref="form" :model="form" label-width="80px">
-                    <el-form-item label="挂号类型">
-                        <el-select v-model="form.register" placeholder="请选择">
+                <el-form class="basicForm" ref="form" :model="form" :rules="rules" label-width="100px">
+                    <el-form-item label="挂号类型：" required prop="register">
+                        <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
                             v-for="item in register"
                             :key="item.value"
@@ -78,46 +78,46 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医生">
+                    <el-form-item label="医生：" required prop="doctor" >
                         <el-select v-model="form.doctor" placeholder="请选择">
                             <el-option
-                            v-for="item in doctor"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                            v-for="item in doctorList"
+                            :key="item.admin_user_id"
+                            :label="item.user_name"
+                            :value="item.admin_user_id">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="科室">
-                        <el-select v-model="form.department" placeholder="请选择">
+                    <el-form-item label="科室：" required prop="department">
+                        <el-select v-model="form.department"  placeholder="请选择">
                             <el-option
-                            v-for="item in department"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                            v-for="item in departmentList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item>
                         <el-checkbox v-model="form.costChecked">是否需要工本费</el-checkbox>
                     </el-form-item>
-                    <el-form-item label="挂号费">
+                    <el-form-item label="挂号费：">
                         <el-input v-model.number="form.registrationFee"></el-input>
                     </el-form-item>
-                    <el-form-item label="诊疗费">
+                    <el-form-item label="诊疗费：">
                         <el-input v-model.number="form.medicalExpenses"></el-input>
                     </el-form-item>
-                    <el-form-item label="工本费">
+                    <el-form-item label="工本费：">
                         <el-input v-model.number="form.cost" :readonly="!form.costChecked"></el-input>
                     </el-form-item>
-                    <el-form-item label="合计">
+                    <el-form-item label="合计：">
                         <el-input v-model.number="total" readonly></el-input>
                     </el-form-item>
                     <el-form-item>
                         <!-- <el-input v-model="form.name"></el-input> -->
                     </el-form-item>
                 </el-form>
-                <el-button style="float:right" @click="getForm" type="primary">挂号</el-button>
+                <el-button style="float:right" @click="saveHisPatient('form')" type="primary">挂号</el-button>
             </div>
             
         </div>
@@ -127,6 +127,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
+import { getAllDoctorList,saveHisPatient } from "@/api/project/project"
 const moment = require('moment')
 export default {
     components:{
@@ -155,9 +156,7 @@ export default {
                 registrationFee:'',
                 medicalExpenses:'',
                 cost:'',
-                total: ''
-
-            
+                total: '' 
             },
             settlement: [{
                 value: 1,
@@ -193,26 +192,26 @@ export default {
                 label: "港澳地区身份证"
             }],
             medicalCare: [{
-                value: 310,
+                value: 1,
                 label: '职工基本医疗保险'
                 }, {
-                value: 320,
+                value: 2,
                 label: "公务员医疗补助"
                 },{
-                value: 330,
+                value: 3,
                 label: "大额医疗费用补助"
                 },{
-                value: 340,
+                value: 4,
                 label: "离休人员医疗"
                 },{
-                value: 390,
+                value: 5,
                 label: "城乡居民基本医疗保险"
                 },{
-                value: 392,
+                value: 6,
                 label: "城乡居民大病医疗保险"
                 },
                 {
-                value: 510,
+                value: 7,
                 label: "生育保险"
             }],
             register: [{
@@ -241,6 +240,16 @@ export default {
                 psn_name:"杨美英",
                 age:60.7
             },
+
+            rules: {
+              idCard: [{ required: true, message: '请填写证件号码', trigger: 'blur'  }],
+              register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
+              doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
+              department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
+           },
+           doctorList:[],
+           departmentList:[],
+           check:0
         }
     },
     computed:{
@@ -263,6 +272,8 @@ export default {
         getBirthday(date){
             console.log(date)
             let curTime = moment(new Date(date)).format('YYYY-MM-DD')
+            console.log("curTime22222",curTime)
+           
             console.log(this.jsGetAge(curTime))
 
             this.form.age = this.jsGetAge(curTime)
@@ -306,8 +317,6 @@ export default {
         },
         getForm(){
             this.form.total = this.total
-            // console.log(new Date(new Date().toLocaleDateString()).getTime() / 1000)
-            // console.log(JSON.parse(localStorage.getItem("temp")))
             if(localStorage.getItem("temp")){
                 let a = JSON.parse(localStorage.getItem("temp"))
                 // let arr = []
@@ -333,6 +342,79 @@ export default {
             }
         },
         
+        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
+             }
+           })   
+        },
+        saveHisPatient(formName){
+           
+            if(this.form.costChecked == true){
+               this.check = 1
+            }
+            if(this.form.costChecked == false){
+               this.check = 2
+            } 
+            var params = {
+              settlementValue:this.form.settlementValue,
+              medicalInsuranceCard:this.form.medicalInsuranceCard,
+              name:this.form.name,
+              sex:this.form.sex,
+              certificates:this.form.certificates, 
+              medicalCare:this.form.medicalCare,
+              birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
+              age:parseInt(this.form.age),
+              idCard:this.form.idCard,
+              register:this.form.register,
+              doctor:this.form.doctor,
+              department:this.form.department,
+              costChecked:this.check,
+              registrationFee:this.form.registrationFee,
+              medicalExpenses:this.form.medicalExpenses,
+              cost:this.form.cost,
+              total:this.total
+            }
+            console.log("params",params)
+ 
+          this.$refs[formName].validate((valid)=>{
+             if(valid){
+                saveHisPatient(params).then(response=>{
+                   if(response.data.state == 1){
+                     var patient =  response.data.data.patient
+                     console.log("patient",patient)
+                     this.$message.success("保存成功")
+                     this.form.settlementValue = "",
+                     this.form.medicalInsuranceCard = "",
+                     this.form.name = "",
+                     this.form.sex="",
+                     this.form.certificates="",
+                     this.form.medicalCare = "",
+                     this.form.birthday ="",
+                     this.form.age ="",
+                     this.form.idCard = "",
+                     this.form.register = "",
+                     this.form.doctor = "",
+                     this.form.department = "",
+                     this.form.costChecked = false,
+                     this.form.registrationFee = "",
+                     this.form.medicalExpenses = "",
+                     this.form.cost="",
+                     this.form.total= "" 
+                   } 
+                })
+             } 
+          })
+        }
+    },
+    created(){
+      //获取当前机构有人员信息
+      this.getAllDoctorList()   
     }
 }
 </script>

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,71 +15,87 @@
                 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">
+                    <template slot-scope="scope">
+                        {{scope.$index+1}}
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间" width="100">
-                    <template slot-scope="scope">{{ scope.row.create_time }}</template>
+                    <template slot-scope="scope">{{getTime(scope.row.record_date,"{y}-{m}-{d}")}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
                     <template slot-scope="scope">{{scope.row.name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室" width="80">
-                    <template slot-scope="scope">{{ scope.row.department }}</template>
+                    <template slot-scope="scope">{{getDepartMent(scope.row.departments)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号类型" width="90">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.register == 1">普通</span>
-                        <span v-if="scope.row.register == 2">主治</span>
-                        <span v-if="scope.row.register == 3">主任</span>
-                        <span v-if="scope.row.register == 4">免收诊金</span>
-                        <span v-if="scope.row.register == 5">专家</span>
+                        <span v-if="scope.row.register_type == 1">普通</span>
+                        <span v-if="scope.row.register_type == 2">主治</span>
+                        <span v-if="scope.row.register_type == 3">主任</span>
+                        <span v-if="scope.row.register_type == 4">免收诊金</span>
+                        <span v-if="scope.row.register_type == 5">专家</span>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="就诊号" width="80">
-                    <template slot-scope="scope"></template>
+                    <template slot-scope="scope">
+                        {{scope.row.number}}
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="证件号">
-                    <template slot-scope="scope">{{ scope.row.idCard }}</template>
+                    <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="患者保险类型" width="80">
-                    <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
+                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.medical_treatment_type)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{ scope.row.doctor }}</template>
+                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
-                    <template slot-scope="scope">{{ scope.row.registrationFee }}</template>
+                    <template slot-scope="scope">{{ scope.row.register_cost }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="诊疗费" width="70">
-                    <template slot-scope="scope">{{ scope.row.medicalExpenses }}</template>
+                    <template slot-scope="scope">{{ scope.row.treatment_cost }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="工本费" width="70">
-                    <template slot-scope="scope">{{ scope.row.cost }}</template>
+                    <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作人" width="70">
-                    <template slot-scope="scope">{{ $store.getters.xt_user.org.org_name }}</template>
+                    <template slot-scope="scope">{{getDoctor(scope.row.admin_user_id) }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <!-- <el-button size="mini" type="primary">编辑</el-button> -->
-                        <span>已就诊</span>
+                        <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>
                 </el-table-column>
             </el-table>
 
-            <!-- <el-pagination
+            <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :page-sizes="[10, 50, 100]"
@@ -89,7 +105,7 @@
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="total"
             >
-            </el-pagination> -->
+            </el-pagination>
         </div>
     </div>
 </template>
@@ -97,6 +113,8 @@
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getHisPatientHistory,changePatient } from "@/api/project/project"
+import { uParseTime } from "@/utils/tools";
 export default {
     components:{
         BreadCrumb
@@ -107,56 +125,181 @@ 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,
+            total:0,
+            departMent:[],
+            doctorList:[],
+            medicalCare: [{
+                id: 1,
+                name: '职工基本医疗保险'
+                }, {
+                id: 2,
+                name: "公务员医疗补助"
+                },{
+                id: 3,
+                name: "大额医疗费用补助"
+                },{
+                id: 4,
+                name: "离休人员医疗"
+                },{
+                id: 5,
+                name: "城乡居民基本医疗保险"
+                },{
+                id: 6,
+                name: "城乡居民大病医疗保险"
+                },
+                {
+                id: 7,
+                name: "生育保险"
+            }],
         }
     },
     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
+           this.getlist()
         },
-        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
-        }
+        // 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){
 
+        },
+       handleSizeChange(val) {
+          this.limit = val
+          this.getList()
+       },
+        handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+        },
+        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=>{
+             if(response.data.state == 1){
+                var history = response.data.data.history
+                console.log("history",history)
+                this.tableData = history
+                var total =  response.data.data.total
+                console.log("total",total)
+                this.total = total
+                var department =  response.data.data.department
+                console.log("department",department)
+                this.departMent = department
+                var doctor = response.data.data.doctor
+                console.log("doctor",doctor)
+                this.doctorList = doctor
+             }
+          })
+ 
+        },
+        getDepartMent(id){
+          var name = ""
+          for(let i=0;i<this.departMent.length;i++){
+            if(id == this.departMent[i].id){
+                name = this.departMent[i].name
+            }
+          }
+          return name
+        },
+        getDoctor(id){
+          var user_name = ""
+          for(let i=0;i<this.doctorList.length;i++){
+            if(id == this.doctorList[i].admin_user_id){
+               user_name = this.doctorList[i].user_name 
+            }
+          }
+          return user_name
+        },
+        getMedicalTreatment(id){
+          var name = ""
+          for(let i=0;i<this.medicalCare.length;i++){
+             if(this.medicalCare[i].id == id){
+               name = this.medicalCare[i].name
+             }
+          }
+          return name
+        },
+        getTime(value, temp) {
+         if (value != undefined) {
+                return uParseTime(value, temp);
+            }
+            return "";
+        },
+        toReturnPatient(id){
+          this.$confirm("确认退号吗?", "退号", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          changePatient(id).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("退号成功");
+              this.getlist()
+            } else {
+               this.$message.error("患者已就诊,退号失败")
+            }
+          });
+        })
+        .catch(() => {});
+        }
     }
 }
 </script>

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -396,7 +396,7 @@
                 @select="handleSelect"
                 @input="changeDrugName"
               ></el-autocomplete>
-              
+
             </el-form-item>
           </el-col>
           <el-col :span="14">
@@ -696,6 +696,16 @@ export default {
       default: function() {
         return [];
       }
+    },executionFrequencyOptions:{
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },deliveryWayOptions:{
+      type: Array,
+      default: function() {
+        return [];
+      }
     },
 
     unitsOption: {
@@ -921,13 +931,13 @@ export default {
                 frequency_type: 0,
                 day_count: "0",
                 week_days: "",
-              
+
               };
             }
             let mode = "";
 
             if (_this.groupForm.advice_type == 1) {
-            
+
               mode = "1-3";
               if (
                 _this.groupForm.doctor != _this.$store.getters.xt_user.user.id
@@ -1081,7 +1091,7 @@ export default {
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
                 groupno: _this.groupForm.groupno,
-               
+
               };
 
               let mode = "";
@@ -2396,11 +2406,11 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
-                
+
               }
-            }   
+            }
         })
-       
+
     },
     changeDrugName(name){
        this.current_drug_name = name
@@ -2438,7 +2448,7 @@ export default {
         }
       },
       handleSelect1(){
-        
+
       },
       handleSelect(){
 
@@ -2452,7 +2462,7 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
      },
 
@@ -2463,7 +2473,7 @@ export default {
      },
 
      querySearch1(queryString, cb) {
-      
+
         var restaurants = this.drugSpec;
          console.log(restaurants)
         restaurants.map(item => {
@@ -2471,7 +2481,7 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
       },
   },