hah阿凡达

src/api/patient.js

@@ -1221,4 +1221,23 @@ export function deletePatientDeathSummary(params){
     method:"get",
     params:params
   })
+}
+
+
+export function createNewSickHistoryRecord(data){
+
+  return request({
+    url:"/api/patient/createnewsickhistoryrecord",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewSickHistory(){
+
+  return request({
+    url:"/api/patient/getnewsickhistory",
+    method:"get",
+    params:params,
+  })
 }

src/main.js

@@ -31,6 +31,10 @@ import './xt_permission'
 // import '../static/ueditor/lang/zh-cn/zh-cn.js'
 // import '../static/ueditor/ueditor.parse.min.js'
 // import './mock' // simulation data
+import '../static/ueditor/ueditor.config.js'
+import '../static/ueditor/ueditor.all.min.js'
+import '../static/ueditor/lang/zh-cn/zh-cn.js'
+import '../static/ueditor/ueditor.parse.min.js'
 import VueClipboard from 'vue-clipboard2'
 
 import * as filters from './filters' // global filters

src/xt_pages/user/patientInfo.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div class="patient-container">
-  <patient-sidebar :id="patientID" v-if="org_id!=0&&org_id!=10702"></patient-sidebar>
+  <patient-sidebar :id="patientID" v-if="org_id!=10702"></patient-sidebar>
   <PatientSidebar_ord :id="patientID" v-if="org_id==10702"></PatientSidebar_ord>
   <!-- <PatientSidebar_new :id="patientID" v-if="org_id == 0"></PatientSidebar_new> -->
   <patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>

src/xt_pages/user/patients.vue

@@ -427,7 +427,7 @@
               :to="'/patients/patient/' + scope.row.id"
               style="color:#409eff;width:100%;display:block;"
             >
-              <span v-if="scope.row.is_infectious == 1">{{ scope.row.name }}</span> 
+              <span v-if="scope.row.is_infectious == 1 || scope.row.is_infectious == 0">{{ scope.row.name }}</span> 
               <span v-if="scope.row.is_infectious == 2" style="color: red;">{{ scope.row.name }}</span> 
             </router-link
             >

src/xt_pages/user/sickHistory_new.vue

@@ -51,7 +51,7 @@
                   <el-button type="primary" size="small" @click="prints">打印</el-button>
                 </div>
                 <div v-if="add_index == 1">
-                  <el-button type="primary" size="small" @click="showSave">保存</el-button>
+                  <el-button type="primary" size="small" @click="createAction">保存2</el-button>
                   <el-button size="small" @click="showCancel">取消</el-button>
                 </div>
               </div>
@@ -60,7 +60,7 @@
               <div style="flex: 1;">
                 日期:
                 <el-date-picker
-                  v-model="history_date"
+                  v-model="start_time"
                   type="date"
                   :disabled="disabled"
                   style="width: 150px;"
@@ -93,12 +93,12 @@
             <div style="display: flex;">
               <div style="width: 30%;">
                 医生:
-                <el-select v-model="shen_yishen" placeholder="请选择" style="width: 120px;" :disabled="disabled">
+                <el-select v-model="admin_user_id" placeholder="请选择" style="width: 120px;" :disabled="disabled">
                   <el-option
-                    v-for="item in yishen_options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                    v-for="item in doctorOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </div>
@@ -112,13 +112,14 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
+                <el-input v-if="shen_guomi == 2" v-model="guominyaowu_desc"></el-input>
               </div>
             </div>
 
             <div style="margin-top: 15px;">
               <span style="display: inline-block;border-left: 5px solid #3891f1f5;padding-left: 5px;margin-bottom: 5px;">详情</span>
               <keep-alive>
-                <ueditor ref="ue" :content="new_content" id="editor"></ueditor>
+                <ueditor ref="edit" :content="new_content" id="editor"></ueditor>
               </keep-alive>
             </div>
             <div style="text-align: right;margin-top:10px ;">
@@ -174,7 +175,7 @@
               <div class="Second_title">模板内容</div>
               <div style="">
                 <keep-alive>
-                  <ueditor ref="ue" :content="new_content" id="editor"></ueditor>
+                  <ueditor ref="editor" id="editors" v-bind:r_content="new_content"></ueditor>
                 </keep-alive>
               </div>
             </div>
@@ -196,156 +197,11 @@
 
 
 
-      <!-- </div> -->
-      <el-dialog title="新增病史记录" width="70%" top="5vh" :visible.sync="show_dialog">
-        <div>
-          <div class="new_record_form">
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="title" style="width: 150px"></el-input>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
-              <el-date-picker v-model="sick_history_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd "></el-date-picker>
-
-
-              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_shenyizhishi" placeholder="选择肾移植史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-            </div>
-
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-
-              <label class="title" ><span class="name">腹膜透析史</span> : </label>
-              <el-select style="width: 150px;" v-model="is_fumotouxishi" placeholder="选择腹膜透析史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
-              <el-select style="width: 100px;" v-model="doctor_id" placeholder="请选择医生">
-                <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
-              <el-select style="width: 100px;" v-model="is_guominyaowu" placeholder="选择过敏药物">
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-                <el-option label="不详" value="2"></el-option>
-
-              </el-select>
-              <el-input v-if="is_guominyaowu == 1" v-model="guominyaowu_desc"></el-input>
-
-            </div>
-
-            <div class="cell clearfix" >
-              <label class="title"><span class="name">病史模版</span> : </label>
-              <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
-              </el-select>
-            </div>
-
-            <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="editor"
-                        id="editors"
-                        style="width: 100%"
-                        v-bind:r_content="new_content"
-                >
-                </editor>
-              </keep-alive>
-            </div>
-
-            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
-              <el-button @click="show_dialog = false">取消</el-button>
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
-                         @click="createAction" :loading="uploading_new_record">保存
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </el-dialog>
-
-      <el-dialog title="修改病史记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
-        <div>
-          <div class="new_record_form">
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-              <label class="title"><span class="name">病程标题</span> : </label>
-              <el-input v-model="edit_title" style="width: 150px"></el-input>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">日期</span> : </label>
-              <el-date-picker v-model="edit_sick_history_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 150px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd "
-                              value-format="yyyy-MM-dd "></el-date-picker>
-
-
-              <label class="title" style="margin-left: 20px;"><span class="name">肾移植史</span> : </label>
-              <el-select style="width: 150px;" v-model="edit_is_shenyizhishi" placeholder="选择肾移植史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-            </div>
-
-            <div class="cell clearfix" style="margin-bottom: 20px;">
-
-              <label class="title" ><span class="name">腹膜透析史</span> : </label>
-              <el-select style="width: 150px;" v-model="edit_is_fumotouxishi" placeholder="选择腹膜透析史" >
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">医生</span> : </label>
-              <el-select style="width: 100px;" v-model="edit_doctor_id" placeholder="请选择医生">
-                <el-option v-for="(item,index) in doctorOptions" :label="item.name" :value="item.id" :key="index"></el-option>
-              </el-select>
-
-              <label class="title" style="margin-left: 20px;"><span class="name">过敏药物</span> : </label>
-              <el-select style="width: 100px;" v-model="edit_is_guominyaowu" placeholder="选择过敏药物">
-                <el-option label="无" value="0"></el-option>
-                <el-option label="有" value="1"></el-option>
-              </el-select>
-              <el-input v-if="edit_is_guominyaowu == 1" v-model="edit_guominyaowu_desc"></el-input>
-
-            </div>
-
-            <div class="cell clearfix">
-              <label class="title"><span class="name">病史模版</span> : </label>
-              <el-select v-model="select_template" placeholder="选择病史模板" @change="didSelectTemplate">
-                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
-                           :value="option.content"></el-option>
-              </el-select>
-            </div>
-
-            <div class="textarea_panel">
-              <keep-alive>
-                <editor ref="edit_neditor"
-                        id="editors"
-                        style="width: 100%"
-                        v-bind:r_content="edit_new_content"
-                >
-                </editor>
-              </keep-alive>
-            </div>
-
-
-            <div style="text-align: right; padding-right: 0px; padding-top: 20px; padding-bottom: 10px;">
-              <el-button @click="show_edit_dialog = false">取消</el-button>
-              <el-button type="primary"
-                         @click="modifyAction" :loading="uploading_new_record">保存
-              </el-button>
-            </div>
-          </div>
-        </div>
-      </el-dialog>
+     
+     
     </div>
   </div>
-  <!-- </div> -->
+ 
 </template>
 
 <script>
@@ -356,9 +212,9 @@ import ueditor from '@/components/Uedtior'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
  import print from 'print-js'
 import {
-  createSickHistoryRecord,
+  createNewSickHistoryRecord,
   deleteSickHistoryRecords,
-  GetSickHistoryRecords,
+  getNewSickHistory,
   ModifySickHistoryRecord,
 } from '@/api/patient'
 import { parseTime } from '@/utils'
@@ -402,7 +258,7 @@ export default {
       uploading_new_record: false,
       templates: this.$store.getters.configlist.sick_history,
       select_template:"",
-      new_content: '111111',
+      new_content: '',
       edit_new_content: '',
       edit_sick_history_time: '',
       selectingRows: [],
@@ -427,11 +283,15 @@ export default {
       yizhi_options:[{value:1,label:'无'},{value:2,label:'有'}],
       yishen_options:[],
       guomi_options:[{value:1,label:'无'},{value:2,label:'有'},{value:3,label:'不详'}],
-      tableData:[{index:1,date:'2024-11-12',doctor:'王启年'}],
+      tableData:[],
+      admin_user_id:"",
     }
   },
   created() {
+    this.admin_user_id = this.$store.getters.xt_user.user.id
+    
     this.patient_id = parseInt(this.$route.query.id)
+
     if (isNaN(this.patient_id) || this.patient_id <= 0) {
       this.$notify.error({
         title: '错误',
@@ -464,7 +324,7 @@ export default {
       '-' +
       (nowDay < 10 ? '0' + nowDay : nowDay)
 
-    this.requestSickHistory()
+    this.getlist()
     this.fetchAllDoctorAndNurse()
 
   },
@@ -476,6 +336,9 @@ export default {
     // },10)
   },
   methods: {
+    template_dele(){
+
+    },
     add_click(){
       this.disabled = false
       this.add_index = 1
@@ -529,29 +392,7 @@ export default {
         }
       });
     },
-    requestSickHistory: function() {
-      this.loading = true
-      let params = {
-        patient_id:this.patient_id,
-        start_time:this.start_time,
-        end_time:this.end_time,
-      }
-      GetSickHistoryRecords(params).then(rs => {
-        this.loading = false
-        var resp = rs.data
-        if (resp.state == 1) {
-          this.current_select_record = null
-          this.records = resp.data.records
-          this.doctors = resp.data.doctors
-          this.$refs.record_table.setCurrentRow(this.records[0])
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(error => {
-        this.loading = false
-        this.$message.error(error)
-      })
-    },
+  
 
     didChangeCurrentRecord: function(record) {
       this.current_select_record = record
@@ -577,16 +418,16 @@ export default {
       }
       this.uploading_new_record = true
       let params = {
-        id:this.edit_current_id,
+        id:this.id,
         patient_id: this.patient_id,
-        content: this.edit_new_content,
-        record_time: this.edit_sick_history_time + " 00:00:00",
-        title: this.edit_title,
-        is_shenyizhishi:this.edit_is_shenyizhishi,
-        is_fumotouxishi:this.edit_is_fumotouxishi,
-        is_guominyaowu:this.edit_is_guominyaowu,
-        guominyaowu_desc:this.edit_guominyaowu_desc,
-        doctor_id: this.edit_doctor_id
+        content: this.new_content,
+        record_time: this.sick_history_time +" 00:00:00",
+        title: this.title,
+        is_shenyizhishi:this.shen_yizhi,
+        is_fumotouxishi:this.shen_fumo,
+        is_guominyaowu:this.shen_guomi,
+        guominyaowu_desc:this.guominyaowu_desc,
+        doctor_id: this.admin_user_id
       }
 
       ModifySickHistoryRecord(params).then(rs => {
@@ -619,36 +460,30 @@ export default {
     },
 
     createAction: function() {
-      this.new_content = this.$refs.editor.content
+    
+      this.new_content = this.$refs.edit.contents
       if (this.new_content.length == 0) {
         this.$message.error('请填写病程内容')
         return
       }
-      this.uploading_new_record = true
       let params = {
         patient_id: this.patient_id,
         content: this.new_content,
-        record_time: this.sick_history_time +" 00:00:00",
+        record_time: this.start_time,
         title: this.title,
-        is_shenyizhishi:this.is_shenyizhishi,
-        is_fumotouxishi:this.is_fumotouxishi,
-        is_guominyaowu:this.is_guominyaowu,
+        is_shenyizhishi:this.shen_yizhi,
+        is_fumotouxishi:this.shen_fumo,
+        is_guominyaowu:this.shen_guomi,
         guominyaowu_desc:this.guominyaowu_desc,
-        doctor_id: this.doctor_id
+        doctor_id: this.admin_user_id
       }
-      createSickHistoryRecord(params).then(rs => {
-        this.uploading_new_record = false
-        this.$message.success("新增成功")
-        var resp = rs.data
-        if (resp.state == 1) {
-          this.records.unshift(resp.data.record)
-          this.show_dialog = false
-          this.new_content = ''
-          this.title = ''
-          this.$refs.record_table.setCurrentRow(this.records[0])
-        } else {
-          this.$message.error(resp.msg)
-        }
+      console.log("params-------------",params)
+      createNewSickHistoryRecord(params).then(response => {
+         if(response.data.state == 1){
+           var patientSickHistory = response.data.data.patientSickHistory
+           this.$message.success("保存成功!")
+           
+         }
 
       }).catch(error => {
         this.uploading_new_record = false
@@ -712,10 +547,6 @@ export default {
         this.loading = false
         this.$message.error(err)
       })
-    }, startTimeChange(val) {
-      this.requestSickHistory()
-    }, endTimeChange(val) {
-      this.requestSickHistory()
     },
     showDialog(){
       for(let i = 0; i < this.doctorOptions.length; i++){
@@ -760,6 +591,19 @@ export default {
         return
       }
       this.$router.push({ path: "/sickhistory/print?ids="+this.ids+"&patient_id="+this.patient_id});
+    },
+    getlist(){
+       var params = {
+        patient_id:this.patient_id
+       }
+       console.log("paraosm===============",params)
+      getNewSickHistory(params).then(response=>{
+        if(response.data.state ==1 ){
+          var list = response.data.data.list
+          console.log("类别===============",list)
+          this.tableData = list
+        } 
+      })
     }
   }
 }

static/ueditor/ueditor.config.js

@@ -229,9 +229,9 @@
         //]
 
         //打开右键菜单功能
-        //,enableContextMenu: true
+        // ,enableContextMenu: true
         //右键菜单的内容，可以参考plugins/contextmenu.js里边的默认菜单的例子，label留空支持国际化，否则以此配置为准
-        //,contextMenu:[
+        // ,contextMenu:[
         //    {
         //        label:'',       //显示的名称
         //        cmdName:'selectall',//执行的command命令，当点击这个右键菜单时
@@ -241,7 +241,7 @@
         //            //this.ui._dialogs['inserttableDialog'].open();
         //        }
         //    }
-        //]
+        // ]
 
         //快捷菜单
         //,shortcutMenu:["fontfamily", "fontsize", "bold", "italic", "underline", "forecolor", "backcolor", "insertorderedlist", "insertunorderedlist"]