新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1800,7 +1800,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402 && org_id!=10206">
+                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0 && org_id!=10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -2150,6 +2150,185 @@
                     </table>
                   </td>
                 </tr>
+
+                <tr v-if="org_id == 0 || org_id == 10206">
+                  <td style="padding: 0; position: relative" colspan="2">
+                    <table class="inside_table">
+                      <tbody>
+                        <tr style="line-height: 35px; padding: 8px 5px">
+                          <td
+                            colspan="7"
+                            style="
+                              letter-spacing: 5px;
+                              text-align: center;
+                              font-weight: 520;
+                              font-size: 16px;
+                              padding: 6px 8px;
+                              line-height: 30px;
+                            "
+                          >
+                            医嘱内容
+                          </td>
+                        </tr>
+                        <!-- <tr style="line-height:35px;padding:8px 5px;">
+                                            <td colspan="4" style="font-size: 16px">开医嘱</td>
+                                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
+                            </tr> -->
+                        <tr style="line-height: 35px; padding: 8px 5px">
+                          <td style="font-size: 16px" width="10%">时间</td>
+                          <td style="font-size: 16px" colspan="2" width="45%">
+                            医嘱内容
+                          </td>
+                          <td style="font-size: 16px" width="10%">医生签名</td>
+                          <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                          <td style="font-size: 16px" width="10%">
+                            执行人签名
+                          </td>
+                          <td style="font-size: 16px" width="10%">时间</td>
+                        </tr>
+                        <!-- <template v-for="group in doctor_advices" > -->
+
+                        <template v-if="record.advices">
+                          <tr
+                            v-for="(advice, advice_index) in record.new_his_advices"
+                            :key="advice_index"
+                          >
+                            <td height="35px">
+                              <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                              </span>
+                            </td>
+
+                            <td
+                              height="35px"
+                              colspan="2"
+                              class="advice-name"
+                              style="padding-left: 7px"
+                              
+                            >
+                             <span v-for="(it,i) in advice.child" :key="i">
+                              <span>{{ it.advice_name }}</span>
+
+                              <span v-if="it && it.advice_desc">
+                                ({{ it.advice_desc
+                                }}{{ it.drug_spec_unit }} )
+                              </span>
+
+                              <span v-if="it.prescribing_number"
+                                >&nbsp;{{ it.prescribing_number
+                                }}{{ it.prescribing_number_unit }}</span
+                              >
+                              <span v-if="it.single_dose != 0">
+                                {{ it.single_dose
+                                }}{{ it.single_dose_unit }}</span
+                              >
+
+                              <span v-if="it.parent_id == 0">{{
+                                it.delivery_way
+                              }}</span>
+                              <span v-if="it.parent_id == 0">{{
+                                it.execution_frequency
+                              }}</span>
+                              <span
+                                v-if="
+                                  it.parent_id == 0 &&
+                                  it.remark.length > 0
+                                "
+                                >({{ it.remark }})</span>
+                              <span v-if="advice.child.length >1"> + </span> 
+                            </span>
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(advice, 'advice_doctor') ==
+                                  ''
+                                "
+                                >{{
+                                  getAdminUser(advice, "advice_doctor")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice, 'advice_doctor')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice,
+                                    'execution_staff'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice, "execution_staff")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice, 'execution_staff')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+                            <td height="35px">
+                              <span v-if="advice.execution_time">{{
+                                getTime(advice.execution_time, " {h}:{i}")
+                              }}</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>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -3538,7 +3717,68 @@ export default {
             }
           }
           console.log("数据我哦我我", this.records);
+           
+          if(this.records!=null && this.records.length>0){
+            console.log("进啦地方大丰")
+            for(let i=0;i<this.records.length;i++){
+              this.records[i].new_his_advices = []
+                for(let j=0;j<this.records[i].his_advices.length;j++){
+                    this.records[i].his_advices[j].new_groupno = ""
+                    this.records[i].his_advices[j].new_groupno = this.records[i].his_advices[j].prescription_id + "_" + this.records[i].his_advices[j].groupno
+                }
+                let objInfo = {}
+                this.records[i].his_advices.forEach((item,index)=>{
+                  console.log("itemwowowowowo",item)
+                  let { new_groupno } = item
+                  if(!objInfo[new_groupno]){
+                    objInfo[new_groupno] = {
+                      new_groupno,
+                      child:[],
+                      start_time:item.start_time,
+                      advice_doctor:item.advice_doctor,
+                      advice_name:item.advice_name,
+                      check_time:item.check_time,
+                      checker:item.checker,
+                      delivery_way:item.delivery_way,
+                      execution_frequency:item.execution_frequency,
+                      execution_staff:item.execution_staff,
+                      execution_state:item.execution_state,
+                      execution_time:item.execution_time,
+                      frequency_type:item.frequency_type,
+                      new_groupno:item.new_groupno,
+                      advice_desc:item.advice_desc,
+                      drug_spec_unit:item.drug_spec_unit,
+                      prescribing_number:item.prescribing_number,
+                      prescribing_number_unit:item.prescribing_number_unit,
+                      single_dose:item.single_dose,
+                      single_dose_unit:item.single_dose_unit,
+                      parent_id:item.parent_id,
+                      remark:item.remark,
+                    
+                    }
+                  }
+                })
+                let newArr = Object.values(objInfo);
+                console.log("newArrwowoowowowo",newArr)
+                if(newArr!=null && newArr.length >0){
+                  for(let y=0;y<newArr.length;y++){
+                    for(let z=0;z<this.records[i].his_advices.length;z++){
+                       if(newArr[y].new_groupno == this.records[i].his_advices[z].new_groupno){
+                          newArr[y].child.push(this.records[i].his_advices[z])
+                       }
+                    }
+                  }
+                }
+
+                console.log("newArrwowoow",newArr)
+
+              this.records[i].new_his_advices = [] 
+              this.records[i].new_his_advices.push(...newArr)
+              
+            }
+          }
 
+          console.log("时间我哦我",this.records)
         
           // this.records.forEach(o => {
           //   console.log(o,'jj')

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -220,7 +220,7 @@
                                  
                                 <label-box :isChecked="record.assessment_before_dislysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="record.assessment_before_dislysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                                <label-box :isChecked="(record.assessment_before_dislysis.internal_fistula.indexOf('震颤-无') > -1 || record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                             </div>
                             </td>
                             <td width="30"></td>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1534,10 +1534,14 @@
           this.$message.error('已发药不可修改')
           return
         }
-        if (row.stop_state == 1 || row.execution_state == 1) {
-          this.$message.error('所选医嘱已停止或执行')
-          return false
+
+        if(this.org_id != 10612 && this.org_id!=0 && this.org_id!=10460){
+          if (row.stop_state == 1 || row.execution_state == 1) {
+            this.$message.error('所选医嘱已停止或执行')
+            return false
+          }
         }
+      
 
         this.title = row.parent_id > 0 ? '编辑子药' : '编辑医嘱'
         this.showAdviceForm = true

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -133,34 +133,7 @@
             >
               {{ item.name }}
             </div>
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 1"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--步行-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 2"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--扶行-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 3"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--轮椅-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 4"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--平车-->
-            <!--</div>-->
+           
           </div>
 
           <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
@@ -1079,7 +1052,7 @@
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
                         }}</span>
-                        <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
+                       
                       </div>
                       kg
                     </div>
@@ -1864,7 +1837,7 @@
                   </table>
                 </td>
               </tr>
-              <tr>
+              <tr v-if="org_id!=0&& org_id!=10206">
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
                     <tbody>
@@ -1883,10 +1856,7 @@
                           医嘱内容
                         </td>
                       </tr>
-                      <!-- <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr> -->
+                    
                       <tr style="line-height: 35px; padding: 8px 5px">
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
@@ -1951,12 +1921,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                        <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                    </td> -->
-                        <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                     
                         <td height="32px">
                           <span v-if="advice!=null && advice.advice_doctor>0">
                               <span
@@ -2108,6 +2073,225 @@
               </tr>
 
 
+              <tr v-if="org_id==0 || org_id ==10206">
+                <td style="padding: 0; position: relative" colspan="2">
+                  <table class="inside_table">
+                    <tbody>
+                      <tr style="line-height: 35px; padding: 8px 5px">
+                        <td
+                          colspan="7"
+                          style="
+                            letter-spacing: 5px;
+                            text-align: center;
+                            font-weight: 520;
+                            font-size: 16px;
+                            padding: 0px 8px;
+                            line-height: 30px;
+                          "
+                        >
+                          医嘱内容
+                        </td>
+                      </tr>
+                    
+                      <tr style="line-height: 35px; padding: 8px 5px">
+                        <td style="font-size: 16px" width="10%">时间</td>
+                        <td style="font-size: 16px" colspan="2" width="45%">
+                          医嘱内容
+                        </td>
+                        <td style="font-size: 16px" width="10%">医生签名</td>
+                      
+                        <td style="font-size: 16px" width="10%">执行人签名</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598">核对护士</td>
+                        <td style="font-size: 16px" width="10%">时间</td>
+                        <td
+                          style="font-size: 16px"
+                          width="10%"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || 
+                                org_id ==10375 || org_id ==10571 || org_id ==10600 || org_id==10206" 
+                        >
+                          核对护士
+                        </td>
+                      </tr>
+                     
+                      <tr
+                        v-for="(advice, advice_index) in new_doctor_advice_list"
+                        :key="advice_index"
+                      >
+                        <td height="32px">
+                          <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 v-for="(it,i) in advice.child" :key="i">
+                           <span v-if="it && it.advice_name">{{ it.advice_name}}</span>
+                           <span v-if="it && it.advice_desc">({{ it.advice_desc}}{{ it.drug_spec_unit }})</span>
+                           <span v-if="it.prescribing_number">{{ it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
+                           <span v-if="it.single_dose != 0">{{ it.single_dose}}{{ it.single_dose_unit }}</span>   
+                           <span v-if="it && it.delivery_way">{{ it.delivery_way }}</span>
+                           <span v-if="it && it.execution_frequency">{{ it.execution_frequency }}</span>
+                           <span v-if="it&& it.remark">{{ it.remark }}</span>&nbsp;&nbsp;&nbsp;
+
+                         </span>
+                        
+                        
+                         
+                        </td>
+                     
+                        <td height="32px">
+                          <span v-if="advice!=null && advice.advice_doctor>0">
+                              <span
+                              v-if="setAdminUserES(advice.advice_doctor) == ''"
+                              >{{ getAdminUser(advice.advice_doctor) }}
+                            </span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.advice_doctor)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                          </span>
+
+                        </td>
+                       
+                        <td height="32px">
+                          <span v-if="advice!=null && advice.execution_staff>0">
+                            <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
+                            />
+                        </span>
+                        </td>
+                        <td v-if="org_id == 10598">
+                          <span v-if="advice!=null && advice.checker>0">
+                              <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
+                              <img
+                                style="height: 30px"
+                                :src="setAdminUserES(advice.checker)"
+                                alt=""
+                                srcset=""
+                                v-else
+                              />
+                          </span>
+                        </td>
+                        <td height="32px">
+                          <span v-if="advice.execution_time">{{
+                            getTime(advice.execution_time, "{h}:{i}")
+                          }}</span>
+                        </td>
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || 
+                            org_id ==10375 || org_id ==10571 || org_id ==10600 ">
+                          <span v-if="advice!=null && advice.checker>0">
+                            <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.checker)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                        </span>
+                        </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>
@@ -2226,7 +2410,7 @@
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
               入科方式：
-              <!--<check-box v-for="item, index in nutrition_arr" :key="index" :text="item.name" :checked="receiverTreatmentAccess.nutrition == item.id?true:false"></check-box>-->
+             
               <div
                 v-for="(item, index) in way_arr"
                 class="under_line"
@@ -2235,39 +2419,7 @@
               >
                 {{ item.name }}
               </div>
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 0"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 1"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--步行-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 2"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--扶行-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 3"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--轮椅-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 4"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--平车-->
-              <!--</div>-->
+             
             </div>
             <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
               诊断：
@@ -2305,17 +2457,14 @@
                     医嘱内容
                   </td>
                 </tr>
-                <!-- <tr style="line-height:35px;padding:8px 5px;">
-                <td colspan="4" style="font-size: 16px">开医嘱</td>
-                <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-              </tr> -->
+             
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td style="font-size: 16px" width="10%">时间</td>
                   <td style="font-size: 16px" colspan="2" width="45%">
                     医嘱内容
                   </td>
                   <td style="font-size: 16px" width="10%">医生签名</td>
-                  <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                 
                   <td style="font-size: 16px" width="10%">执行人签名</td>
                   <td style="font-size: 16px" width="10%" v-if="org_id == 10598">核对护士</td>
                   <td style="font-size: 16px" width="10%">时间</td>
@@ -2327,7 +2476,7 @@
                     核对护士
                   </td>
                 </tr>
-                <!-- <template v-for="group in doctor_advices" > -->
+               
                 <tr
                   v-for="(advice, advice_index) in doctor_advices_2"
                   :key="advice_index"
@@ -2336,7 +2485,7 @@
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
-                    <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+                  
                   </td>
                   <td
                     height="32px"
@@ -2374,12 +2523,7 @@
                       >({{ advice.remark }})</span
                     >
                   </td>
-                  <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                  <span>{{advice.delivery_way}}</span>
-                  <span>{{advice.execution_frequency}}</span>
-                  <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                </td> -->
-                  <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+              
                   <td height="32px">
                     <span v-if="advice!=null && advice.advice_doctor>0">
                       <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
@@ -2394,10 +2538,7 @@
                       />
                    </span>
                   </td>
-                  <!-- <td height="35px">
-                  <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                  <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                </td> -->
+                
                   <td height="32px">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
@@ -2565,38 +2706,7 @@
                       min
                     </div>
                   </div>
-                  <!-- <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id==9538 || org_id==9675"
-                  >
-                  <div class="inline_block" style="flex: 2.5">
-                      KT/V：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 170px;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.ktv ? afterdialysis.ktv : "/" }}
-                      </div>
-                    </div>
-                     <div class="inline_block" style="flex: 2.5">
-                      累积血容量：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 170px;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.accumulated_blood_volume ? afterdialysis.accumulated_blood_volume : "/" }}
-                      </div>
-                    </div>
-                  </div> -->
+                 
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3384,7 +3494,7 @@
 
             </tbody>
           </table>
-          <!-- <div  class="print-yema">1</div> -->
+        
         </div>
       </div>
     </div>
@@ -3458,7 +3568,7 @@
                           医嘱内容
                         </td>
                         <td style="font-size: 16px" width="10%">医生签名</td>
-                        <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                       
                         <td style="font-size: 16px" width="10%">执行人签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td
@@ -3715,6 +3825,7 @@ export default {
       org_id: 0,
       projectsOne: [],
       schedule_date_one:"",
+      new_doctor_advice_list:[]
     };
   },
   methods: {
@@ -4465,84 +4576,7 @@ export default {
           this.doctor_advices[index]["isShow"] = 2;
         }
 
-        // if (this.doctor_advices.length > 0) {
-        //   var group = this.newAdviceGroupObject()
-        //   var initGroupBlock = function(group, advice) {
-        //     group.group_no = advice.groupno
-        //   }
-        //   for (let index = this.doctor_advices.length - 1; index >= 0; index--) {
-        //     var new_advice_index = 0
-
-        //     if ('children' in this.doctor_advices[index] && this.doctor_advices[index].children.length > 0) {
-        //       new_advice_index = index + this.doctor_advices[index].children.length + 1
-
-        //       var doctor_advice = {
-        //         delivery_way: this.doctor_advices[index].delivery_way,
-        //         execution_frequency: this.doctor_advices[index].execution_frequency,
-        //         groupno: this.doctor_advices[index].groupno,
-        //         id: this.doctor_advices[index].id,
-        //         parent_id: this.doctor_advices[index].parent_id,
-        //         children: this.doctor_advices[index].children,
-        //         remark: this.doctor_advices[index].remark,
-        //         execution_staff: this.doctor_advices[index].execution_staff,
-        //         checker: this.doctor_advices[index].checker,
-        //         execution_time: this.doctor_advices[index].execution_time,
-        //         advice_doctor: this.doctor_advices[index].advice_doctor
-
-        //       }
-        //       doctor_advice['isShow'] = 1
-        //       this.doctor_advices.splice(new_advice_index, 0, doctor_advice)
-        //       // this.doctor_advices.push(doctor_advice)
-        //     }
-        //   }
-
-        //   for (let index = 0; index < this.doctor_advices.length; index++) {
-        //     const advice = this.doctor_advices[index]
-        //     if (advice.groupno == 0) {
-        //       // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-        //       if (advice.parent_id > 0) {
-        //         if (this.advice_groups.length > 0) {
-        //           var parent_group = this.advice_groups[
-        //             this.advice_groups.length - 1
-        //           ]
-        //           if (parent_group.advices.length > 0) {
-        //             if (parent_group.advices[0].id == advice.parent_id) {
-        //               parent_group.advices.push(advice)
-        //             }
-        //           }
-        //         }
-        //         continue
-        //       } else {
-        //         if (group.group_no > 0) {
-        //           this.advice_groups.push(group)
-        //           group = this.newAdviceGroupObject()
-        //         }
-
-        //         initGroupBlock(group, advice)
-        //         group.advices.push(advice)
-        //         this.advice_groups.push(group)
-        //         group = this.newAdviceGroupObject()
-        //         continue
-        //       }
-        //     }
-
-        //     if (group.group_no > 0 && group.group_no != advice.groupno) {
-        //       this.advice_groups.push(group)
-        //       group = this.newAdviceGroupObject()
-        //     }
-        //     if (group.group_no == 0) {
-        //       initGroupBlock(group, advice)
-        //     }
-        //     if (group.group_no == advice.groupno) {
-        //       group.advices.push(advice)
-        //     }
-        //   }
-
-        //   if (group.group_no > 0) {
-        //     // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-        //    this.advice_groups.push(group)
-        //   }
-        // }
+        
 
         if(this.org_id== 0 || this.org_id ==10206){
           let projectsOne = [];
@@ -4558,13 +4592,13 @@ export default {
 
 
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
-        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 ){
+        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
               this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
               console.log("寄哪里 222")
-              // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
+              
             }
          }
 
@@ -4581,7 +4615,7 @@ export default {
 
         console.log("this.projects", this.projects);
 
-        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
 
         if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206){
             if(this.projects!=null && this.projects.length >0){
@@ -4628,6 +4662,74 @@ export default {
         }
 
         console.log("时间我我我哦我我",this.doctor_advices)
+        
+        //针对内蒙古阿拉善
+        if(this.org_id == 0 || this.org_id ==10206){
+           
+          if(this.doctor_advices!=null && this.doctor_advices.length > 0){
+             
+            for(let i=0;i<this.doctor_advices.length;i++){
+              this.doctor_advices[i].new_groupno = ""
+               this.doctor_advices[i].new_groupno = this.doctor_advices[i].prescription_id + "_" + this.doctor_advices[i].groupno
+
+                let objInfo = {}
+                this.doctor_advices.forEach((item,index)=>{
+                  let { new_groupno } = item
+                  if(!objInfo[new_groupno]){
+                    objInfo[new_groupno] = {
+                      new_groupno,
+                      child:[],
+                      start_time:item.start_time,
+                      advice_doctor:item.advice_doctor,
+                      advice_name:item.advice_name,
+                      check_time:item.check_time,
+                      checker:item.checker,
+                      delivery_way:item.delivery_way,
+                      execution_frequency:item.execution_frequency,
+                      execution_staff:item.execution_staff,
+                      execution_state:item.execution_state,
+                      execution_time:item.execution_time,
+                      frequency_type:item.frequency_type,
+                      new_groupno:item.new_groupno,
+                      advice_desc:item.advice_desc,
+                      drug_spec_unit:item.drug_spec_unit,
+                      prescribing_number:item.prescribing_number,
+                      prescribing_number_unit:item.prescribing_number_unit,
+                      single_dose:item.single_dose,
+                      single_dose_unit:item.single_dose_unit,
+                      parent_id:item.parent_id,
+                      remark:item.remark,
+                    
+                    }
+                  }
+                })
+                let newArr = Object.values(objInfo);
+             
+
+                if(newArr!=null && newArr.length >0){
+                  for(let i=0;i<newArr.length;i++){
+                    for(let j=0;j<this.doctor_advices.length;j++){
+                       if(newArr[i].new_groupno == this.doctor_advices[j].new_groupno){
+                          newArr[i].child.push(this.doctor_advices[j])
+                       }
+                    }
+                  }
+                }
+
+                console.log("newArrwowoow",newArr)
+
+              this.new_doctor_advice_list = []
+              this.new_doctor_advice_list.push(...newArr)
+
+              console.log("newArrwowoow",this.new_doctor_advice_list)
+            }
+          }
+        } 
+
+        console.log("新时间我哦我哦",this.doctor_advices)
+
+
+        //过滤口服药
         if(this.org_id == 10265){
           var docArr = []
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
@@ -4657,21 +4759,7 @@ export default {
               }
             }
           }
-        // 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)

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -277,7 +277,7 @@
                        
                       <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                       &nbsp;
-                      <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                      <label-box :isChecked="(predialysis.internal_fistula.indexOf('震颤-无') > -1 || predialysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                     </div>
                   </td>
                   <td width="30"></td>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -344,16 +344,22 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
-                    <span v-if="is_sys == 0">
-                      <span v-if="scope.row.child.length == 1">
-                         {{getPriceTwo(item.warehouse_out_id,item.drug_id)}}
-                      </span>
-                      <span v-if="scope.row.child.length > 1">
-                          {{item.price}}
+                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
+                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                      <span v-if="is_sys == 0">
+                        <span v-if="scope.row.child.length == 1">
+                          {{getPriceTwo(item.warehouse_out_id,item.drug_id)}}
+                        </span>
+                        <span v-if="scope.row.child.length > 1">
+                            {{item.price}}
+                        </span>
+                      
                       </span>
-                    
                     </span>
+                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
+                        {{ scope.row.min_price }}
+                    </span>
+                    
                   </td>
                </tr>
             </template>
@@ -373,7 +379,7 @@
 
                     <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
-                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>  
+                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>
                     </span>