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

   });
 }
 
-export function ExecDoctorAdvice(patient, id, time, mode) {
+export function ExecDoctorAdvice(patient, id, time, mode,origin) {
 
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
-    mode: mode
+    mode: mode,
+    origin:origin,
   };
   console.log("paras------",params)
   return request({
     }
   });
 }
-export function CheckDoctorAdvice(patient, id, mode) {
+export function  CheckDoctorAdvice(patient, id, mode,origin) {
   var params = {
     id: id,
     patient: patient,
-    mode: mode
+    mode: mode,
+    origin:origin,
     // execution_time: time,
   };
   return request({

src/api/his/his.js

 
 
 
+export function getNextOrLastHisPrescription (params) {
+  return request({
+    url: '/api/hisprescription/get',
+    method: 'get',
+    params:params,
+  })
+}
+
+
 
 
 

src/xt_pages/dialysis/details/NavIgation.vue

       :patient="patient"
       :admin_users="admin_users"
       :dialysis_order="dialysis_order"
+      :his_is_open="his_is_open"
     ></doctor-advice-dialog>
 
     <computer-dialog
       default: () => {
         return 0;
       }
+    },his_is_open:{
+      type: Number,
+      default: () => {
+        return 0;
+      }
     },
     patient: {
       // 患者信息
       this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
-      this.$refs.doctor_advice.show();
+      this.$refs.doctor_advice.show(this.his_is_open);
     },
     showComputerDialog: function() {
       this.$refs.computer_dialog.show(this.dialysis_order);
       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe);
+      this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe,this.his_is_open);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);

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

       <div class="txsj">
         <el-button
           round
+
           @click="openLast(3)"
         >上一方
         </el-button>
       <div class="txsj">
         <el-button
           round
+          v-if="his_is_open != 1"
           @click="openLast(1)"
         >上一方
         </el-button>
 
         <el-button
           round
+          v-if="his_is_open != 1"
           @click="openNext(2)"
         >下一方
         </el-button>
           round
           @click="openGroupFrom"
           :loading="deleLoading"
+          v-if="his_is_open != 1"
           :disabled="!is_has_create"
         >新增医嘱
         </el-button>
           :disabled="!is_has_exce"
           @click="execAdvice"
           :loading="deleLoading"
+
         >执行医嘱
         </el-button>
         <el-button v-else disabled round @click="execAdvice" :loading="deleLoading">执行医嘱</el-button>
         <el-button v-else disabled round @click="checkAdvice" :loading="deleLoading">医嘱核对</el-button>
 
         <el-button
-          v-if="groupSelectRow != null"
+
+          v-if="groupSelectRow != null || his_is_open != 1"
           :disabled="!is_has_modify && !is_has_modify_other"
           round
           @click="openEditGroupAdvice"
         <el-button v-else disabled round @click="openEditGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
 
         <el-button
-          v-if="groupSelectRow != null"
+          v-if="groupSelectRow != null ||  his_is_open != 1"
           :disabled="!is_has_del && !is_has_del_other"
           round
           @click="openDeleteGroupAdvice"
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table
+        v-if="his_is_open == 0"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
         border
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
-                <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
-                <el-dropdown-item @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
-                <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
           </template>
         </el-table-column>
       </el-table>
+      <el-table
+        v-else
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        :data="doctor_advices"
+        border
+        style="width: 100%"
+        v-show="showAdvicePanel"
+        ref="advices_list"
+        @row-click="cellMouseEnter"
+        :row-class-name="tableRowClassName"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        highlight-current-row
+      >
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link">
+                {{ getAdviceContent(scope.row, 1)}}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="execution_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="template_id != 6"
+          prop="checker"
+          min-width="30px"
+          align="center"
+          label="核对人员"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
+
       <!-- 医嘱列表 end -->
 
       <!-- 新医嘱列表 -->
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="药品规格：">        
+            <el-form-item label="药品规格：">
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
                   placeholder="请输入内容"
                   @input="changeDrugDesc"
                 ></el-autocomplete>
-                 
+
                 <el-select
                   v-model="form.drug_spec_unit"
                   style="width: 100px;"
         current_group_index: -1,
         title: '临时医嘱',
         add_title: '新增医嘱',
-
+        his_is_open:0,
         showAdviceForm: false,
         showAdvicePanel: true,
         showNameForm: false,
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
       doctor_advices: function() {
-        this.handleSpanTempArr()
-        this.hoverOrderArr = []
-        this.handleStyle()
+        // this.handleSpanTempArr()
+        // this.hoverOrderArr = []
+        // this.handleStyle()
       }
     },
     methods: {
               remark: ''
             }
             console.log("2223333",submitForm)
-           
+
             let mode = '1'
             CreateGroupAdvice(this.patientid, 0, submitForm, mode).then(
               response => {
       }
       ,
       submitExce() {
-        
+        console.log(this.currentRow.origin)
         if (this.currentRow == null) {
           this.$message.error('请先选择要执行的医嘱！')
           return false
         }
         this.exceLoading = true
         let mode = '6'
-        
-         console.log("222222",this.currentRow.id)
-        
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode).then(response => {
+
+
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode,this.currentRow.origin).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.exceLoading = false
           return false
         }
         let mode = '1'
-        
+
        if(this.src_type == ""){
           this.form.way = 0
           this.form.drug_id = 0
        }
 
         console.log("新增医嘱子药",this.form)
-       
+
         CreateDoctorAdvice(this.patient.id, this.form, mode)
           .then(response => {
             this.loading = false
       }
       ,
       checkAdvice() {
+        console.log(this.currentRow)
         // console.log(this.$store.getters.xt_user)
         if (this.currentRow == null) {
           this.$message.error('请先选择要核对的医嘱！')
             this.deleLoading = true
             let mode = '7'
 
-            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode).then(
+            CheckDoctorAdvice(this.patient.id, this.currentRow.id, mode,this.currentRow.origin).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
       }
       ,
       execAdvice() {
-        
+
         if (this.is_has_exce == false) {
           this.$message.error('你没有执行医嘱的权限')
           return false
           })
           .catch(() => {
           })
-        this.handleSpanTempArr()
+        // this.handleSpanTempArr()
       }
       ,
       openDelete(index, row) {
           }
         })
 
-        this.handleSpanTempArr()
-        this.handleStyle()
+        // this.handleSpanTempArr()
+        // this.handleStyle()
       }
       ,
       getXuserName(id) {
         this.$refs.addGroupForm.open()
       }
       ,
-      show() {
+      show(his_is_open) {
+        this.his_is_open = his_is_open
+        console.log(this.his_is_open)
         this.isVisibility = true
         this.getPermission()
       }
           } else {
             // 判断当前元素与上一个元素是否相同
             if (
-              this.doctor_advices[i].groupno ===
-              this.doctor_advices[i - 1].groupno
+              this.doctor_advices[i].created_time ===
+              this.doctor_advices[i - 1].created_time
             ) {
               this.tempArr[this.pos] += 1
               this.tempArr.push(0)
             }
           }
         }
-      }
-      ,
+      },
       cellMouseEnter: function(row, column, event) {
         console.log("数据是",row)
         this.currentRow = row
           if (index === 0) {
             sameRowArr.push([index])
           } else {
-            if (item.groupno === this.doctor_advices[index - 1].groupno) {
+            if (item.created_time === this.doctor_advices[index - 1].created_time) {
               sameRowArr[sIdx].push(index)
             } else {
               sIdx = sIdx + 1
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-     
+
         if (columnIndex === 0) {
           if (rowIndex % 2 === 0) {
             return {
 
             var doctor_advices = response.data.data.advices
             console.log("doctor_advices",doctor_advices)
-           
+
             this.other_doctor_advices = doctor_advices
             this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
             this.sch = response.data.data.schedule
             }else{
               this.form.drug_name_id = 0
             }
-           
+
           }
         }
       },
       this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
+    },mounted(){
+      console.log("~~~~~")
+      console.log(this.his_is_open)
+      console.log("~~~~~")
+
+
     },
     components: {
       AddGroupAdvice,

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

 
               <el-input v-model="dialysisPrescription.blood" @focus="showInnerDialog('6')"></el-input>
 
-              
+
             </el-form-item>
           </el-col>
 
             <!--</el-form-item>-->
           <!--</el-col>-->
 
-           
+
 
 
 
             //     this.InnerDialogProps.selected = arrtwo
             //     this.InnerDialogProps.isShowTextArea = false
             //     break
-            // }  
+            // }
         }
-      }, 
+      },
       innerDialogComfirm: function(val) {
         this.InnerDialogProps.visibility = false
         switch (val.type) {
       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
-      show(pre,schedual,last) {
+      show(pre,schedual,last,his_is_open) {
+        if(his_is_open == 1){
+          this.is_open = 0
+        }
         var date = new Date()
         var year = date.getFullYear()
         var month = date.getMonth() + 1
 
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
-          
+
             this.dialysisPrescription.niprocart = last.niprocart
             this.dialysisPrescription.jms = last.jms
             this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
-    
+
             console.log("第一")
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
               console.log("第三")
-              
+
               postPrescription(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
                     type: 'success',
                     duration: 2000
                   })
- 
+
                   const prescription_resp = response.data.data.prescription
                   // console.log("aaaaaaa", prescription_resp);
                   var prescription = this.prescription
                       duration: 2000
                     })
                     const params = {
-                   
+
                       advices: this.waitUploadAdvices,
                       advice_date: uParseTime(
                         this.$route.query.date,

src/xt_pages/dialysis/details/index.vue

         :special_premission="headNurses"
         @assessmentAfterDislysis="assessmentAfterDislysisFunc"
         :system_prescribe="system_prescribe"
+        :his_is_open="his_is_open"
       >
       </nav-igation>
 
       aliquid_info: [],
       config: {},
 
+      his_is_open:0,
+
       lastPredialysisEvaluation: { id: 0 },
       lastMonitorRecord: { id: 0 },
       lastAssessmentAfterDislysis: { id: 0 },
               }
 
               this.is_open = resp.data.is_open_remind
+              if(this.his_is_open == 1){
+                this.is_open = 0
+              }
               this.longAdvices = totalAdvice
               this.waitUploadAdvices = waitUploadAdvices
               break
           this.devices = resp.data.devices
           this.device_numbers = resp.data.device_numbers
 
+          var his_doctor_advices = resp.data.his_advices
+          this.his_is_open = resp.data.is_open_config.is_open
+          console.log(this.his_is_open)
+
+
+          for (let i = 0; i <  this.doctor_advices.length; i++){
+            this.doctor_advices[i]['origin'] = 1
+          }
+
+          if (his_doctor_advices != null) {
+            for (let i = 0; i < his_doctor_advices.length; i++) {
+              his_doctor_advices[i]['origin'] = 2
+              his_doctor_advices[i]['way'] = 1
+              this.doctor_advices.push(his_doctor_advices[i])
+            }
+          }
+
+
           var device_map = {}
           for (let index = 0; index < this.devices.length; index++) {
             const device = this.devices[index]

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
             <div class="RP">Rp</div>
+
+            <div style="float: right">
+            <el-button
+              round
+              @click="openLast(3)"
+            >上一方
+            </el-button>
+
+            <el-button
+              round
+              @click="openNext(4)"
+            >下一方
+            </el-button>
+            </div>
+
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>
                        :patientInfo="patientInfo" :additions="additions" ></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
+    <next-or-last-prescription></next-or-last-prescription>
+
   </div>
 </template>
 
     delHisPrescription,
     getInitData,
     getPatientInfo,
-    getSchedulePatientList
+    getSchedulePatientList,
+    getNextOrLastHisPrescription
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
   import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
+  import { uParseTime } from '@/utils/tools'
+  import NextOrLastPrescription from "./nextOrLastPrescription";
 
   export default {
     props: {
       },
     },
     components: {
+      NextOrLastPrescription,
       selectTemplate,
       saveTemplate,
       prescriptionTable,
           {value: 7,label: "其他"},
 
         ],
+        isLastOrNextVisible:false,
         multipleTableHeight:'',
         register_type: '',
         value: '0',
         departmentValue: '',
         total: 0,
         state1: '',
+        request_record_date:'',
         state2: '',
         customTabIndex: 1,
         options: [],
       }
     },
     methods: {
+      GetNextOrLastHisPrescription(params){
+        getNextOrLastHisPrescription(params).then(response => {
+          if (response.data.state == 1) {
+
+            // this.request_record_date = uParseTime(this.other_doctor_advices[0].record_date, '{y}-{m}-{d}')
+          } else {
+            this.$message.error(response.data.msg)
+
+          }
+        })
+
+
+      },
+      openLast(val) {
+        if (val == 1) {
+          this.isLastOrNextVisible = true
+          this.isVisibility = false
+          this.request_record_date = this.record_date
+
+          let params = {
+            patient_id: this.patientid,
+            record_time: this.request_record_date,
+            type: 1
+          }
+
+          this.GetNextOrLastHisPrescription(params)
+        } else if (val == 3) {
+
+          let params = {
+            patient_id: this.patientid,
+            record_time: this.request_record_date,
+            type: 1
+          }
+
+          this.GetNextOrLastHisPrescription(params)
+
+        }
+      },
+      openNext(val) {
+        if (val == 2) {
+          this.isLastOrNextVisible = true
+          this.isVisibility = false
+          this.request_record_date = this.record_date
+
+          let params = {
+            patient_id: this.patientid,
+            record_time: this.request_record_date,
+            type: 2
+          }
+
+          this.GetNextOrLastHisPrescription(params)
+        } else if (val == 4) {
+          let params = {
+            patient_id: this.patientid,
+            record_time: this.request_record_date,
+            type: 2
+          }
+          this.GetNextOrLastHisPrescription(params)
+
+        }
+      },
+
       selectTemplate(selection, row){
         this.tempDrugs = selection
 
             }
           }
         }
+        let templateDrugs=[]
+
+        for (let i = 0; i< this.tempDrugs.length;i++){
+          for (let a = 0; a < this.tempDrugs[i].advices.length; a++ ){
+            templateDrugs.push(this.tempDrugs[i].advices[a])
+          }
+        }
+
+        // for (let i = 0; i < templateDrugs.length; i++) {
+        //   for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+        //     if (this.templateDrugs[i].drug_id == this.curPrescriptions.advices[i].id) {
+        //       this.$message.error('改处方存在相同的药品，无法添加相同的药品')
+        //       return
+        //
+        //     }
+        //   }
+        // }
+
 
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
+
+            var temp3 = this.deepClone(templateDrugs)
+
+            if (temp3.length > 0) {
+              for (let b = 0; b < temp3.length; b++) {
+                let obj = {
+                  advice_id: 0,
+                  id: temp3[b].id,
+                  drug_name: temp3[b].advice_name,
+                  single_dose: temp3[b].single_dose,
+                  delivery_way: temp3[b].delivery_way,
+                  execution_frequency: temp3[b].execution_frequency,
+                  retail_price: temp3[b].drug.retail_price.toString(),
+                  remark: '',
+                  day:1,
+                  prescribing_number: temp3[b].prescribing_number,
+                  single_dose_unit: temp3[b].drug.min_unit,
+                  prescribing_number_unit: temp3[b].drug.max_unit,
+                  medical_insurance_number: temp3[b].drug.medical_insurance_number
+                }
+
+                if(obj.prescribing_number == 0 || obj.prescribing_number.length  == 0){
+                  obj.prescribing_number = 1
+                }
+                this.prescriptions[i].advices.push(obj)
+              }
+              this.curStatus = 1
+            }
+
+
+
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
         }
       }
     },mounted(){
+      this.request_record_date = this.record_date
       this.getInitData()
       //获取所有项目
       this.getlist()