hah阿凡达

src/api/patient.js

@@ -1332,4 +1332,39 @@ export function getPatientDeathRecord(params){
     method:"Get",
     params:params
   })
+}
+
+export function saveCoureseTemplateTitle(data){
+ 
+  return request({
+   url:"/api/patient/savecouresetemplatetitle",
+   method:"post",
+   data:data,
+  })
+}
+
+export function getPatientCoureOfTempalate(params){
+  return request({
+    url:"/api/patient/getpatientcourseoftemplate",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function saveCourseOfNewTemplate(data){
+
+  return request({
+    url:"/api/patient/savecourseofnewtemplate",
+    method:"post",
+    data:data
+  })
+}
+
+export function deleteCourseTempalte(id,params){
+ 
+  return request({
+    url:"/api/patient/deletecourestempalte?id="+id,
+    method:"Get",
+    params:params
+  })
 }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -242,7 +242,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                        <el-form-item label="电导度(mS/cm)：" prop="conduct">
+                        <el-form-item label="电导度(mS/cm)：" prop="conduct" v-if="isShows('电导度')">
                             <el-input v-model="dialysisPrescription.conduct"></el-input>
                         </el-form-item>
                     </el-col>

src/xt_pages/stock/detail/print.vue

@@ -60,13 +60,13 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2">
-                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0 || org_id == 10402">
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0 || org_id == 10402 || org_id == 10721 || org_id == 10726 || org_id == 10697">
                     <!-- {{getStockCount(item.good_id) }} -->
                     {{getMySelfCount(item.good_id) }}
                   </span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191  || org_id ==10485">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0 && org_id!=10402 && org_id!=10485">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0 && org_id!=10402 && org_id!=10485 && org_id!=10721 && org_id!=10726 && org_id!=10697">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -90,7 +90,7 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0 || org_id ==10402 || org_id == 10721 || org_id == 10726 || org_id == 10697">
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0 || org_id ==10402">
                     <!-- {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}} -->
                      {{(getMySelfCount(item.good_id) * item.buy_price).toFixed(2)}}
                      

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            // {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            // },
+            {
+              name: '3-5',
+              label: '病程记录新'
+            },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -105,11 +105,11 @@
         center>
         <div>
           模板名称:
-          <el-input v-model="template_name" placeholder="请输入内容" style="width: 160px;"></el-input>
+          <el-input v-model="title" placeholder="请输入内容" style="width: 160px;"></el-input>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="template_dialog = false">取 消</el-button>
-          <el-button type="primary" @click="template_save">确 定</el-button>
+          <el-button type="primary" @click="saveTemplate">确 定</el-button>
         </span>
       </el-dialog>
       <el-dialog
@@ -122,19 +122,21 @@
           <div style="display: flex;">
             <div style="width: 27%;">
               <el-table
-                :data="tableData"
+                :data="templateList"
                 :highlight-current-row="true"
                 @row-click="rowclick"
+                 ref="record_table_one"
+                 @current-change="getCurrentChangeTwo"
                 style="width: 100%">
-                <el-table-column
-                  prop="index"
-                  label="序号"
-                  width="">
+                <el-table-column prop="index" label="序号"  width="">
+                  <template slot-scope="scope">
+                       {{ scope.$index + 1 }}
+                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="name"
-                  label="模板名称"
-                  width="">
+                <el-table-column prop="name" label="模板名称" width="">
+                  <template slot-scope="scope">
+                       {{ scope.row.title }}
+                   </template>
                 </el-table-column>
               </el-table>
             </div>
@@ -142,7 +144,7 @@
               <div class="Second_title">模板内容</div>
               <div style="">
                 <keep-alive>
-                  <ueditor ref="ue" :content="new_content" id="editor"></ueditor>
+                  <ueditor ref="editorOne" id="editors" :content="new_content"></ueditor>
                 </keep-alive>
               </div>
             </div>
@@ -151,7 +153,7 @@
         <span slot="footer" class="dialog-footer" style="text-align: center;">
           <el-button type="danger" @click="template_dele">删除模板</el-button>
           <el-button type="primary" @click="template_save">保存模板</el-button>
-          <el-button type="primary" @click="template_save">应用</el-button>
+          <el-button type="primary" @click="toContentPint">应用</el-button>
           <el-button @click="library_dialog = false">取消</el-button>
         </span>
       </el-dialog>
@@ -226,7 +228,11 @@
     createNewCourseOfDiseaseRecord,
     deleteNewCouseOfDisease,
     modifyCourseOfDiseaseRecord,
-    getPatientCourseOfDiseaseList
+    getPatientCourseOfDiseaseList,
+    saveCoureseTemplateTitle,
+    getPatientCoureOfTempalate,
+    saveCourseOfNewTemplate,
+    deleteCourseTempalte
   } from '@/api/patient'
   import { fetchAllDoctorAndNurse } from "@/api/doctor";
   import { parseTime } from '@/utils'
@@ -281,7 +287,12 @@
         admin_user_id:0,
         record_date:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         template_name:"",
-        id:0
+        id:0,
+        doctorOptions:[],
+        template_content:"",
+        template_id:0,
+        title:"",
+        templateList:[]
       }
     },
     created() {
@@ -304,17 +315,69 @@
 
     },
     methods: {
-      template_dele(){
 
+      toContentPint(){
+        this.$refs.editor.contents = this.template_content
+        this.library_dialog = false
+      },
+      getCurrentChangeOne(val){
+        this.$refs.editor.contents = val.content
+        this.record_date = this.getTime(val.record_time)
+        this.id = val.id
       },
-      rowclick(){
+      getCurrentChangeTwo(val){
+   
+        this.$refs.editorOne.contents = val.content
+        this.template_content = ""
+        this.template_content = val.content
+        this.template_id = val.id
+     },
+     template_dele(){
+       deleteCourseTempalte(this.template_id).then(response=>{
+        if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          this.$message.success("删除成功!")
+          this.library_dialog = false
+          this.getPatientCoureOfTempalateOne()
+        }
+      })
+     },
+     getPatientCoureOfTempalateOne(){
+
+     },
+     rowclick(){
 
       },
       prints(){
 
+      },
+      saveTemplate(){
+   
+        var params = {
+          title:this.title,
+          content: this.$refs.editor.contents,
+        }
+      saveCoureseTemplateTitle(params).then(response=>{
+        if(response.data.state == 1){
+          var courseTemplate =  response.data.data.courseTemplate
+          this.$message.success("保存成功!")
+          this.template_dialog = false
+        }
+        })
       },
       template_save(){
-
+        var params = {
+         template_id:this.template_id,
+         content:this.$refs.editorOne.contents
+        }
+      
+        saveCourseOfNewTemplate(params).then(response=>{
+           if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.library_dialog = false
+           }
+        })
       },
       getDocName(admin_user_id){
         var user_name = ""
@@ -347,8 +410,13 @@
        });
       },
       add_click(){
-        this.add_index = 1
+        this.admin_user_id = ""
+        this.admin_user_id = this.$store.getters.xt_user.user.id
+        this.fetchAllDoctorAndNurse()
+        this.$refs.editor.contents = ""
+        this.id = 0
         this.disabled = false
+        this.add_index = 1
       },
       showCancel(){
         this.add_index = 0
@@ -388,8 +456,20 @@
         if(this.add_index ==0){
           this.template_dialog = true
         }else{
-          this.library_dialog = true
-        }
+         getPatientCoureOfTempalate().then(response=>{
+          if(response.data.state == 1){
+            this.library_dialog = true
+            this.templateList = response.data.data.templateList
+            console.log("hahhahahaha",this.$refs)
+            if(this.templateList!=null && this.templateList.length>0){
+              this.$refs.record_table_one.setCurrentRow(this.templateList[0])
+            }
+            console.log("haaaaaaaaaaaaa",this.templateList)
+            
+          }
+        })
+     
+       }
       },
       auto_click(){
         this.auto_dialog = true
@@ -524,7 +604,7 @@
           deleteNewCouseOfDisease(this.id).then(response=>{
             if (response.data.state==1) {
               var msg = response.data.data.msg
-              this.$message.success("保存成功!")
+              this.$message.success("删除成功!")
               this.getlist()
             }
           });
@@ -535,16 +615,9 @@
 
       },
       showEdit() {
-        if (this.table_current_index == -1) {
-          this.$message.error('请选择要修改的病程内容')
-          return
-        }
-        this.show_edit_dialog = true
-        this.edit_course_of_disease_time = this.recordTime(this.records[this.table_current_index].record_time)
-        this.edit_new_content = this.records[this.table_current_index].content
-        this.edit_current_id = this.records[this.table_current_index].id
-        this.edit_title = this.records[this.table_current_index].title
-        this.$refs.record_table.setCurrentRow(null)
+       
+        this.add_index =1
+        this.disabled = false
 
       }, tableRow({ row, rowIndex }) {
         // 把每一行的索引放进row
@@ -703,7 +776,7 @@
         return anticoagulant_name
       },
       getTime (time) {
-      return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
+      return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
       },
       getTimeOne (time) {
       return uParseTime(time, '{y}-{m}-{d}')

src/xt_pages/user/deathSummary.vue

@@ -518,7 +518,7 @@
           transplant:transplant,
           patient_id:this.patientID,
           remark:this.remark,
-          last_record_date:this.last_record_date
+          last_record_date:this.last_record_date?this.last_record_date:""
         }
         console.log("parasm===============",params)
        
@@ -609,6 +609,8 @@
                }
                if(deathSummary.last_record_date>0){
                 this.last_record_date = this.getTime(deathSummary.last_record_date)
+               }else{
+                this.last_record_date = ""
                }
                 this.updateShow = true
                 this.deathDisabed = true