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

src/api/advice.js

@@ -15,7 +15,7 @@ export function getAllAdviceConfig() {
 }
 
 export function CreateDoctorAdvice(id, advice, mode) {
-  
+
   return request({
     url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
     method: "post",
@@ -190,7 +190,7 @@ export function CreateAdviceTemplate(data) {
 }
 
 export function UpdateAdviceTemplate(id, data,drug_id) {
-  
+
   return request({
     url: "/api/advicetemplate/update?id=" + id+"&drug_id="+drug_id,
     method: "put",
@@ -289,7 +289,7 @@ export function DeleteParentAdviceTemplate(id) {
 }
 
 export function CreateSubAdvice(params) {
-  
+
   return request({
     url: "/api/subadvice/create",
     method: "post",
@@ -502,3 +502,7 @@ export function getSchedualDoctors (params) {
     params: params
   })
 }
+
+
+
+

src/api/his/his.js

@@ -181,6 +181,91 @@ export function getExportConsumeDetailList(params) {
 
 
 
+export function CreateHisSingleAdviceTemplate(params) {
+  return request({
+    url: "/api/hisadvicetemplate/add",
+    method: "post",
+    params:params
+  });
+}
+
+
+
+
+
+export function DeleteHisAdviceTemplate(id, template_id, parent_id) {
+  return request({
+    url:
+      "/api/hisadvicetemplate/delete?id=" +
+      id +
+      "&template_id=" +
+      template_id +
+      "&parent_id=" +
+      parent_id,
+    method: "delete"
+  });
+}
+
+
+export function postHisAdviceTemplate(params, name, advice_type) {
+  return request({
+    url:
+      "/api/hisadvicetemplate/create?template_name=" +
+      name +
+      "&advice_type=" +
+      advice_type,
+    method: "post",
+    data: params
+  });
+}
+
+
+
+
+export function updateHisTemplateName(params) {
+  return request({
+    url: "/api/histemplate/modify",
+    method: "post",
+    params:params
+  });
+}
+
+
+export function UpdateHisAdviceTemplate(params) {
+  return request({
+    url: "/api/hisadvicetemplate/update",
+    method: "put",
+    params:params
+  });
+}
+
+
+export function DeleteHisParentAdviceTemplate(id) {
+  return request({
+    url: "/api/hisadviceparenttemplate/delete?template_id=" + id,
+    method: "delete",
+  });
+}
+
+
+export function getAllHisAdviceTemplate () {
+  return request({
+    url: '/api/getallhisadvicetemplate',
+    method: 'get',
+  })
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/lang/zh.js

@@ -196,7 +196,7 @@ export default {
     upload_config: '质控上报配置',
     quality_control: '质控上报',
     remind_print: '排版提醒打印',
-    system_prescription: '处方模版',
+    system_prescription: '透析方案模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
 
@@ -231,7 +231,9 @@ export default {
     templateManagement:'模板管理',
     drugStockUserDetail:"出库人明细",
     DepartManage:"部门管理",
-    basicConfig:'基础配置'
+    basicConfig:'基础配置',
+
+    histemplate:'处方模版',
 
   },
   navbar: {

src/router/modules/templateManagement.js

@@ -27,7 +27,7 @@ export default {
         meta: {
           title: 'template',
           noCache: true,
-    
+
         }
     },
     {
@@ -38,6 +38,14 @@ export default {
           title: 'system_prescription'
         }
     },
-    
+    {
+      path: '/data/histemplate',
+      component: () => import('@/xt_pages/data/hisTemplate'),
+      name: 'histemplate',
+      meta: {
+        title: 'histemplate'
+      }
+    },
+
   ]
 }

src/xt_pages/data/druguseTemplate.vue

@@ -547,7 +547,7 @@
                   <el-col :span="15">
 
                     <el-form-item label="药品规格 :" prop="advice_desc">
-                      <el-col :span="8">                     
+                      <el-col :span="8">
                          <el-autocomplete
                          style="width:100px;"
                          class="inline-input"
@@ -1627,7 +1627,7 @@
       },
       onRowClick(row, event, column) {
         this.table_current_index = row.index
-      }, 
+      },
       modifyRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
@@ -1657,7 +1657,7 @@
           this.templateTableVisible = false
         }).catch(() => {
         })
-      }, 
+      },
 
       //添加医嘱模版
       submitTableTemplate(formName) {
@@ -1669,10 +1669,10 @@
         const params = {
           'data': this.adviceTableData
         }
-      
+
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
-     
+
         postAdviceTemplate(params, name, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
@@ -1807,7 +1807,7 @@
 
       },
       submitTemplate(formName) {
- 
+
         if(this.src_type == ""){
             this.templateForm.way = 0
             this.templateForm.drug_id = 0
@@ -1818,7 +1818,7 @@
             this.templateForm.advice_name = arr[0]
         }
         console.log("2222",this.templateForm)
-       
+
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)
           this.templateForm.prescribing_number = parseFloat(this.templateForm.prescribing_number)
@@ -1829,7 +1829,7 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
-          
+
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -1948,7 +1948,7 @@
                     this.adviceTableData[i].weekdays = templateFormTwo.weekdays
                     this.adviceTableData[i].drug_id =  templateFormTwo.drug_id
                     this.adviceTableData[i].way   = templateFormTwo.way
-                    
+
                   }
                 }
               } else {
@@ -2147,7 +2147,7 @@
                 object['template_id'] = response.data.data.advice_templates[i].id
                 this.adviceTemplates.push(object)
               }
-              
+
               // 非空模版的处理
               for (let y = 0; y < response.data.data.advice_templates[i].DoctorAdviceTemplate.length; y++) {
                 if (response.data.data.advice_templates[i].id == response.data.data.advice_templates[i].DoctorAdviceTemplate[y].template_id) {
@@ -2177,21 +2177,21 @@
       }, cancelEditHandle() {
         // this.templateTableVisible = true
         this.templateEditFormVisible = false
-      }, 
-      
+      },
+
       //编辑医嘱
       submitEditTemplate(formName) {
-        
+
          var drug_id = 0
          for(let i=0;i<this.all_drug.length;i++){
            if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
               drug_id = this.all_drug[i].id
            }
-         } 
+         }
         this.templateFormEdit.drug_id = drug_id
-       
+
         console.log("编辑子药",this.templateFormEdit)
-       
+
         this.$refs[formName].validate(valid => {
 
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
@@ -2221,7 +2221,7 @@
                 return s && s.trim()
               }).join(',')
             }
-           
+
             UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit,this.templateFormEdit.drug_id).then(
               response => {
                 if (response.data.state == 0) {
@@ -2253,7 +2253,7 @@
             )
           }
         })
-      }, 
+      },
       drugDesc(row) {
         if (row.isNoSub == 2) {
           if (row.drug_spec.length <= 0) {
@@ -2339,13 +2339,13 @@
         this.table_current_index_two = row.index
       }, cancelHandleTwo() {
         this.templateFormTwoVisible = false
-      }, 
+      },
       submitTemplateTwo(formName) {
-        
+
         this.templateForm['template_id'] = this.current_template_id
         this.templateForm['advice_type'] = this.form.advice_type
-       
-      
+
+
         if (this.templateForm.frequency_type == 1) {
           this.templateForm.day_count = 0
           this.templateForm.week_days = ''
@@ -2359,7 +2359,7 @@
           }).join(',')
         }
         console.log("编辑模板",this.templateForm)
-        
+
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
@@ -2391,7 +2391,7 @@
         this.adviceTableDataTwo = []
       }, cancelEditHandleTwo() {
         this.templateEditFormTwoVisible = false
-      }, 
+      },
       submitEditTemplateTwo(formName) {
         this.$refs[formName].validate(valid => {
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
@@ -2512,7 +2512,7 @@
           this.editDialogTitle = '编辑医嘱'
           this.edit_advice_name = '医嘱内容'
         }
-      }, 
+      },
       openDelete(index, row) {
         this.hoverOrderArr = []
 
@@ -2689,14 +2689,14 @@
             this.adviceTableDataTwo.push(this.adviceTemplates[i])
           }
         }
-      }, 
+      },
       modifyTemplateName() {
         const params = {
           template_name: this.form.name,
           template_id: this.current_template_id
         }
         console.log("params---",params)
-       
+
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2825,9 +2825,9 @@
                 obj.id = base_drug_list[i].id
                 this.all_drug.push(obj)
               }
-            }   
+            }
         })
-       
+
     },
 
 
@@ -2871,7 +2871,6 @@
             }
         }
       },
-
       changeDrugDescTwo(name) {
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
@@ -2887,7 +2886,7 @@
           }
         }
       },
-      
+
 
      querySearch(queryString, cb) {
         console.log('queryString',queryString)

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -19,7 +19,7 @@
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
         <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.patients.name }}</template>
+          <template slot-scope="scope">{{ scope.row.patient   .name }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="110">
           <template slot-scope="scope"> {{getTimes(scope.row.info.ctime)}}</template>