Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

   })
 }
 
+
+export function deleteNewSickHistory(id,params){
+  
+  return request({
+    url:"/api/patient/deletenewsickhistory?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function saveSickHistoryTemplate(data){
+
+  return request({
+    url:"/api/patient/savesickhistorytemplate",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getSickHistoryTempalate(params){
+
+  return request({
+    url:"/api/patient/getsickhistorytemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function modifySickHistoryTemplate(data){
+
+  return request({
+    url:"/api/patient/modifysickhistorytemplate",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteSickHistoryTempalte(id,params){
+
+  return request({
+    url:"/api/patient/deletesickhistorytemplate?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function createNewCourseOfDiseaseRecord(data){
+
+  return request({
+    url:"/api/patient/createnewcourseofdiseaserecord",
+    method:"post",
+    data:data,
+  })
+}

src/xt_pages/Pharmacy/PatientDispensing.vue

     changevalue(row){
       var params = {
         id:row.ID,
-        zero_flag:row.zero_flag,
+        zero_flag:row.ZeroFlag,
       }
       changeZeroFlag(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/Pharmacy/drugCode.vue

                 this.tableData[i].is_medicine_name = "未发药"
              }
              this.tableData[i].specification_name = this.getDrugSpec(this.tableData[i].drug_id)
+
+             this.tableData[i].prescribing_numbers = ""
+
+             this.tableData[i].prescribing_numbers = this.tableData[i].prescribing_number + this.tableData[i].prescribing_number_unit
            }
         }
 

src/xt_pages/user/components/PatientSidebar.vue

               name: '3-1',
               label: '病史'
             },
-            // {
-            //   name: '3-4',
-            //   label: '病史新'
-            // },
+            {
+              name: '3-4',
+              label: '病史新'
+            },
             {
               name: '3-2',
               label: '体格检查'

src/xt_pages/user/courseOfDisease_new.vue

               <div style="flex: 1;">
                 记录时间:
                 <el-date-picker
-                  v-model="value1"
+                  v-model="record_date"
+                  type="date"
+                  format="yyyy-MM-dd"
                   :disabled="disabled"
-                  type="datetime"
-                  placeholder="选择日期时间">
+                  style="width: 150px;"
+                   value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
                 </el-date-picker>
               </div>
               <div style="flex: 1;">
                 病程医生:
-                <el-select v-model="value" placeholder="请选择" :disabled="disabled">
+                <el-select v-model="admin_user_id" placeholder="请选择" :disabled="disabled">
                   <el-option
-                    v-for="item in 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>
           </div>
         </div>
       </div>
+
+
       <el-dialog
         title="设置模板"
         :visible.sync="template_dialog"
                 <editor ref="editor"
                         id="editors"
                         style="width: 80%"
-                        v-bind:r_content="new_content"
+                        :content="new_content"
                         >
                 </editor>
               </keep-alive>
   const moment = require('moment')
   import { getDataConfig } from "@/utils/data";
   import {
-    createCourseOfDiseaseRecord,
+    createNewCourseOfDiseaseRecord,
     deleteCourseOfDiseaseRecords,
     getCourseOfDiseaseRecords,
     modifyCourseOfDiseaseRecord,
-    GetCoursePrintData,
     getPatientDialysisInfor
   } from '@/api/patient'
+  import { fetchAllDoctorAndNurse } from "@/api/doctor";
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
         ids:"",
         idArr:[],
         org_id:0,
-
-
         add_index:0,
         disabled:true,
         template_dialog:false,
         end_date:'',
         quzhi_options:[{value:1,label:'本周'},{value:2,label:'上周'},{value:3,label:'本月'},{value:4,label:'上周'},],
         tableData:[{index:1,date:'2024-11-12',doctor:'王启年'}],
+        admin_user_id:0,
+        record_date:""
       }
     },
     created() {
+      this.admin_user_id = this.$store.getters.xt_user.user.id
+      var now = new Date()
+      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
+
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.end_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
+      this.record_date = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
       this.patient_id = parseInt(this.$route.query.id)
       this.org_id = this.$store.getters.xt_user.template_info.org_id;
       if (isNaN(this.patient_id) || this.patient_id <= 0) {
         this.$router.push('/patients/patients')
         return
       }
-      // var now = new Date()
-      // this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
-
-      // var nowDate = new Date()
-      // var nowYear = nowDate.getFullYear()
-      // var nowMonth = nowDate.getMonth() + 1
-      // var nowDay = nowDate.getDate()
-      // this.end_time =nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
-      // nowDate.setMonth(nowDate.getMonth() - 1)
-      // nowYear = nowDate.getFullYear() -1
-      // nowMonth = nowDate.getMonth() + 1
-      // nowDay = nowDate.getDate()
-      // this.start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
-      this.start_time = moment().month(moment().month() - 6).startOf('month').format('YYYY-MM-DD');
-      console.log("start_time",this.start_time)
-      this.end_time = moment().endOf('month').format('YYYY-MM-DD');
-      console.log("end_time",this.end_time)
+     
+      // this.start_time = moment().month(moment().month() - 6).startOf('month').format('YYYY-MM-DD');
+      // console.log("start_time",this.start_time)
+      // this.end_time = moment().endOf('month').format('YYYY-MM-DD');
+      // console.log("end_time",this.end_time)
+      this.fetchAllDoctorAndNurse()
       this.requestCourseRecords()
+     
 
     },
     methods: {
+     fetchAllDoctorAndNurse() {
+       fetchAllDoctorAndNurse().then(response => {
+        if (response.data.state == 1) {
+          this.doctorOptions= []
+          this.doctorOptions = response.data.data.doctors;
+        }
+       });
+      },
       add_click(){
         this.add_index = 1
         this.disabled = false
       showSave(){
         this.add_index = 0
         this.disabled = true
+        saveNewCousreOfDisease().then(response=>{
+
+        })
       },
       template_click(){
         console.log('this.add_index',this.add_index);
       },
 
       createAction: function() {
-        this.new_content = this.$refs.editor.content
+        this.new_content = this.$refs.editor.contents
         console.log("hhhhh2h3h232323232",this.new_content)
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return
         }
-        this.uploading_new_record = true
-
-        createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
-          this.uploading_new_record = false
-          var resp = rs.data
-          if (resp.state == 1) {
-            this.records.unshift(resp.data.record)
-            // this.$refs.record_table.setCurrentRow()
-            // this.$refs.record_table.setCurrentRow(this.records[0])
-            // this.current_select_record = this.records[0]
-            this.show_dialog = false
-            this.new_content = ''
-            this.title = ''
+        var params = {
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          content:this.new_content,
+          admin_user_id:this.admin_user_id,
+        }
+        createNewCourseOfDiseaseRecord(params).then(response => {
+         if(response.data.state == 1){
 
-          } else {
-            this.$message.error(resp.msg)
-          }
+         }
 
         }).catch(error => {
-          this.uploading_new_record = false
-          this.$message.error(error)
+         
         })
       },
       didSelectTemplate: function(templateContent) {

src/xt_pages/user/sickHistory_new.vue

                   <el-button type="primary" size="small" @click="prints">打印</el-button>
                 </div>
                 <div v-if="add_index == 1">
-                  <el-button type="primary" size="small" @click="createAction">保存2</el-button>
+                  <el-button type="primary" size="small" @click="createAction">保存</el-button>
                   <el-button size="small" @click="showCancel">取消</el-button>
                 </div>
               </div>
                 <el-date-picker
                   v-model="start_time"
                   type="date"
+                  format="yyyy-MM-dd"
                   :disabled="disabled"
                   style="width: 150px;"
+                   value-format="yyyy-MM-dd"
                   placeholder="选择日期">
                 </el-date-picker>
               </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="edit" :content="new_content" id="editor"></ueditor>
+                <ueditor ref="editor" :content="new_content" id="editors" :disabled="disabled"></ueditor>
               </keep-alive>
             </div>
             <div style="text-align: right;margin-top:10px ;">
         </div>
 
       </div>
+
+
+
+
       <el-dialog
         title="设置模板"
         :visible.sync="template_dialog"
         </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
           <div style="display: flex;">
             <div style="width: 27%;">
               <el-table
-                :data="tableData"
+                 ref="record_table_one"
+                :data="templateList"
                 :highlight-current-row="true"
-                @row-click="rowclick"
+                @current-change="getCurrentChangeOne"
                 style="width: 100%">
-                <el-table-column
-                  prop="index"
-                  label="序号"
-                  width="">
+                <el-table-column prop="index" label="序号" width="" align="center">
+                  <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="" align="center">
+                  <template slot-scope="scope">
+                       {{ scope.row.title }}
+                   </template>
                 </el-table-column>
               </el-table>
             </div>
               <div class="Second_title">模板内容</div>
               <div style="">
                 <keep-alive>
-                  <ueditor ref="editor" id="editors" v-bind:r_content="new_content"></ueditor>
+                  <ueditor ref="editorOne" id="editors" :content="new_content"></ueditor>
                 </keep-alive>
               </div>
             </div>
         <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>
  import print from 'print-js'
 import {
   createNewSickHistoryRecord,
-  deleteSickHistoryRecords,
+  deleteNewSickHistory,
   getNewSickHistory,
-  ModifySickHistoryRecord
+  ModifySickHistoryRecord,
+  saveSickHistoryTemplate,
+  getSickHistoryTempalate,
+  modifySickHistoryTemplate,
+  deleteSickHistoryTempalte
 } from '@/api/patient'
 import { parseTime } from '@/utils'
 import BreadCrumb from '@/xt_pages/components/bread-crumb' 
       guomi_options:[{value:1,label:'无'},{value:2,label:'有'},{value:3,label:'不详'}],
       tableData:[],
       admin_user_id:"",
+      templateList:[],
+      template_content:"",
+      template_id:0,
     }
   },
   created() {
     this.fetchAllDoctorAndNurse()
 
   },
-  mounted(){
-    // setTimeout(()=>{
-      // console.log('1111222',this.new_content);
-
-    //   this.$refs.ue.parent.setDisabled()
-    // },10)
-  },
   methods: {
     template_dele(){
-
+     deleteSickHistoryTempalte(this.template_id).then(response=>{
+        if(response.data.state == 1){
+          var msg =  response.data.data.msg
+          this.$message.success("删除成功!")
+          this.getSickHistoryTempalateOne()
+        }
+     })
+    },
+    getSickHistoryTempalateOne(){
+      getSickHistoryTempalate().then(response=>{
+          if(response.data.state == 1){
+
+            this.templateList = []
+            this.templateList = response.data.data.templateList
+            if(this.templateList!=null && this.templateList.length>0){
+              this.$refs.record_table_one.setCurrentRow(this.templateList[0])
+            }
+          }
+        })
     },
     add_click(){
+      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
     },
       if(this.add_index ==0){
         this.template_dialog = true
       }else{
-        this.library_dialog = true
+        getSickHistoryTempalate().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)
+            
+          }
+        })
+     
       }
 
     },
     template_save(){
-      this.template_dialog = false
-      this.$message({
-        message: '模板设置成功',
-        type: 'success'
+       var params = {
+         template_id:this.template_id,
+         content:this.$refs.editorOne.contents
+       }
+      modifySickHistoryTemplate(params).then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           this.$message.success("保存成功!")
+           this.template_dialog = false
+         }
       })
+    
+    
     },
     prints(){
       const style ='@media print{.content{width:960px;margin:0 auto;font-size: 23px;}}'
       })
     },
 
-
-
-
     fetchAllDoctorAndNurse() {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
+          this.doctorOptions= []
           this.doctorOptions = response.data.data.doctors;
         }
       });
     },
   
-
     didChangeCurrentRecord: function(record) {
       this.current_select_record = record
     },
 
     createAction: function() {
     
-      this.new_content = this.$refs.edit.contents
+      console.log("hhhhhhhhhhhhhhhhhh",this.$refs)
+      this.new_content = this.$refs.editor.contents
       if (this.new_content.length == 0) {
         this.$message.error('请填写病程内容')
         return
       }
       let params = {
+        id:this.id,
         patient_id: this.patient_id,
         content: this.new_content,
         record_time: this.start_time,
         guominyaowu_desc:this.guominyaowu_desc,
         doctor_id: this.admin_user_id
       }
-      console.log("params-------------",params)
+     
       createNewSickHistoryRecord(params).then(response => {
          if(response.data.state == 1){
            var patientSickHistory = response.data.data.patientSickHistory
       console.log("select23322332",this.ids)
       this.selectingRows = selectRows
     },
-    deleteAction: function() {
-      if (this.selectingRows.length == 0) {
-        return
-      }
-      var ids = []
-      for (let index = 0; index < this.selectingRows.length; index++) {
-        const row = this.selectingRows[index]
-        ids.push(row.id)
-      }
-      var ids_str = ids.join(',')
-      this.loading = true
+    deleteAction(){
+        if(this.id == 0){
+          this.$message.error("请选择要删除的信息!")
+          return false
+        }
+        this.$confirm('确定要取消吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNewSickHistory(this.id).then(response=>{
+            if (response.data.state==1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功!")
+              this.getlist()
+            }
+          });
+        }).catch(() => {
 
-      let params={
-        patient_id:this.patient_id,
-        ids:ids_str,
-      }
+        });
 
-      deleteSickHistoryRecords(params).then(rs => {
-        var resp = rs.data
-        if (resp.state == 1) {
-          for (let id_index = 0; id_index < ids.length; id_index++) {
-            for (let record_index = 0; record_index < this.records.length; record_index++) {
-              if (ids[id_index] == this.records[record_index].id) {
-                this.records.splice(record_index, 1)
-                break
-              }
-            }
-          }
-          this.selectingRows = []
-          this.$message.success('已删除')
 
-        } else {
-          this.$message.error(resp.msg)
-        }
-        this.loading = false
-      }).catch(err => {
-        this.loading = false
-        this.$message.error(err)
-      })
-    },
+      },
+   
     showEdit() {
-      if (this.table_current_index == -1) {
-        this.$message.error('请选择要修改的病程内容')
-        return
-      }
-      this.edit_is_shenyizhishi = this.records[this.table_current_index].is_shenyizhi_history.toString()
-      this.edit_is_fumotouxishi = this.records[this.table_current_index].is_fumo_dialysis_history.toString()
-      this.edit_is_guominyaowu = this.records[this.table_current_index].is_hypersusceptibility.toString()
-      this.edit_guominyaowu_desc = this.records[this.table_current_index].hypersusceptibility_desc
-      this.edit_sick_history_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_doctor_id = this.records[this.table_current_index].doctor_id
-      console.log(this.edit_new_content )
-      this.edit_title = this.records[this.table_current_index].title//
-      this.show_edit_dialog = true
-
-      this.$refs.record_table.setCurrentRow(null)
-
+      this.add_index =1
+      this.disabled = false
+   
     }, tableRow({ row, rowIndex }) {
       // 把每一行的索引放进row
       row.index = rowIndex
       this.table_current_index = row.index
     },
     print(){
-      // if (this.table_current_index == -1) {
-      //   this.$message.error('请选择要打印的病程')
-      //   return
-      // }
       if(this.ids.length == 0){
         this.$message.error('请选择要打印的病程')
         return
       return uParseTime(time, '{y}-{m}-{d}')
     },
     getCurrentChange(val){
-      
-      console.log("new_content2222222222222222222---------------",val.content)
-      this.new_content = ""
-      this.new_content = val.content
-      // var ue = UE.getEditor('editor')
-      // ue.setContent(val.content)
-     
+      this.$refs.editor.contents = val.content
       this.record_time = this.getTime(val.record_time)
       this.id = val.id
       this.guominyaowu_desc = val.hypersusceptibility_desc
-      this.shen_fumo = val.is_fumo_dialysis_history
-      this.shen_yizhi  = val.is_shenyizhi_history
-      this.shen_guomi = val.is_hypersusceptibility
-      this.patient_id = val.patient_id
-     
-     
+      if(val.is_fumo_dialysis_history>0){
+        this.shen_fumo = val.is_fumo_dialysis_history
+      }
+      if(val.is_shenyizhi_history>0){
+        this.shen_yizhi  = val.is_shenyizhi_history
+      }
+      if(val.is_hypersusceptibility>0){
+        this.shen_guomi = val.is_hypersusceptibility
+      }
       
-    }
+      this.patient_id = val.patient_id
+      this.admin_user_id = val.admin_user_id
+    
+    },
+    getCurrentChangeOne(val){
+   
+      this.$refs.editorOne.contents = val.content
+      this.template_content = ""
+      this.template_content = val.content
+      this.template_id = val.id
+    },
+    saveTemplate(){
+   
+      var params = {
+        title:this.template_name,
+        content: this.$refs.editor.contents,
+      }
+   saveSickHistoryTemplate(params).then(response=>{
+      if(response.data.state == 1){
+        var sickHistoryTemplate =  response.data.data.sickHistoryTemplate
+        this.$message.success("保存成功!")
+        this.template_dialog = false
+      }
+     })
+   },
+   toContentPint(){
+    this.$refs.editor.contents = this.template_content
+    this.library_dialog = false
+   }
   }
 }
 </script>