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

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -380,7 +380,7 @@
                               : "/"
                           }}
                         </div>
-                        kg
+                        L
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px;display: flex;">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -193,7 +193,7 @@
                 v-for="(item, i) in way_arr"
                 class="under_line"
                 v-if="record.receive_assessment.way == item.id"
-                style="width: 180px; text-align: left"
+                style="width: 130px; text-align: left"
               >
                 {{ item.name }}
               </div>
@@ -1821,48 +1821,65 @@
                               </span>
                             </td>
 
-                            <td
-                              height="26px"
+                            <td height="26px"
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
-                            >
-                              <span v-if="advice[0].parent_id > 0">---></span>
-                              <span>{{ advice[0].advice_name }}</span>
-
-                              <span
-                                v-if="
-                                  advice[0] &&
-                                  advice[0].advice_desc != undefined
-                                "
-                              >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
-                              </span>
-
-                              <span v-if="advice[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span
-                              >
-                              <span v-if="advice[0].single_dose != 0">
+                            > 
+                              <div v-if="org_id==10551 || org_id ==0">
+                                <div :rowspan="advice[0].prescriptionChild.length"  v-for="(it,key)  in advice[0].prescriptionChild" style="border: none;">
+                                  <div style="border: none;">
+                                    <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;&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>{{ it.delivery_way}}</span>
+                                          <span>{{
+                                            it.execution_frequency
+                                          }}</span>
+                                          <span v-if="it.remark !=''"
+                                            >({{ it.remark }})</span
+                                          >
+                                  </div>
+                                </div>
+                              </div>
+                              <div v-else>
+                                <span v-if="advice[0].parent_id > 0"></span>
+                                <span>{{ advice[0].advice_name }}</span>
+
+                                <span v-if="advice[0].prescribing_number"
+                                  >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                                  }}{{ advice[0].prescribing_number_unit }}</span
+                                >
+                                <span v-if="advice[0].single_dose != 0">
 
-                                <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
-                                </span
-                              >
+                                  <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
+                                  </span
+                                >
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
-                              }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
-                              }}</span>
-                              <span
-                                v-if="
-                                  advice[0].parent_id == 0 &&
-                                  advice[0].remark.length > 0
-                                "
-                                >({{ advice[0].remark }})</span
-                              >
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].delivery_way
+                                }}</span>
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].execution_frequency
+                                }}</span>
+                                <!-- <span
+                                  v-if="
+                                    advice[0].parent_id == 0 &&
+                                    advice[0].remark.length > 0
+                                  "
+                                  >({{ advice[0].remark }})</span
+                                > -->
+                              </div>
                             </td>
 
                             <td height="35px">
@@ -3264,6 +3281,8 @@ export default {
             } else {
               dlegh = 0;
             }
+            
+            
             if (dlegh > 0) {
               if (
                 typeof this.records[recordIndex].monitor_records ===
@@ -3276,7 +3295,6 @@ export default {
                 this.records[recordIndex].monitor_records.push([]);
               }
             }
-
             this.records[recordIndex].isShowZero = false;
             if (this.records[recordIndex].patient.user_org_id == 9535) {
               this.records[recordIndex].isShowZero = true;
@@ -3300,9 +3318,12 @@ export default {
                 this.records[recordIndex].advices.push([]);
               }
             }
-
+            console.log('22222222',this.records[recordIndex].advices);
+            
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
+              
+              this.records[recordIndex].advices[index].prescriptionChild = []
               if (this.records[recordIndex].advices[index].parent_id == 0) {
                 continue;
               }
@@ -3320,6 +3341,7 @@ export default {
             }
 
             var advices = [];
+            // var advices2 = []
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id > 0) {
                 continue;
@@ -3329,10 +3351,25 @@ export default {
                 item.children = childMap[item.id];
               } else {
                 item.children = [];
+                this.records[recordIndex].advices[index].prescriptionChild.push(item) 
               }
               advices.push(item);
+              
             }
-
+            var arr = []
+            for(let i=0;i<advices.length;i++){
+              for(let j=i+1;j<advices.length;j++){
+                if(advices[i].id !=undefined){
+                  if(advices[i].groupno == advices[j].groupno){
+                    arr.push(advices[j])
+                    advices[i].prescriptionChild.push(advices[j])
+                    advices.splice(j,1)
+                  }
+                }
+              }
+            }
+            console.log('3333333333',advices,arr);
+            
             var leftAdvice = [];
             var rightAdvice = [];
             var adlen = advices.length;

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1564,7 +1564,7 @@
                           colspan="2" class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <div v-if="org_id==10551 || org_id==0">
+                          <div v-if="org_id==10551 || org_id ==0">
                             <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
                               <div style="border: none;">
                                 <span>{{ it.advice_name }}</span>
@@ -1584,7 +1584,7 @@
                                       <span>{{
                                         it.execution_frequency
                                       }}</span>
-                                      <span v-if="it.remark.length > 0"
+                                      <span v-if="it.remark !=''"
                                         >({{ it.remark }})</span
                                       >
                               </div>
@@ -3830,13 +3830,18 @@ export default {
             let newArr = Object.values(dataInfo)
 
             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].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
-                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+              for(let i=0;i<newArr.length;i++){
+                for(let j=0;j<this.doctor_advices.length;j++){
+                  if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                      newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                  }
                 }
               }
             }
+            for(let i in newArr){
+              if(newArr[i].parent_id == undefined){
+                newArr.splice(i,1)
+              }
             }
             console.log("newArr",newArr)
             this.doctor_advices = []

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -351,7 +351,7 @@
                             : "/"
                         }}
                       </div>
-                      kg
+                      L
                     </div>
                   </div>
 
@@ -1331,796 +1331,6 @@
       </div>
     </div>
 
-    <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;">
-      <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order_title" v-if="org_id!=0&&org_id!=10579">血液净化科医嘱及执行单</div>
-      <div class="order_title" v-if=" org_id==10579">血液净化治疗记录单</div>
-      <div class="row" style="margin-top: 15px">
-        <div class="inline_block">
-          科室：
-          <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
-          &nbsp;
-          <check-box text="住院" :checked="patientInfo_source_2"></check-box>
-        </div>
-        <div class="inline_block" style="margin-left: 5px;">
-          住院号：
-          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
-            {{ patientInfo.admission_number }}
-          </div>
-          <div class="under_line" style="width: 70px;text-align: left" v-else>
-            {{ "/" }}
-          </div>
-        </div>
-        <div class="inline_block" style="margin-left:10px;">
-          姓名：
-          <div class="under_line" style="width: 50px;text-align: left">
-            {{ patientInfo.name }}
-          </div>
-        </div>
-        <div class="inline_block" style="margin-left: 10px;">
-          性别：
-          <check-box text="男" :checked="patientInfo_gender_1"></check-box>
-          &nbsp;
-          <check-box text="女" :checked="patientInfo_gender_2"></check-box>
-        </div>
-        <div class="inline_block" style="margin-left: 10px;">
-          年龄：
-          <div class="under_line" style="width: 30px;text-align: left">
-            <!-- {{ getAge(patientInfo) }} -->
-            {{ calculateAge(patientInfo.id_card_no,schedule_date) }}
-          </div>
-          岁
-        </div>
-        <div class="inline_block" style="margin-left: 10px;">
-          透析日期：
-          <div class="under_line" style="width: 100px;text-align: left">
-            {{ xtdate }}
-          </div>
-        </div>
-      </div>
-      <div class="row" style="margin-top: 15px">
-        <div  style="">
-          诊断：
-          <div class="under_line" style="width: 95%;text-align: left;white-space: normal;">
-            {{ patientInfo.diagnose }}
-          </div>
-        </div>
-      </div>
-
-      <table class="print-table-no">
-                    <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 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 == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                        >
-                          核对护士
-                        </td>
-                      </tr>
-
-
-                      <tr
-                        v-for="(advice, advice_index) in doctor_advices"
-                        :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-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
-                          <span v-if="advice && advice.advice_desc"
-                            >({{ advice.advice_desc
-                            }}{{ advice.drug_spec_unit }})</span
-                          >
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
-                          <span v-if="advice.single_dose != 0"
-                            >{{ advice.single_dose
-                            }}{{ advice.single_dose_unit }}</span
-                          >
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.delivery_way
-                          }}</span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.execution_frequency
-                          }}</span>
-                          <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
-                            "
-                            >({{ advice.remark }})</span
-                          >
-                        </td>
-
-                        <td height="32px">
-                          <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
-                          />
-                        </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" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </td>
-                      </tr>
-
-                      <tr v-if="org_id == 0 || org_id == 10579">
-                  <td colspan="7">
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                   <div v-if="org_id == 0 || org_id == 10440">
-
-                    <div class="inline_block" style="flex: 1">
-                      上机护士：
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-
-
-                  </div>
-                  <div v-if="org_id ==10644">
-                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
-                      穿刺护士：
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-
-                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
-                      换药护士：
-
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                        v-if="org_id==10644"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.change_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.change_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.change_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                        v-if="org_id!=10644"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                  </div>
-
-
-                  <div v-if="org_id !=10644 && org_id!=10440">
-                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
-                      穿刺护士：
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-
-                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
-                      穿刺护士：
-
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                        v-if="org_id==10644"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-
-                      <div
-                        class="under_line"
-                        style="width: 90px; text-align: center"
-                        v-if="org_id!=10644"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 35px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                  </div>
-
-                  <div v-if="org_id==10440">
-
-                    <div class="inline_block" style="flex: 1">
-                     <div>
-                      <span>责任护士：</span>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-
-                      >
-
-                        <span
-                          style="height: 35px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-
-                    </div>
-
-                  </div>
-
-                  <div v-if="org_id!=0&&org_id!=10440&&org_id!= 10206">
-                    <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10414">责任护士：</span>
-                      <span v-else>治疗护士：</span>
-
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                  </div>
-
-
-
-                    <div class="inline_block" style="flex: 1">
-                      <span v-if="org_id==10387 || org_id ==10206 || org_id == 0" >核对护士：</span>
-                      <span v-else >核对人员：</span>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="dialysisOrder == null"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.modifier
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.creater
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              check == null ? 0 : check.modifier
-                            ) == ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.modifier) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.modifier)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse != check.creater &&
-                          dialysisOrder.start_nurse != check.modifier
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10579 && org_id!=0">
-                       下机护士：
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            )
-                          }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id==10579 || org_id == 0">
-                       患者签名
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-
-
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      治疗医生：
-                      <div
-                        v-if="org_id ==10191"
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(prescription.creater) == ''"
-                        >
-                          {{ getAdminUser(prescription.creater) }}
-                        </span>
-                        <img
-                          style="height: 40px"
-                          :src="setAdminUserES(prescription.creater)"
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        v-if="org_id!=10191"
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                      <span v-if="doctor_advices[0]!=null && doctor_advices[0].advice_doctor>0">
-                        <span
-                            style="height: 30px; display: inline-block"
-                            v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
-                          >
-                            {{ getAdminUser(doctor_advices[0].advice_doctor) }}
-                          </span>
-                          <img
-                            style="height: 40px"
-                            :src="setAdminUserES(doctor_advices[0].advice_doctor)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                      </span>
-
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-
-
-                    </tbody>
-     </table>
-
-
-
-
-
-
-    </div>
   </div>
 </template>
 

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -328,7 +328,7 @@
                 </tr>
             </table>
           </div>
-          <div style="margin-bottom: 10px;" v-if="org_id!=0&& org_id!=10375">
+          <div style="margin-bottom: 10px;" v-if="org_id!=10375">
             <table class="table" border="1"
               style="border-collapse: collapse;text-align: center;width: 100%;"
             >
@@ -352,7 +352,7 @@
                   height="32px"
                   class="advice-name"
                   style="padding-left: 7px"
-                 
+
                 >
                  <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
                    <div style="border: none;">
@@ -373,7 +373,8 @@
                           <span>{{
                             it.execution_frequency
                           }}</span>
-                          <span v-if="it.remark.length > 0"
+                          
+                          <span v-if="it.remark !=''"
                             >({{ it.remark }})</span
                           >
                    </div>
@@ -466,7 +467,7 @@
                 </td>
                 <td>
                   <span>透析器凝血：
-                   
+
                     {{
                      afterdialysis &&
                      afterdialysis
@@ -474,19 +475,19 @@
                         : "/"
                      }}
 
-                 
+
                   </span>
                 </td>
                 <td>
                   <span>实际置换量：
-                   
+
                     {{
                       afterdialysis.actual_displacement
                         ? afterdialysis.actual_displacement
                         : ""
                      }}L
 
-                 
+
                   </span>
                 </td>
               </tr>
@@ -526,7 +527,7 @@
                 <td width="5%">医生：</td>
                 <td width="10%">
                   <!-- <span>{{getAdminUser(prescription.creater)}}</span> -->
-                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span> 
+                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span>
                   <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor==0">{{getAdminUser(prescription.creater)}}</span>
                   <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
@@ -1302,6 +1303,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
+
+
         this.doctor_advices =
           response.data.data.advices == null ? [] : response.data.data.advices;
         for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -1351,23 +1354,23 @@ export default {
              }
            }
         }
-        this.doctor_advices = [] 
+        this.doctor_advices = []
         this.doctor_advices = docArr
-      
 
 
-       
-          
+
+
+
         if(this.doctor_advices!=null && this.doctor_advices.length>0){
 
             for(let i=0;i<this.doctor_advices.length;i++){
-              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno 
+              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno
             }
             console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
 
             let dataInfo = {}
             this.doctor_advices.forEach((item, index) => {
-        
+
             let { groupPrescriptionId } = item
             if (!dataInfo[groupPrescriptionId]) {
               dataInfo[groupPrescriptionId] = {
@@ -1392,7 +1395,7 @@ export default {
             }
           })
           let newArr = Object.values(dataInfo)
-          
+
           if(newArr!=null && newArr.length >0){
              for(let i=0;i<newArr.length;i++){
                for(let j=0;j<this.doctor_advices.length;j++){
@@ -1403,12 +1406,16 @@ export default {
              }
           }
           console.log("newArr",newArr)
-            
+          for(let i in newArr){
+            if(newArr[i].parent_id == undefined){
+              newArr.splice(i,1)
+            }
+          }
           this.doctor_advices = []
           this.doctor_advices = newArr
-         
+
         }
-        
+
 
       } else {
         this.loading = false;

src/xt_pages/outpatientCharges/statementTemplate/printSeventheen.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="statement-print" class="statement-print">
-     <div class="statementTitle">濉溪杏康血液透析中结算单</div>
+     <div class="statementTitle">濉溪杏康血液透析中心结算单</div>
      <!-- <div style="text-align: center;font-size: 17px;">门 &nbsp;诊 &nbsp;结 &nbsp;帐 &nbsp;票 &nbsp;据</div> -->
       <div style="width: 100%;border-bottom: 1px dashed black;padding-bottom: 5px;">
         <div style="width: 100%;display: flex;padding: 5px;">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -559,6 +559,12 @@
                                v-on:cancel="cancel"></next-or-last-prescription>
     <!--<next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue" v-on:cancel="cancel"></next-or-last-prescription>-->
     <call-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-prescription>
+
+    <el-dialog title="提醒" :visible.sync="dialogTableVisible">
+      <el-table :data="err_msg">
+        <el-table-column label="提示" width="150"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -627,7 +633,9 @@ export default {
   },
   data() {
     return {
+      dialogTableVisible:false,
       drugs: [],
+      err_msg:[],
       zuobiao_drug: [],
       zuobiao_project: [],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
@@ -3195,50 +3203,119 @@ export default {
                   data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
                 }
               }
-              createHisPrescription(data, params).then(response => {
-                if (response.data.state == 1) {
-                  this.$emit('change', this.patientInfo.id)
-                  this.$message.success('保存成功!')
-                  this.$emit('editKeepLoad', false)
-                  this.$parent.getInitData()
-                  this.getlist()
 
-                  if(this.org_id == 10653){ //将数据同步到费森系统
-                    var that = this
-                    axios.get('http://127.0.0.1:9531/api/yb/syncadvice', {
-                      params: {patient_id: this.patientInfo.id}
-                    })
-                      .then(function(response) {
-                        if (response.data.state == 0) {
-                          that.$message.error(response.data.msg)
-                          return false
+              //针对广州从化意达对单位进行判断
+              // 在保存处方的时候，在前端判断，所开的药品里的总量单位是否是最小单位
+              // 如果不是，则弹窗提醒“******总量单位不是最小单位，是否继续保存”，
+              // 取消 则不往后台提交，继续，则提交给后台
+              console.log("this.prescriptions[i].advices[b]")
+              // console.log(this.prescriptions[i].advices[b])
+
+              if(this.org_id == 10318){
+                var err_msg = ""
+                for(let i =0; i < this.prescriptions.length; i++){
+                  for(let b= 0; b < this.prescriptions[i].advices.length;b++){
+                    console.log(this.prescriptions[i].advices[b])
+                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit){
+                      isLoading = false
+                      if(err_msg.length == 0){
+
+                        err_msg = '<span>' + '<span style="color:red">' + this.prescriptions[i].advices[b].drug_name + '</span>' +"总量单位不是最小单位" + '</span>'
+                      }else{
+                        err_msg = err_msg + "</br>"+  '<span>' + '<span style="color:red">' + this.prescriptions[i].advices[b].drug_name + '</span>' +"总量单位不是最小单位" + '</span>'
+                      }
+                    }
+                  }
+                }
+
+                if (err_msg.length > 0){
+                  err_msg = err_msg + "</br>" + '<span style="font-size: 20px">' + "是否继续保存" + '</span>'
+                  this.$confirm(err_msg, '提示信息', {
+                    distinguishCancelAndClose: true,
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: '保存',
+                    cancelButtonText: '取消'
+                  })
+                    .then(() => {
+                      createHisPrescription(data, params).then(response => {
+                        if (response.data.state == 1) {
+                          this.$emit('change', this.patientInfo.id)
+                          this.$message.success('保存成功!')
+                          this.$emit('editKeepLoad', false)
+                          this.$parent.getInitData()
+                          this.getlist()
+
                         } else {
-                          if(response.data.data.status == -1){
-                            that.$confirm(response.data.data.msg, '错误信息', {
-                              confirmButtonText: '确 定',
-                              type: 'warning'
-                            }).then(() => {
-                            }).catch(() => {
-                            })
-                          }else{
-                            that.$message.success('同步费森系统成功!')
-                          }
+                          this.$message.error(response.data.msg)
+                          this.$emit('editKeepLoad', false)
+
                         }
                       })
-                      .catch(function(error) {
+                    })
+                    .catch(action => {
+                      // isLoading = false
+                      this.$emit('editKeepLoad', false)
 
-                      })
-                  }
+                    });
 
+                }else{
+                  createHisPrescription(data, params).then(response => {
+                    if (response.data.state == 1) {
+                      this.$emit('change', this.patientInfo.id)
+                      this.$message.success('保存成功!')
+                      this.$emit('editKeepLoad', false)
+                      this.$parent.getInitData()
+                      this.getlist()
 
+                    } else {
+                      this.$message.error(response.data.msg)
+                      this.$emit('editKeepLoad', false)
 
+                    }
+                  })
+                }
+              }else{
+                createHisPrescription(data, params).then(response => {
+                  if (response.data.state == 1) {
+                    this.$emit('change', this.patientInfo.id)
+                    this.$message.success('保存成功!')
+                    this.$emit('editKeepLoad', false)
+                    this.$parent.getInitData()
+                    this.getlist()
+
+                    if(this.org_id == 10653){ //将数据同步到费森系统
+                      var that = this
+                      axios.get('http://127.0.0.1:9531/api/yb/syncadvice', {
+                        params: {patient_id: this.patientInfo.id}
+                      })
+                        .then(function(response) {
+                          if (response.data.state == 0) {
+                            that.$message.error(response.data.msg)
+                            return false
+                          } else {
+                            if(response.data.data.status == -1){
+                              that.$confirm(response.data.data.msg, '错误信息', {
+                                confirmButtonText: '确 定',
+                                type: 'warning'
+                              }).then(() => {
+                              }).catch(() => {
+                              })
+                            }else{
+                              that.$message.success('同步费森系统成功!')
+                            }
+                          }
+                        })
+                        .catch(function(error) {
+                        })
+                    }
+                  } else {
+                    this.$message.error(response.data.msg)
+                    this.$emit('editKeepLoad', false)
 
-                } else {
-                  this.$message.error(response.data.msg)
-                  this.$emit('editKeepLoad', false)
+                  }
+                })
 
-                }
-              })
+              }
             }
           }