2 Commits 76466655a7 ... 7478fa9a0a

Author SHA1 Message Date
  28169 7478fa9a0a Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch 3 days ago
  28169 fc22abdd3c Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch 3 days ago

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "2999.999.13757"
2
+  "version": "2999.999.13759"
3
 }
3
 }

+ 10 - 0
src/api/advice.js View File

1
 import request from '@/utils/request'
1
 import request from '@/utils/request'
2
 import { start } from 'chromedriver'
2
 import { start } from 'chromedriver'
3
+import { param } from 'jquery'
3
 
4
 
4
 export function getAdviceConfig () {
5
 export function getAdviceConfig () {
5
   return request({
6
   return request({
360
     method:"post",
361
     method:"post",
361
     data:data,
362
     data:data,
362
   })
363
   })
364
+}
365
+
366
+export function stopLongAdvice(params){
367
+
368
+  return request({
369
+    url:"/m/api/stoplongadvice",
370
+    method:"get",
371
+    params:params,
372
+  })
363
 }
373
 }

+ 83 - 13
src/pages/main/dialysis/Standingorder.vue View File

13
           <th width="60">医嘱内容</th>
13
           <th width="60">医嘱内容</th>
14
           <th width="60">推送频率</th>
14
           <th width="60">推送频率</th>
15
           <th width="50">是否停用</th>
15
           <th width="50">是否停用</th>
16
+          <th width="50">停用时间</th>
16
           
17
           
17
         </tr>
18
         </tr>
18
         <template v-for="(group, group_index) in advice_groups">
19
         <template v-for="(group, group_index) in advice_groups">
42
                     :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
43
                     :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
43
                     @click="selectAdviceAction(group_index, advice_index, advice)"
44
                     @click="selectAdviceAction(group_index, advice_index, advice)"
44
                   >
45
                   >
45
-                    <div class="txt">
46
+                    <div class="txt" v-if="advice.stop_state == 1" style="color: red">
47
+                      <span>{{advice.advice_name }}</span>
48
+                      <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
49
+                      <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
50
+                      <span v-if="advice.single_dose">{{advice.single_dose}}{{advice.single_dose_unit}}</span>
51
+                      <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
52
+
53
+                      <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
54
+                      <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
55
+                      <span
56
+                        v-if="advice.parent_id == 0 && advice.remark.length > 0"
57
+                      >({{advice.remark}})</span>
58
+                    </div>
59
+
60
+                    <div class="txt" v-if="advice.stop_state == 2 || advice.stop_state == 0">
46
                       <span>{{advice.advice_name }}</span>
61
                       <span>{{advice.advice_name }}</span>
47
                       <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
62
                       <span v-if="advice.advice_desc">({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
48
                       <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
63
                       <span v-if="advice.prescribing_number">&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
78
                   <span v-if="advice.stop_state==1">已停用</span>
93
                   <span v-if="advice.stop_state==1">已停用</span>
79
                   <span v-if="advice.stop_state==2">未停用</span>
94
                   <span v-if="advice.stop_state==2">未停用</span>
80
                   </td>
95
                   </td>
96
+
97
+                  <td
98
+                    :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
99
+                    @click="selectAdviceAction(group_index,advice_index, advice)"
100
+
101
+                  > 
102
+                    {{ uParseTime(advice.stop_time, '{y}-{m}-{d} {h}:{i}') }}
103
+                  </td>
81
                  
104
                  
82
                 </tr>
105
                 </tr>
83
               </template>
106
               </template>
149
         <div class="preserveBox">
172
         <div class="preserveBox">
150
           <div style="display: flex;justify-content: space-between;width: 100%;">
173
           <div style="display: flex;justify-content: space-between;width: 100%;">
151
               <span :class="{ forbid: is_has_create != true }" @click="showNew">新增</span>
174
               <span :class="{ forbid: is_has_create != true }" @click="showNew">新增</span>
152
-
175
+              <span :class="{ forbid: is_has_create != true }" @click="stopAdviceAction">停用</span>
153
               <span @click="openNewChild">添加子药</span>
176
               <span @click="openNewChild">添加子药</span>
154
               <span  @click="modifyAdviceAction">修改</span>
177
               <span  @click="modifyAdviceAction">修改</span>
155
               <span  @click="deleteAdviceAction">删除</span>
178
               <span  @click="deleteAdviceAction">删除</span>
179
+            
156
               <!-- <span v-if="his_is_open != 1 && user_type ==3" @click="checkAllAdvice">全部核对</span> -->
180
               <!-- <span v-if="his_is_open != 1 && user_type ==3" @click="checkAllAdvice">全部核对</span> -->
157
           </div>
181
           </div>
158
         </div>
182
         </div>
165
       close-on-click-action
189
       close-on-click-action
166
       @select="onCancelSheet"
190
       @select="onCancelSheet"
167
     />
191
     />
192
+
193
+    <mt-datetime-picker
194
+        class="datetimePicker"
195
+        ref="exec_time"
196
+        type="datetime"
197
+        @confirm="BatchHandleExecTime"
198
+        v-model="nowExecTime"
199
+      ></mt-datetime-picker> 
168
   </div>
200
   </div>
169
 </template>
201
 </template>
170
 
202
 
175
 import subDrugOrder from './components/subDrugOrder'
207
 import subDrugOrder from './components/subDrugOrder'
176
 import editDrugOrder from './components/editDrugOrder'
208
 import editDrugOrder from './components/editDrugOrder'
177
 import drugTemplate from "./components/drugTemplate.vue"
209
 import drugTemplate from "./components/drugTemplate.vue"
178
-import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient,deleteSelfAdvcieSubAdvice,getEditAdviceAction } from '@/api/advice'
210
+import { getAllMobileDrugList,getAdviceConfig,getLongDoctorAdviceByPatient,deleteSelfAdvcieSubAdvice,getEditAdviceAction,stopLongAdvice } from '@/api/advice'
179
 import { getDataConfig } from '@/utils/data'
211
 import { getDataConfig } from '@/utils/data'
180
 import { uParseTime } from "@/utils/tools";
212
 import { uParseTime } from "@/utils/tools";
181
 import { Dialog,Toast} from 'vant'
213
 import { Dialog,Toast} from 'vant'
189
     },
221
     },
190
     data(){
222
     data(){
191
       return{
223
       return{
224
+        nowExecTime: new Date(),
192
         org_id:'',
225
         org_id:'',
193
         is_has_create: true,
226
         is_has_create: true,
194
         sheetShow: false,
227
         sheetShow: false,
384
             })
417
             })
385
         })
418
         })
386
 
419
 
420
+      },
421
+      stopAdviceAction(){
422
+        if(this.current_advice ==null){
423
+          Toast.success('请选择要停用的医嘱!')
424
+        }
425
+        this.nowExecTime = new Date()
426
+        this.$refs.exec_time.open()
427
+
387
       },
428
       },
388
       showNew () {
429
       showNew () {
389
         this.sheetShow = true
430
         this.sheetShow = true
532
       this.current_advice_index = advice_index
573
       this.current_advice_index = advice_index
533
       this.current_advice = advice
574
       this.current_advice = advice
534
       },
575
       },
535
-      selectGroupAdviceAction: function (
536
-      group_index,
537
-      advice_index,
538
-      advice,
539
-      group
540
-    ) {
541
-      if (
542
-        this.current_group_index != -1 &&
543
-                this.current_group_index != group_index
544
-      ) {
576
+      selectGroupAdviceAction: function (group_index,advice_index,advice,group) {
577
+        console.log("group====================",group)
578
+      if (this.current_group_index != -1 &&this.current_group_index != group_index) {
579
+
545
         // 选择其他组,将原来的组选择状态清除
580
         // 选择其他组,将原来的组选择状态清除
546
         this.currentAdvices = []
581
         this.currentAdvices = []
547
         this.currentSubAdvices = []
582
         this.currentSubAdvices = []
578
       this.current_advice = advice
613
       this.current_advice = advice
579
 
614
 
580
     },
615
     },
616
+    BatchHandleExecTime(time){
617
+       var exceTime = this.handleTime(time)
618
+       var params = {
619
+        execution_time: exceTime,
620
+        patient_id:parseInt(this.$route.query.patient_id),
621
+        id:this.curerentAdvice.id,
622
+       }
623
+       console.log("params----",params)
624
+      stopLongAdvice(params).then(response=>{
625
+         if(response.data.state == 1){
626
+          Toast.success('停用成功!')
627
+          this.getLongDoctorAdviceByPatient()
628
+         }
629
+      })
630
+    },
631
+    handleTime (time) {
632
+      var year = time.getFullYear()
633
+      var month = time.getMonth() + 1
634
+      var day = time.getDate()
635
+      var hour = time.getHours()
636
+      var minute = time.getMinutes()
637
+      if (month < 10) {
638
+        month = '0' + month
639
+      }
640
+      if (day < 10) {
641
+        day = '0' + day
642
+      }
643
+      if (hour < 10) {
644
+        hour = '0' + hour
645
+      }
646
+      if (minute < 10) {
647
+        minute = '0' + minute
648
+      }
649
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':00'
650
+    },
581
    
651
    
582
     },
652
     },
583
     created(){
653
     created(){

+ 9 - 1
src/pages/main/newActionBar/dialysisPrescription.vue View File

2131
 
2131
 
2132
 
2132
 
2133
       //针对揭阳
2133
       //针对揭阳
2134
-      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 ){
2134
+      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){
2135
         if(this.predialysis!=undefined){
2135
         if(this.predialysis!=undefined){
2136
           if(this.$store.getters.user.template_info.org_id == 10702){
2136
           if(this.$store.getters.user.template_info.org_id == 10702){
2137
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2137
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2158
             if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
2158
             if(this.dialysisPrescription.prescription_water<=0 || this.dialysisPrescription.prescription_water==""){
2159
               this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
2159
               this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
2160
             }
2160
             }
2161
+          }else if(this.$store.getters.user.template_info.org_id == 10727){
2162
+            if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
2163
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
2164
+            }
2165
+          }else if(this.$store.getters.user.template_info.org_id == 10731){
2166
+            if(this.dialysisPrescription.target_ultrafiltration<=0 || this.dialysisPrescription.target_ultrafiltration==""){
2167
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight)*1000
2168
+            }
2161
           }else{
2169
           }else{
2162
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2170
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2163
               this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight
2171
               this.dialysisPrescription.target_ultrafiltration = this.predialysis.weight_before - this.predialysis.dry_weight

+ 2 - 2
src/pages/main/today/TodayTab.vue View File

2508
 
2508
 
2509
             this.is_project_open = resp.data.is_project_open_config.is_open
2509
             this.is_project_open = resp.data.is_project_open_config.is_open
2510
 
2510
 
2511
-            console.log("第二项目姐夫------------------------",this.project)
2511
+            // console.log("第二项目姐夫------------------------",this.project)
2512
 
2512
 
2513
-            console.log("第二项目开关-----------------",this.is_project_open)
2513
+            // console.log("第二项目开关-----------------",this.is_project_open)
2514
 
2514
 
2515
           //针对濉溪杏康
2515
           //针对濉溪杏康
2516
           if(this.$store.getters.user.template_info.org_id == 10721){
2516
           if(this.$store.getters.user.template_info.org_id == 10721){