新化需求

src/api/advice.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { start } from 'chromedriver'
 
 export function getAdviceConfig () {
   return request({
@@ -313,4 +314,50 @@ export function saveSelfChildDrugLongAdvice(data){
     method:"post",
     data:data,
   })
+}
+
+export function deleteSelfAdvcieSubAdvice(params){
+  
+  return request({
+    url:"/m/api/deleteselfadvicesubadvice",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getEditAdviceAction(params){
+  
+  return request({
+    url:"/m/api/geteditadviceaction",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function updateLongMobileAdvice(data){
+ 
+  return request({
+    url:"/m/api/updatelongmobileadvice",
+    method:"post",
+    data:data,
+  })
+}
+
+
+export function updateEditDrugOrder(data){
+
+  return request({
+    url:"/m/api/updateeditdrugorder",
+    method:"post",
+    data:data,
+  })
+}
+
+export function saveLongAdviceTemplate(data){
+ 
+  return request({
+    url:"/m/api/savelongadvicetemplate",
+    method:"post",
+    data:data,
+  })
 }

src/pages/main/dialysis/Standingorder.vue

@@ -11,8 +11,8 @@
           <th width="50">开嘱医生</th>
           <th width="60">开始时间</th>
           <th width="60">医嘱内容</th>
-          <th width="60">执行时间</th>
-          <th width="50">执行护士</th>
+          <th width="60">推送频率</th>
+          <th width="50">是否停用</th>
           
         </tr>
         <template v-for="(group, group_index) in advice_groups">
@@ -60,14 +60,23 @@
                   <td
                     :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
                     @click="selectAdviceAction(group_index,advice_index, advice)"
-                  >{{uParseTime(advice.execution_time, '{m}-{d} {h}:{i}')}}
+                  >
+                  <span v-if="advice.frequency_type==1">每次必推</span>
+                  <span v-if="advice.frequency_type==2 && advice.day_count>0">
+                      {{ advice.day_count }} 天/次
+                  </span>
+                  <span v-if="advice.frequency_type==3">
+                      {{ advice.week_day }}
+                  </span>
                   </td>
 
                   <td
                     :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
                     @click="selectAdviceAction(group_index,advice_index, advice)"
 
-                  > {{getAdviceName(advice.execution_staff)}}
+                  > 
+                  <span v-if="advice.stop_state==1">已停用</span>
+                  <span v-if="advice.stop_state==2">未停用</span>
                   </td>
                  
                 </tr>
@@ -108,10 +117,28 @@
       <van-popup v-model="doctorAdviceshow" get-container="#app" class="doctorAdvicePopup" style="z-index:3200;" position="top" :style="{ height: '100%' }">
                 <newAddOrder @close="closeDoctorAdviceshow" :drugList="drugList" :unitsOption="unitsOption" :delivery_way_options="deliveryWayOptions" :execution_frequency_options="executionFrequencyOptions"  @child-event="getClose"></newAddOrder>
       </van-popup>
+      <van-popup v-model="doctorEditAdviceshow" get-container="#app" class="doctorAdvicePopup" style="z-index:3200;" position="top" :style="{ height: '100%' }">
+                <editOrder @close="closeDoctorAdviceshowOne" :drugList="drugList" :unitsOption="unitsOption" :delivery_way_options="deliveryWayOptions"  :adviceObj="adviceObj" :execution_frequency_options="executionFrequencyOptions"  @child-event="getCloseFour"></editOrder>
+      </van-popup>
       <van-popup v-model="subDrugshow" get-container="#app" class="doctorAdvicePopup" style="z-index:3200;" position="top" :style="{ height: '100%' }">
-                <subDrugOrder ref="subdrug_form" @back="subDrugshow = false" :parent_id="parent_id" :drugList="drugList" :unitsOption="unitsOption" :delivery_way_options="deliveryWayOptions" :execution_frequency_options="executionFrequencyOptions" :groupno="groupno" @child-event="getCloseOne"></subDrugOrder>
-            </van-popup>
+              <subDrugOrder ref="subdrug_form" @back="subDrugshow = false" :parent_id="parent_id" :drugList="drugList" :unitsOption="unitsOption" :delivery_way_options="deliveryWayOptions" :execution_frequency_options="executionFrequencyOptions" :groupno="groupno" @child-event="getCloseOne"></subDrugOrder>
+       </van-popup>
+
+       <van-popup v-model="editDrugshow" get-container="#app" class="doctorAdvicePopup" style="z-index:3200;" position="top" :style="{ height: '100%' }">
+              <editDrugOrder ref="subdrug_form" @back="subDrugshow = false" :parent_id="parent_id" :drugList="drugList" :unitsOption="unitsOption" :delivery_way_options="deliveryWayOptions" :execution_frequency_options="executionFrequencyOptions" :groupno="groupno" @child-event="getCloseTwo" :adviceObj="adviceObj"></editDrugOrder>
+       </van-popup>
+
+       <van-popup v-model="adviceTemplateShow" get-container="#app" class="doctorAdvicePopup" style="z-index:3200;" position="top" :style="{ height: '100%' }">
+            <drugTemplate
+            @back="adviceTemplateShow = false"
+            @finish="didSelectTemplateAdvice"
+            :templates="adviceTemplates"
+            @child-event="getCloseThree"
+           >
+          </drugTemplate>
+       </van-popup>
     </div>
+
     <div>
         <div class="preserveBox" >
           <div style="margin: 0 auto;">
@@ -142,16 +169,23 @@
 </template>
 
 <script>
+
 import newAddOrder from './components/newAddOrder'
+import editOrder from './components/editOrder.vue'
 import subDrugOrder from './components/subDrugOrder'
-import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient } from '@/api/advice'
+import editDrugOrder from './components/editDrugOrder'
+import drugTemplate from "./components/drugTemplate.vue"
+import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient,deleteSelfAdvcieSubAdvice,getEditAdviceAction } from '@/api/advice'
 import { getDataConfig } from '@/utils/data'
 import { uParseTime } from "@/utils/tools";
-import { Toast} from 'vant'
+import { Dialog,Toast} from 'vant'
   export default{
     components:{
       newAddOrder,
-      subDrugOrder
+      subDrugOrder,
+      editOrder,
+      editDrugOrder,
+      drugTemplate
     },
     data(){
       return{
@@ -160,7 +194,7 @@ import { Toast} from 'vant'
         sheetShow: false,
         subDrugshow: false,
         doctorAdviceshow:false,
-        actions: [{ name: '选择模板' }, { name: '新增医嘱' }],
+        actions: [{name: '选择模版'},{ name: '新增医嘱' }],
         drugList:[],
         unitsOption:[],
         deliveryWayOptions: [],
@@ -180,9 +214,17 @@ import { Toast} from 'vant'
         currentSubAdvices: [],
         parent_id:0,
         groupno:0,
+        doctorEditAdviceshow:false,
+        adviceObj:{},
+        editDrugshow:false,
+        adviceTemplateShow:false,
+        adviceTemplates: [],
       }
     },
     methods:{
+      didSelectTemplateAdvice(){
+
+      },
       uParseTime (time, format) {
       if (time == 0) {
         return ''
@@ -193,7 +235,6 @@ import { Toast} from 'vant'
        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       },
       getClose(){
-        console.log("hhahahah")
         this.doctorAdviceshow = false
         this.getLongDoctorAdviceByPatient()
       },
@@ -201,19 +242,77 @@ import { Toast} from 'vant'
         this.subDrugshow= false
         this.getLongDoctorAdviceByPatient()
       },
+      getCloseTwo(){
+        this.editDrugshow= false
+        this.getLongDoctorAdviceByPatient()
+      },
+      getCloseThree(){
+        this.adviceTemplateShow = false
+        this.getLongDoctorAdviceByPatient()
+      },
+      getCloseFour(){
+        this.doctorEditAdviceshow = false
+        this.getLongDoctorAdviceByPatient()
+      },
       // 修改子医嘱
-      modifySubdviceAction(){},
-      // 删除子医嘱
-      deleteSubAdviceAction(){},
+      modifySubdviceAction(){
+        if(this.current_advice.parent_id == 0){
+          Toast.fail('请不要勾选主药')
+          return
+        }
+        var params = {
+          id:this.current_advice.id
+        }
+        getEditAdviceAction(params).then(response=>{
+          if(response.data.state == 1){
+             var advice = response.data.data.advice
+             this.adviceObj = advice
+             this.drugList = []
+             this.drugList = response.data.data.drugList
+             console.log("医嘱详情--------------------",advice)
+             this.editDrugshow = true
+          }
+        })
+      },
+      deleteSubAdviceAction: function () {
+        if(this.current_advice!=null){
+           if(this.current_advice.parent_id == 0){
+             Toast.fail('所属医嘱不是子药，无法删除')
+             return
+           }
+        }
+        var params = {
+          id:this.current_advice.id
+        }
+        Dialog.confirm({
+          title: '删除医嘱',
+          message: '确认删除医嘱吗?'
+        }).then(() => {
+          Toast.loading({forbidClick: true, duration: 0})
+          deleteSelfAdvcieSubAdvice(params).then(response => {
+              if(response.data.state == 1) {
+                var msg = response.data.data.msg
+                Toast.success('删除成功!')
+                this.getLongDoctorAdviceByPatient()
+              } else {
+                Toast.fail(response.data.msg)
+              }
+            }).catch(err => {
+              Toast.fail(err)
+            })
+        })
+      },
       // 添加子药
       openNewChild(){
         this.current_advice = this.currentAdvices[0]
         if(this.currentAdvices.length == 0){
           Toast.fail('请选中1条医嘱')
+          return
         }
         console.log("hahhahahah",this.current_advice)
         if(this.current_advice.parent_id>0){
           Toast.fail('所属医嘱为子药无法再添加子药')
+          return
         }
         this.parent_id = this.current_advice.id
         this.groupno = this.current_advice.groupno
@@ -231,13 +330,61 @@ import { Toast} from 'vant'
       
       },
       // 修改
-      modifyAdviceAction(){},
+      modifyAdviceAction(){
+        if(this.current_advice.parent_id >0){
+          Toast.fail('请不要勾选子药')
+          return
+        }
+        var params = {
+          id:this.current_advice.id
+        }
+        getEditAdviceAction(params).then(response=>{
+          if(response.data.state == 1){
+             var advice = response.data.data.advice
+             this.adviceObj = advice
+             this.drugList = []
+             this.drugList = response.data.data.drugList
+             console.log("医嘱详情--------------------",advice)
+             this.doctorEditAdviceshow = true
+          }
+        })
+      
+      },
       // 删除
-      deleteAdviceAction(){},
+      deleteAdviceAction(){
+        if(this.current_advice!=null){
+           if(this.current_advice.parent_id > 0){
+             Toast.fail('所属医嘱是子药，无法删除')
+             return
+           }
+        }
+        var params = {
+          id:this.current_advice.id
+        }
+        Dialog.confirm({
+          title: '删除医嘱',
+          message: '确认删除医嘱吗?'
+        }).then(() => {
+          Toast.loading({forbidClick: true, duration: 0})
+          deleteSelfAdvcieSubAdvice(params).then(response => {
+              if(response.data.state == 1) {
+                var msg = response.data.data.msg
+                Toast.success('删除成功!')
+                this.getLongDoctorAdviceByPatient()
+              } else {
+                Toast.fail(response.data.msg)
+              }
+            }).catch(err => {
+              Toast.fail(err)
+            })
+        })
+
+      },
       showNew () {
         this.sheetShow = true
       },
       onCancelSheet (action, index) {
+        console.log("aciton-====",action)
         if (action.name == '新增医嘱') {
           getAllMobileDrugList().then(response=>{
             if(response.data.state ==1){
@@ -248,14 +395,17 @@ import { Toast} from 'vant'
               this.doctorAdviceshow = true
             }
           })
-         
-        } else if (action.name == '选择模板') {
+        } else if (action.name == '选择模版') {
+          console.log("选择模版-----------------------")
           this.adviceTemplateShow = true
         }
       },
       closeDoctorAdviceshow () {
         this.doctorAdviceshow = false
       },
+      closeDoctorAdviceshowOne(){
+       this.doctorEditAdviceshow = false
+      },
       getAdviceConfig () {
         getAdviceConfig().then(response => {
         if (response.data.state == 1) {

src/pages/main/dialysis/components/subDrugOrder.vue

@@ -327,7 +327,7 @@ export default {
             parent_id:this.parent_id,
             advice_name:this.order.title,
             advice_desc:this.order.advice_desc,
-            prescribing_number:this.order.prescribing_number,
+            prescribing_number:parseInt(this.order.prescribing_number),
             prescribing_number_unit:this.order.prescribing_number_unit,
             single_dose:this.order.single_dose,
             single_dose_unit:this.order.single_dose_unit,

src/pages/main/newActionBar/assessmentAfter.vue

@@ -197,7 +197,7 @@
                 <van-field v-model="formValue.observation_content_other" @focus="inputFocus" v-if="formValue.patient_gose==3&&isShow('其他观察内容')" :required="formValue.patient_gose==3&&isShow_title('其他观察内容')" label="其他观察内容" input-align="right"/>
                 <van-field v-model="formValue.actual_displacement" @focus="inputFocus" :required="isShow_title('实际置换量')" v-if="isShow('实际置换量') && (prescription_prop.mode_id == 2 || prescription_prop.mode_id == 5 || prescription_prop.mode_id == 12 || prescription_prop.mode_id == 13 || prescription_prop.mode_id == 28 || prescription_prop.mode_id == 10 )" type="number" input-align="right">
                     <template #label>
-                        <span v-if="template_id == 20 || template_id == 21 ||  $store.getters.user.template_info.org_id == 10702">实际置换量(ml)</span>
+                        <span v-if="template_id == 20 || template_id == 21">实际置换量(ml)</span>
                         <span v-else>实际置换量(L)</span>
                     </template>
                 </van-field>

src/pages/main/today/assessmentAfter.vue

@@ -94,7 +94,7 @@
         <li v-if="isShow('实际置换量')">
           <label for="sjzhl">实际置换量 : </label>
           <span id="sjzhl" class="content">{{actual_displacement?actual_displacement:''}}</span>
-          <span class="unit" v-if="template_id != 8 && template_id != 13 && template_id != 40 && template_id != 41 && template_id!=38 && $store.getters.user.template_info.org_id!=10445 && $store.getters.user.template_info.org_id!=10629">{{actual_displacement?'ml':''}}</span>
+          <span class="unit" v-if="template_id != 8 && template_id != 13 && template_id != 40 && template_id != 41 && template_id!=38 && $store.getters.user.template_info.org_id!=10445 && $store.getters.user.template_info.org_id!=10629 && $store.getters.user.template_info.org_id!=10702">{{actual_displacement?'ml':''}}</span>
           <span class="unit" v-else>{{actual_displacement?'L':''}}</span>
         </li>
         <li v-if="isShow('透后症状')">