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_six.vue

                               }}</span>
                             </td>
                           </tr>
+
+                        <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index" v-if="org_id == 0 || org_id ==10206">
+                        <td height="32px;padding:1px 1px">
+                            <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                            </span>
+                        </td>
+                        <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                            <span style="padding-left:5px;display:inline-block;">
+                              <span v-if="advice.type ==2">{{ advice && advice.project ? advice.project.project_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                              <span v-if="advice.type ==3">{{ advice && advice.good_info ? advice.good_info.good_name : '' }}  {{ advice && advice.good_info ? advice.good_info.specification_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                            </span>
+                        </td>
+
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'doctor') == ''">
+                                {{getAdminUser(advice, 'doctor')}}
+                            </span>
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
+                            </span>
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                        </td>
+                    </tr>
                         </template>
                       </tbody>
                     </table>
               }
             }
 
+
+          
+            if(this.org_id == 0 || this.org_id == 10206){
+              console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
+              var delghThree = 0 
+             let his_project = []
+              this.records[recordIndex].his_project.map(item => {
+                // if(item.type == 2){
+                //   his_project.push(item)
+                // }
+                his_project.push(item)
+              
+              })
+            this.records[recordIndex].his_project = his_project
+              var delghThree = 0
+              if (
+                this.records[recordIndex].his_advices &&
+                this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length < 6
+              ) {
+                delghThree = 6 - (this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length)
+              } else {
+                delghThree = 0
+              }
+
+              if (delghThree > 0) {
+                if (
+                  typeof this.records[recordIndex].his_project === 'undefined' ||
+                  this.records[recordIndex].his_project == null
+                ) {
+                  this.records[recordIndex].his_project = []
+                }
+                for (let index = 0; index < delghThree; index++) {
+                  this.records[recordIndex].his_project.push([])
+                }
+              }
+            }
+
+
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id == 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         </td>
                       </tr>
                       <!-- </template> -->
+
+
+                      <tr  
+                      v-if="org_id == 0 || org_id ==10206"
+                      v-for="(advice, advice_index) in projectsOne"
+                      :key="advice_index"
+                    >
+                      <td height="32px;padding:1px 1px" width="10%">
+                        <span v-if="advice.start_time">
+                          {{ getTime(advice.start_time, "{h}:{i}") }}
+                        </span>
+                      </td>
+                        <td
+                        colspan="2"
+                        class="advice-name"
+                        style="
+                          letter-spacing: 5px;
+                          text-align: center;
+                          font-weight: 520;
+                          font-size: 14px;
+                          padding: 0px 8px;
+                          line-height: 30px;
+                          width: 200px;
+
+                        "
+                        >
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                        </td>
+                      <td height="32px">
+                        <span
+                          v-if="setAdminUserES(advice.doctor) == ''"
+                          >{{ getAdminUser(advice.doctor) }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="setAdminUserES(advice.doctor)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </td>
+                      <td height="32px">
+                        <span
+                          v-if="
+                            setAdminUserES(advice.execution_staff) == ''
+                          "
+                          >{{
+                            getAdminUser(advice.execution_staff)
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="setAdminUserES(advice.execution_staff)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </td>
+                        <td height="32px">
+                          <span v-if="advice.execution_time">{{
+                            getTime(advice.execution_time, "{h}:{i}")
+                          }}</span>
+                        </td>
+
+                        <td height="32px">
+                          <span v-if="setAdminUserES(advice.checker) == ''">{{
+                            getAdminUser(advice.checker)
+                          }}</span>
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.checker)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </td>
+                      </tr>
                     </tbody>
                   </table>
                 </td>
               </tr>
+
+            
             </tbody>
           </table>
         </div>
                   </div>
                 </td>
               </tr>
+
+            
             </tbody>
           </table>
           <!-- <div  class="print-yema">1</div> -->
                           />
                         </td>
                       </tr>
-                     
+                      
+
+                   
                     </tbody>
      </table>
 
         gaijiliang_unit: "",
       },
       org_id: 0,
+      projectsOne: [],
     };
   },
   methods: {
         //   }
         // }
 
+        if(this.org_id== 0 || this.org_id ==10206){
+          let projectsOne = [];
+          response.data.data.projects.map((item) => {
+              projectsOne.push(item);
+          });
+          this.projectsOne = projectsOne;
+          
+
+          console.log("this.projectsOne", this.projectsOne);
 
+        }
         
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510 || this.org_id ==10567 ){
+        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 ){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
             
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
       
-        if(this.org_id!=10510){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){
           this.doctor_advices = docArr
         }
        
-        if (this.doctor_advices.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
 
-          for (let index = 0; index < nl; index++) {
-            if (
-              this.doctor_advices[index] == undefined ||
-              this.doctor_advices[index].length <= 0
-            ) {
-              this.doctor_advices.push([]);
-            } else {
-              continue;
+        if (this.doctor_advices.length + this.projectsOne.length <= 6) {
+            var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
+            this.print_length = 6;
+
+            for (let index = 0; index < nl; index++) {
+              if (
+                this.projectsOne[index] == undefined ||
+                this.projectsOne[index].length <= 0
+              ) {
+                this.projectsOne.push([]);
+              } else {
+                continue;
+              }
             }
           }
-        }
+        // if (this.doctor_advices.length <= 6) {
+        //   var nl = 6;
+        //   this.print_length = 6;
+
+        //   for (let index = 0; index < nl; index++) {
+        //     if (
+        //       this.doctor_advices[index] == undefined ||
+        //       this.doctor_advices[index].length <= 0
+        //     ) {
+        //       this.doctor_advices.push([]);
+        //     } else {
+        //       continue;
+        //     }
+        //   }
+        // }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
         console.log("this.totollength",this.totollength)