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

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

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

src/xt_pages/dialysis/doctorAdvicePrintTwo.vue

@@ -144,7 +144,7 @@ export default {
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
                         hisAdvices[i].doctor_advice[j].sort = 0
                         hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
-                        if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
+                        if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服' && hisAdvices[i].doctor_advice[j].advice_name.indexOf('胰岛素')==-1){
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
                              newArr.push(hisAdvices[i].doctor_advice[j])
                           }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1550,7 +1550,7 @@ export default {
         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} });
        }
 
-       if(this.org_id == 10721){
+       if(this.org_id == 10721 || this.org_id == 0){
          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} });
        }
 

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

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

src/xt_pages/user/inspection.vue

@@ -911,17 +911,21 @@ export default {
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
+
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.project.inspection_reference)
       for (var index in this.project.inspection_reference) {
-        // var formItem = this.project.inspection_reference[index];
-        // formItem["value"] = '';
-        // if (formItem.range_type==2) {
-        //   formItem["select_options"] = formItem.range_options.split(",");
-        // }
+        var item_id =0
+        if(this.project.inspection_reference[index].item_id == 0){
+            item_id =  parseInt(this.project.inspection_reference[index].id) 
+        }
+        if(this.project.inspection_reference[index].item_id > 0){
+          item_id = parseInt(this.project.inspection_reference[index].item_id) 
+        }
         this.form.formItem.push({
           id: 0,
           project_id: this.project.inspection_reference[index].project_id,
           project_name: this.project.inspection_reference[index].project_name,
-          item_id: this.project.inspection_reference[index].id,
+          item_id:item_id,
           item: this.project.inspection_reference[index].item,
           item_name: this.project.inspection_reference[index].item_name,
           range_type: this.project.inspection_reference[index].range_type,
@@ -1023,10 +1027,11 @@ export default {
             this.$message.error('未填写项目')
             return false
           }
-          for (var index in this.form.formItem) {
-            this.form.formItem[index].value =
-              '' + this.form.formItem[index].value
-          }
+          for (var index in this.form.formItem) {this.form.formItem[index].value ='' + this.form.formItem[index].value}
+
+          console.log("this.form",this.form)
+
+         
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -1352,7 +1357,7 @@ export default {
                 console.log('执行0',inspectionsMap[items[index].id]);
 
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
-                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 ){
+                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{

src/xt_pages/user/lapsoSummary.vue

@@ -322,8 +322,12 @@
               </el-col>
               <el-col :span="24" v-if="lapseto == 2  || lapseto == 3 || lapseto == 4 || lapseto ==11">
                   <el-form-item label="转归类型:"> 
-                      <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                      <el-radio-group style="padding: 10px;" v-model="lapse_type" :disabled="true">
                           <el-radio  label="1">转入</el-radio>
+                          <el-radio  label="2">转出</el-radio>
+                          <el-radio  label="3">死亡</el-radio>
+                          <el-radio  label="4">院内转诊</el-radio>
+                          <el-radio  label="11">请假</el-radio>
                     </el-radio-group>
                   </el-form-item>
               </el-col>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))