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

@@ -1329,14 +1329,14 @@
                                   "
                                   >【开始透析】</template
                                 >
-                                <template
+                                <!-- <template
                                   v-if="
                                     record.dialysis_order &&
                                     monitor_record.operate_time ==
                                       record.dialysis_order.end_time
                                   "
                                   >【结束透析】</template
-                                >
+                                > -->
                                 {{ monitor_record.end }}
                                 {{ monitor_record.symptom }} &nbsp;{{
                                   monitor_record.dispose
@@ -2675,7 +2675,21 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
-
+          console.log("this.records------",this.records)
+          var tempmonitorflag = true;
+          for(let i=0;i<this.records.length;i++){
+            for(let j=0;j<this.records[i].monitor_records.length;j++){
+              this.records[i].monitor_records[j].end = ""
+              if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+              tempmonitorflag = false;
+            }
+            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
+              this.records[i].monitor_records[j].end = "【结束透析】";
+            }
+            }
+          }
+          console.log("hhhhhhhhh",this.records)
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/signPrint.vue

@@ -14,7 +14,11 @@
                     <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-                        <div>医嘱内容:{{ it.advice_name }}</div>  
+                        <div>医嘱内容:{{ it.advice_name }} 
+                           <span v-if="it.prescribing_number>0">
+                            {{it.prescribing_number}}{{ it.prescribing_number_unit }}
+                          </span> 
+                        </div>  
                         <div>给药途径:{{it.execution_frequency}}</div>  
                         <div>执行频率:{{it.delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
@@ -29,7 +33,9 @@
                     <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-                        <div>医嘱内容:{{getAdvice(item.doctor_advice)}}</div>  
+                        <div>医嘱内容:{{getAdvice(item.doctor_advice)}} 
+                           <span v-if="it.prescribing_number >0"> {{it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
+                        </div>  
                         <div>给药途径:{{item.doctor_advice[0].execution_frequency}}</div>  
                         <div>执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -374,14 +374,14 @@
                       医师签名：
                       <span
                         style="height: 20px"
-                        v-if="setAdminUserES(prescription.modifier) == ''"
+                        v-if="setAdminUserES(advices[0].advice_doctor) == ''"
                       >
-                        {{ getAdminUser(prescription.modifier) }}
+                        {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
                         class="es-img"
                         style="height: 25px"
-                        :src="setAdminUserES(prescription.modifier)"
+                        :src="setAdminUserES(advices[0].advice_doctor)"
                         alt
                         srcset
                         v-else
@@ -805,7 +805,7 @@
                   <td
                     style="height: 20px"
                     width="90"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <p style="height: 20px; line-height: 20px">开嘱医生</p>
                   </td>
@@ -815,10 +815,13 @@
                   <td
                     style="height: 20px"
                     width="70"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <p style="height: 20px; line-height: 20px">执行时间</p>
                   </td>
+                  <td style="height: 20px" width="90" v-if="org_id == 10249  || org_id == 0">
+                    <p style="height: 20px; line-height: 20px">开嘱医生</p>
+                  </td>
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">执行</p>
                   </td>
@@ -855,7 +858,7 @@
                   <td
                     style="line-height: 30px"
                     width="90"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                       {{ getAdminUser(advice.advice_doctor) }}
@@ -894,12 +897,27 @@
                   <td
                     style="line-height: 10px"
                     width="70"
-                    v-if="org_id == 10346 || org_id == 9675 || org_id == 0"
+                    v-if="org_id == 10346 || org_id == 9675"
                   >
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
+                  <td
+                    style="line-height: 30px"
+                    width="90"
+                    v-if="org_id == 10249 || org_id == 0"
+                  >
+                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">
+                      {{ getAdminUser(advice.advice_doctor) }}
+                    </span>
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(advice.advice_doctor)"
+                      alt=""
+                      srcset=""
+                    />
+                  </td>
                   <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
@@ -1043,20 +1061,20 @@
                       <span
                         v-if="
                           setAdminUserES(
-                            prescription == null
+                            advices == null
                               ? 0
-                              : prescription.prescription_doctor
-                              ? prescription.prescription_doctor
+                              : advices[0].advice_doctor
+                              ? advices[0].advice_doctor
                               : ''
                           ) == ''
                         "
                       >
                         {{
                           getAdminUser(
-                            prescription == null
+                            advices == null
                               ? 0
-                              : prescription.prescription_doctor
-                              ? prescription.prescription_doctor
+                              : advices[0].advice_doctor
+                              ? advices[0].advice_doctor
                               : ""
                           )
                         }}

src/xt_pages/hospitalStation/summary.vue

@@ -215,6 +215,32 @@
             >
               上传结算清单
             </el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="confirmUploadInfo(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              确认结算清单
+            </el-button>
+            <el-button
+              size="mini"
+              type="primary"
+              @click="cancelUploadTwo(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              取消结算清单
+            </el-button>
+
+            <el-button
+              size="mini"
+              type="primary"
+              @click="queryData(scope.row)"
+              v-if="$store.getters.xt_user.org_id == 10265"
+            >
+              查询结算清单
+            </el-button>
+
             <el-button
               size="mini"
               type="primary"
@@ -452,6 +478,121 @@ export default {
   },
 
   methods: {
+    confirmUploadInfo(row){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/4102", {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+            stas_type: 1
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+              that.$message.success("确认成功");
+              row.result.id = response.data.data.result.id;
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+
+    },
+    cancelUploadTwo(row){
+      if(this.$store.getters.xt_user.org_id == 10265){
+        var that = this;
+        axios
+          .get("http://127.0.0.1:9532/api/4102", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              stas_type: 0
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
+            } else {
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that
+                  .$confirm(response.data.data.msg, "医保错误信息", {
+                    confirmButtonText: "确 定",
+                    type: "warning",
+                  })
+                  .then(() => {
+                  })
+                  .catch(() => {
+                  });
+              } else {
+                that.$message.success("撤销成功");
+                row.result.id = 0;
+              }
+            }
+          })
+          .catch(function (error) {
+          });
+      }
+    },
+    queryData(row){
+      var that = this;
+      axios
+        .get("http://127.0.0.1:9532/api/4103", {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          },
+        })
+        .then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false;
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that
+                .$confirm(response.data.data.msg, "医保错误信息", {
+                  confirmButtonText: "确 定",
+                  type: "warning",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            } else {
+              that
+                .$confirm(response.data.data.msg, "医保信息", {
+                  confirmButtonText: "确 定",
+                })
+                .then(() => {
+                })
+                .catch(() => {
+                });
+            }
+          }
+        })
+        .catch(function (error) {
+        });
+
+
+    },
+
     setStorage() {
       this.$store.commit("SET_PAGEDATA", {
         page: this.page,
@@ -1123,7 +1264,7 @@ export default {
         setl_time: obj.setl_time,
       };
       this.invoiceParams = paramsObj;
-      
+
       const loading = this.$loading({
           lock: true,
           text: '正在加载中...',