28169 6 days ago
parent
commit
7c7d23d48c

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue View File

1907
                 this.records[i].his_advices.forEach((item,index)=>{
1907
                 this.records[i].his_advices.forEach((item,index)=>{
1908
                   // console.log("itemwowowowowo",item)
1908
                   // console.log("itemwowowowowo",item)
1909
                   let { new_groupno } = item
1909
                   let { new_groupno } = item
1910
-                  if(item.delivery_way !='口服' && item.delivery_way!='中药口服'){
1910
+                  if(item.delivery_way !='口服' && item.delivery_way!='中药口服' && item.advice_name.indexOf('胰岛素')==-1){
1911
                     if(item.execution_frequency.indexOf('上机前')==-1){
1911
                     if(item.execution_frequency.indexOf('上机前')==-1){
1912
                       if(!objInfo[new_groupno] ){
1912
                       if(!objInfo[new_groupno] ){
1913
                       console.log('66666666',item);
1913
                       console.log('66666666',item);

+ 1 - 1
src/xt_pages/dialysis/doctorAdvicePrintTwo.vue View File

144
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
144
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
145
                         hisAdvices[i].doctor_advice[j].sort = 0
145
                         hisAdvices[i].doctor_advice[j].sort = 0
146
                         hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
146
                         hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
147
-                        if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
147
+                        if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服' && hisAdvices[i].doctor_advice[j].advice_name.indexOf('胰岛素')==-1){
148
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
148
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
149
                              newArr.push(hisAdvices[i].doctor_advice[j])
149
                              newArr.push(hisAdvices[i].doctor_advice[j])
150
                           }
150
                           }

+ 1 - 1
src/xt_pages/dialysis/newDoctorAdvice.vue View File

1550
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1550
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1551
        }
1551
        }
1552
 
1552
 
1553
-       if(this.org_id == 10721){
1553
+       if(this.org_id == 10721 || this.org_id == 0){
1554
          this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1554
          this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1555
        }
1555
        }
1556
 
1556
 

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue View File

2552
           var docArr = []
2552
           var docArr = []
2553
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
2553
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
2554
             for(let i=0;i<this.doctor_advices.length;i++){
2554
             for(let i=0;i<this.doctor_advices.length;i++){
2555
-              if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
2555
+              if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'&& this.doctor_advices[i].advice_name.indexOf('胰岛素')==-1){
2556
                 if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
2556
                 if(this.doctor_advices[i].execution_frequency.indexOf("上机前") == -1 ){
2557
                   docArr.push(this.doctor_advices[i])
2557
                   docArr.push(this.doctor_advices[i])
2558
                  }
2558
                  }

+ 16 - 11
src/xt_pages/user/inspection.vue View File

911
       var today = new Date()
911
       var today = new Date()
912
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
912
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
913
       this.form.formItem = []
913
       this.form.formItem = []
914
+
915
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.project.inspection_reference)
914
       for (var index in this.project.inspection_reference) {
916
       for (var index in this.project.inspection_reference) {
915
-        // var formItem = this.project.inspection_reference[index];
916
-        // formItem["value"] = '';
917
-        // if (formItem.range_type==2) {
918
-        //   formItem["select_options"] = formItem.range_options.split(",");
919
-        // }
917
+        var item_id =0
918
+        if(this.project.inspection_reference[index].item_id == 0){
919
+            item_id =  parseInt(this.project.inspection_reference[index].id) 
920
+        }
921
+        if(this.project.inspection_reference[index].item_id > 0){
922
+          item_id = parseInt(this.project.inspection_reference[index].item_id) 
923
+        }
920
         this.form.formItem.push({
924
         this.form.formItem.push({
921
           id: 0,
925
           id: 0,
922
           project_id: this.project.inspection_reference[index].project_id,
926
           project_id: this.project.inspection_reference[index].project_id,
923
           project_name: this.project.inspection_reference[index].project_name,
927
           project_name: this.project.inspection_reference[index].project_name,
924
-          item_id: this.project.inspection_reference[index].id,
928
+          item_id:item_id,
925
           item: this.project.inspection_reference[index].item,
929
           item: this.project.inspection_reference[index].item,
926
           item_name: this.project.inspection_reference[index].item_name,
930
           item_name: this.project.inspection_reference[index].item_name,
927
           range_type: this.project.inspection_reference[index].range_type,
931
           range_type: this.project.inspection_reference[index].range_type,
1023
             this.$message.error('未填写项目')
1027
             this.$message.error('未填写项目')
1024
             return false
1028
             return false
1025
           }
1029
           }
1026
-          for (var index in this.form.formItem) {
1027
-            this.form.formItem[index].value =
1028
-              '' + this.form.formItem[index].value
1029
-          }
1030
+          for (var index in this.form.formItem) {this.form.formItem[index].value ='' + this.form.formItem[index].value}
1031
+
1032
+          console.log("this.form",this.form)
1033
+
1034
+         
1030
           CreatePatientInspection(
1035
           CreatePatientInspection(
1031
             this.patientID,
1036
             this.patientID,
1032
             this.form,
1037
             this.form,
1352
                 console.log('执行0',inspectionsMap[items[index].id]);
1357
                 console.log('执行0',inspectionsMap[items[index].id]);
1353
 
1358
 
1354
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1359
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1355
-                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 ){
1360
+                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
1356
                     item.value = inspectionsMap[items[index].id].inspect_value
1361
                     item.value = inspectionsMap[items[index].id].inspect_value
1357
                     item.item_name = inspectionsMap[items[index].id].item_name
1362
                     item.item_name = inspectionsMap[items[index].id].item_name
1358
                   }else{
1363
                   }else{

+ 5 - 1
src/xt_pages/user/lapsoSummary.vue View File

322
               </el-col>
322
               </el-col>
323
               <el-col :span="24" v-if="lapseto == 2  || lapseto == 3 || lapseto == 4 || lapseto ==11">
323
               <el-col :span="24" v-if="lapseto == 2  || lapseto == 3 || lapseto == 4 || lapseto ==11">
324
                   <el-form-item label="转归类型:"> 
324
                   <el-form-item label="转归类型:"> 
325
-                      <el-radio-group style="padding: 10px;" v-model="lapse_type">
325
+                      <el-radio-group style="padding: 10px;" v-model="lapse_type" :disabled="true">
326
                           <el-radio  label="1">转入</el-radio>
326
                           <el-radio  label="1">转入</el-radio>
327
+                          <el-radio  label="2">转出</el-radio>
328
+                          <el-radio  label="3">死亡</el-radio>
329
+                          <el-radio  label="4">院内转诊</el-radio>
330
+                          <el-radio  label="11">请假</el-radio>
327
                     </el-radio-group>
331
                     </el-radio-group>
328
                   </el-form-item>
332
                   </el-form-item>
329
               </el-col>
333
               </el-col>

+ 13 - 13
src/xt_permission.js View File

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))