新分支

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -201,9 +201,9 @@
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/longSignPrint.vue

@@ -36,7 +36,6 @@
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -183,9 +183,9 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 && org_id!=0 ">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340 || org_id == 0">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
       </div>
 
 
@@ -1863,9 +1863,9 @@ export default {
                if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
                   newHisArr.forEach((item, index) => {
-                  let { advice_name } = item
-                  if (!dataInfoOne[advice_name]) {
-                    dataInfoOne[advice_name] = {
+                  let { drug_id } = item
+                  if (!dataInfoOne[drug_id]) {
+                    dataInfoOne[drug_id] = {
                       advice_name:item.advice_name,
                       child: [],
                       count:0,

src/xt_pages/dialysis/signPrint.vue

@@ -57,7 +57,7 @@
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
-                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
                            </div> 
                         </div>