Ver código fonte

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 anos atrás
pai
commit
a2addd8315

+ 4 - 1
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue Ver arquivo

@@ -61,7 +61,10 @@
61 61
           </el-col>
62 62
 
63 63
           <el-col :span="8" v-if="isShow('透析频次')">
64
-            <el-form-item label="透析频次(次/周):">
64
+            <el-form-item label="透析频次(次/周):" v-if="this.$store.getters.xt_user.template_info.org_id != 10243">
65
+              <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
66
+            </el-form-item>
67
+            <el-form-item label="透析频次:" v-else>
65 68
               <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
66 69
             </el-form-item>
67 70
           </el-col>

+ 55 - 30
src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue Ver arquivo

@@ -569,12 +569,13 @@
569 569
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
570 570
                           <span v-if="advice.parent_id > 0">---></span>
571 571
                           <span>{{ advice.advice_name }}</span>
572
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
572 573
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
573 574
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
574 575
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
575 576
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
576 577
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
577
-                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
578
+                          
578 579
                         </td>
579 580
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
580 581
                       <span>{{advice.delivery_way}}</span>
@@ -1027,38 +1028,62 @@ export default {
1027 1028
         this.$message.error('下机护士未填')
1028 1029
       }else if(this.prescription.creater == 0){
1029 1030
         this.$message.error('医生签名未填')
1030
-      }else if(this.monitors.length > 0){
1031
-        this.monitors.map(item => {
1032
-          if(item.id > 0 && item.operate_time){
1033
-            this.users.map(it => {
1034
-              if(it.id == item.monitoring_nurse){
1035
-                if(it.type != 3){
1036
-                  this.$message.error('存在不是护士保存的监测')
1037
-                }
1038
-              }
1039
-            })
1040
-          }
1041
-        })
1042
-      }else if(this.tableAdvice.length > 0){
1043
-        this.tableAdvice.map(item => {
1044
-          if(item.id > 0 && item.created_time){
1045
-            this.users.map(it => {
1046
-              if(it.id == item.advice_doctor){
1047
-                if(it.type != 2){
1048
-                  this.$message.error('存在不是医生保存的医嘱')
1031
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
1032
+        let num = 0
1033
+        if(this.monitors.length > 0){
1034
+          this.monitors.map(item => {
1035
+            if(item.id > 0 && item.operate_time){
1036
+              this.users.map(it => {
1037
+                if(it.id == item.monitoring_nurse){
1038
+                  if(it.user_type == 2){
1039
+                    num++
1040
+                    this.$message.error('存在不是护士保存的监测')
1041
+                  }
1049 1042
                 }
1050
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
1051
-                if(it.type != 3){
1052
-                  this.$message.error('存在不是护士执行的医嘱')
1053
-                }
1054
-              }else if(it.id == item.checker && item.checker > 0){
1055
-                if(it.type != 3){
1056
-                  this.$message.error('存在不是护士核对的医嘱')
1043
+              })
1044
+            }
1045
+          })
1046
+        }
1047
+        if(this.tableAdvice.length > 0){
1048
+          this.tableAdvice.map(item => {
1049
+            if(item.id > 0 && (item.created_time || item.start_time)){
1050
+              this.users.map(it => {
1051
+                if(it.id == item.advice_doctor){
1052
+                  if(it.user_type == 3){
1053
+                    num++
1054
+                    this.$message.error('存在不是医生保存的医嘱')
1055
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
1056
+                    if(it.user_type == 2){
1057
+                      num++
1058
+                      this.$message.error('存在不是护士执行的医嘱')
1059
+                    }
1060
+                  }else if(it.id == item.checker && item.checker > 0){
1061
+                    if(it.user_type == 2){
1062
+                      num++
1063
+                      this.$message.error('存在不是护士核对的医嘱')
1064
+                    }
1065
+                  }
1066
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
1067
+                  if(it.user_type == 2){
1068
+                    num++
1069
+                    this.$message.error('存在不是护士执行的医嘱')
1070
+                  }
1071
+                }else if(it.id == item.checker && item.checker > 0){
1072
+                  if(it.user_type == 2){
1073
+                    num++
1074
+                    this.$message.error('存在不是护士核对的医嘱')
1075
+                  }
1057 1076
                 }
1058
-              }
1059
-            })
1060
-          }
1077
+              })
1078
+            }
1061 1079
         })
1080
+        }
1081
+        
1082
+        if(num == 0){
1083
+          this.$message.success('核对完成')
1084
+        }
1085
+      }else{
1086
+        this.$message.success('核对完成')
1062 1087
       }
1063 1088
     },
1064 1089
     getDisplaceLiquiPart: function(val) {

+ 2 - 1
src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue Ver arquivo

@@ -469,10 +469,11 @@ export default {
469 469
          this.DialysisData[i].index = i+1
470 470
          this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
471 471
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
472
+         this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
472 473
        }
473 474
        import('@/vendor/Export2Excel').then(excel => {
474 475
         const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
475
-        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
476
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_count']
476 477
         
477 478
         const data = this.formatJson(filterVal, this.DialysisData)
478 479
        

+ 1 - 1
src/xt_pages/stock/drugs/inventoryPrint.vue Ver arquivo

@@ -103,7 +103,7 @@ export default {
103 103
         var name = ""
104 104
         for(let i=0;i<this.manufacturerList.length;i++){
105 105
           if(id == this.manufacturerList[i].id){
106
-             name = this.manufacturerList[i].name
106
+             name = this.manufacturerList[i].manufacturer_name
107 107
           }
108 108
           return name
109 109
         }

+ 1 - 0
src/xt_pages/stock/drugs/query.vue Ver arquivo

@@ -123,6 +123,7 @@
123 123
               </span>
124 124
            </template>
125 125
         </el-table-column>
126
+        
126 127
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
127 128
            <template slot-scope="scope">
128 129
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">

+ 1 - 0
src/xt_pages/user/patients.vue Ver arquivo

@@ -1336,6 +1336,7 @@
1336 1336
         return new Date(time).getTime() / 1000
1337 1337
       },
1338 1338
       search() {
1339
+        this.listQuery.limit = 700
1339 1340
         this.listQuery.keywords = this.searchKey
1340 1341
         this.getList()
1341 1342
       },