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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13757"
+  "version": "2999.999.13759"
 }

src/api/advice.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 import { start } from 'chromedriver'
+import { param } from 'jquery'
 
 export function getAdviceConfig () {
   return request({
@@ -360,4 +361,13 @@ export function saveLongAdviceTemplate(data){
     method:"post",
     data:data,
   })
+}
+
+export function stopLongAdvice(params){
+
+  return request({
+    url:"/m/api/stoplongadvice",
+    method:"get",
+    params:params,
+  })
 }

src/pages/main/dialysis/Standingorder.vue

@@ -13,6 +13,7 @@
           <th width="60">医嘱内容</th>
           <th width="60">推送频率</th>
           <th width="50">是否停用</th>
+          <th width="50">停用时间</th>
           
         </tr>
         <template v-for="(group, group_index) in advice_groups">
@@ -42,7 +43,21 @@
                     :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
                     @click="selectAdviceAction(group_index, advice_index, advice)"
                   >
-                    <div class="txt">
+                    <div class="txt" v-if="advice.stop_state == 1" style="color: red">
+                      <span>{{advice.advice_name }}</span>
+                      <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
+                      <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                      <span v-if="advice.single_dose">{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                      <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+
+                      <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
+                      <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
+                      <span
+                        v-if="advice.parent_id == 0 && advice.remark.length > 0"
+                      >({{advice.remark}})</span>
+                    </div>
+
+                    <div class="txt" v-if="advice.stop_state == 2 || advice.stop_state == 0">
                       <span>{{advice.advice_name }}</span>
                       <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
                       <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
@@ -78,6 +93,14 @@
                   <span v-if="advice.stop_state==1">已停用</span>
                   <span v-if="advice.stop_state==2">未停用</span>
                   </td>
+
+                  <td
+                    :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
+                    @click="selectAdviceAction(group_index,advice_index, advice)"
+
+                  > 
+                    {{ uParseTime(advice.stop_time, '{y}-{m}-{d} {h}:{i}') }}
+                  </td>
                  
                 </tr>
               </template>
@@ -149,10 +172,11 @@
         <div class="preserveBox">
           <div style="display: flex;justify-content: space-between;width: 100%;">
               <span :class="{ forbid: is_has_create != true }" @click="showNew">新增</span>
-
+              <span :class="{ forbid: is_has_create != true }" @click="stopAdviceAction">停用</span>
               <span @click="openNewChild">添加子药</span>
               <span  @click="modifyAdviceAction">修改</span>
               <span  @click="deleteAdviceAction">删除</span>
+            
               <!-- <span v-if="his_is_open != 1 && user_type ==3" @click="checkAllAdvice">全部核对</span> -->
           </div>
         </div>
@@ -165,6 +189,14 @@
       close-on-click-action
       @select="onCancelSheet"
     />
+
+    <mt-datetime-picker
+        class="datetimePicker"
+        ref="exec_time"
+        type="datetime"
+        @confirm="BatchHandleExecTime"
+        v-model="nowExecTime"
+      ></mt-datetime-picker> 
   </div>
 </template>
 
@@ -175,7 +207,7 @@ import editOrder from './components/editOrder.vue'
 import subDrugOrder from './components/subDrugOrder'
 import editDrugOrder from './components/editDrugOrder'
 import drugTemplate from "./components/drugTemplate.vue"
-import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient,deleteSelfAdvcieSubAdvice,getEditAdviceAction } from '@/api/advice'
+import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient,deleteSelfAdvcieSubAdvice,getEditAdviceAction,stopLongAdvice } from '@/api/advice'
 import { getDataConfig } from '@/utils/data'
 import { uParseTime } from "@/utils/tools";
 import { Dialog,Toast} from 'vant'
@@ -189,6 +221,7 @@ import { Dialog,Toast} from 'vant'
     },
     data(){
       return{
+        nowExecTime: new Date(),
         org_id:'',
         is_has_create: true,
         sheetShow: false,
@@ -384,6 +417,14 @@ import { Dialog,Toast} from 'vant'
             })
         })
 
+      },
+      stopAdviceAction(){
+        if(this.current_advice ==null){
+          Toast.success('请选择要停用的医嘱!')
+        }
+        this.nowExecTime = new Date()
+        this.$refs.exec_time.open()
+
       },
       showNew () {
         this.sheetShow = true
@@ -532,16 +573,10 @@ import { Dialog,Toast} from 'vant'
       this.current_advice_index = advice_index
       this.current_advice = advice
       },
-      selectGroupAdviceAction: function (
-      group_index,
-      advice_index,
-      advice,
-      group
-    ) {
-      if (
-        this.current_group_index != -1 &&
-                this.current_group_index != group_index
-      ) {
+      selectGroupAdviceAction: function (group_index,advice_index,advice,group) {
+        console.log("group====================",group)
+      if (this.current_group_index != -1 &&this.current_group_index != group_index) {
+
         // 选择其他组，将原来的组选择状态清除
         this.currentAdvices = []
         this.currentSubAdvices = []
@@ -578,6 +613,41 @@ import { Dialog,Toast} from 'vant'
       this.current_advice = advice
 
     },
+    BatchHandleExecTime(time){
+       var exceTime = this.handleTime(time)
+       var params = {
+        execution_time: exceTime,
+        patient_id:parseInt(this.$route.query.patient_id),
+        id:this.curerentAdvice.id,
+       }
+       console.log("params----",params)
+      stopLongAdvice(params).then(response=>{
+         if(response.data.state == 1){
+          Toast.success('停用成功!')
+          this.getLongDoctorAdviceByPatient()
+         }
+      })
+    },
+    handleTime (time) {
+      var year = time.getFullYear()
+      var month = time.getMonth() + 1
+      var day = time.getDate()
+      var hour = time.getHours()
+      var minute = time.getMinutes()
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      if (hour < 10) {
+        hour = '0' + hour
+      }
+      if (minute < 10) {
+        minute = '0' + minute
+      }
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':00'
+    },
    
     },
     created(){

src/pages/main/newActionBar/dialysisPrescription.vue

@@ -2131,7 +2131,7 @@ export default {
 
 
       //针对揭阳
-      if(this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10635 ){
+      if(this.$store.getters.user.template_info.org_id == 10597 || this.$store.getters.user.template_info.org_id == 10679 || this.$store.getters.user.template_info.org_id == 10702 || this.$store.getters.user.template_info.org_id == 10635 || this.$store.getters.user.template_info.org_id == 10721){
         if(this.predialysis!=undefined){
           if(this.$store.getters.user.template_info.org_id == 10702){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
@@ -2158,6 +2158,14 @@ export default {
             if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
               this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
+          }else if(this.$store.getters.user.template_info.org_id == 10727){
+            if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+            }
+          }else if(this.$store.getters.user.template_info.org_id == 10731){
+            if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
+            }
           }else{
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight

src/pages/main/today/TodayTab.vue

@@ -2508,9 +2508,9 @@ export default {
 
             this.is_project_open = resp.data.is_project_open_config.is_open
 
-            console.log("第二项目姐夫------------------------",this.project)
+            // console.log("第二项目姐夫------------------------",this.project)
 
-            console.log("第二项目开关-----------------",this.is_project_open)
+            // console.log("第二项目开关-----------------",this.is_project_open)
 
           //针对濉溪杏康
           if(this.$store.getters.user.template_info.org_id == 10721){