Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -853,7 +853,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460&&org_id!=10551">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -863,23 +863,14 @@
                             record.lastafterweight.weight_after
                           }}</span>
                           <span v-else>{{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .weight_after_last_transparency
-                              ? parseFloat(
-                                  record.assessment_before_dislysis
-                                    .weight_after_last_transparency -
-                                    record.assessment_before_dislysis
-                                      .additional_weight
-                                ).toFixed(1)
-                              : "未称重"
+                             record.lastafterweight.weight_after
                           }}</span>
                         </div>
                         kg
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10551)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1232,7 +1223,7 @@
                           style="width: 50px; text-align: center"
                         >
                         {{
-                           record.prescription.warsh_count
+                           record.prescription.warsh_count? record.prescription.warsh_count:"/"
                           }}
                         </div>
                         ml
@@ -1245,7 +1236,7 @@
                           style="width: 50px; text-align: center"
                         >
                           {{
-                           record.prescription.washing_time
+                           record.prescription.washing_time? record.prescription.washing_time:"/"
                           }}
                         </div>
                         h
@@ -1326,7 +1317,7 @@
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
-                          <td
+                          <!-- <td
                             v-if="
                              (
                               record.prescription.mode_id == 5 ||
@@ -1335,7 +1326,7 @@
                             width="50"
                           >
                             置换量<br />(L)
-                          </td>
+                          </td> -->
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
                             width="50"
@@ -1387,14 +1378,14 @@
                             {{
                               monitor_record.diastolic_blood_pressure
                                 ? monitor_record.diastolic_blood_pressure
-                                : ""
+                                : "拒测"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.pulse_frequency
                                 ? monitor_record.pulse_frequency
-                                : ""
+                                : "拒测"
                             }}
                           </td>
                           <td v-if="org_id!=10489">
@@ -1527,7 +1518,7 @@
                             </span>
                           </td>
 
-                          <td
+                          <!-- <td
                             v-if="
                               (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
@@ -1541,7 +1532,7 @@
                                 ? monitor_record.displacement_quantity
                                 : ""
                             }}
-                          </td>
+                          </td> -->
                           <td v-if="org_id == 3877  || org_id == 10449">
                             {{
                               monitor_record.filter_pressure

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -856,9 +856,7 @@
                         style="width: 100px; text-align: center"
                       >
                         <span>{{
-                          predialysis.weight_after_last_transparency
-                            ? predialysis.weight_after_last_transparency
-                            : "未称重"
+                          lastafterdialysis.weight_after
                         }}</span>
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
                       </div>
@@ -1137,7 +1135,7 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{prescription.warsh_count?prescription.warsh_count:""}}
+                        {{prescription.warsh_count?prescription.warsh_count:"/"}}
                       </div>
                       <span>ml</span>
                     </div>
@@ -1150,7 +1148,7 @@
                         {{
                           prescription.washing_time
                             ? prescription.washing_time
-                            : ""
+                            : "/"
                         }}
                       </div>
                       <span>h</span>
@@ -1232,9 +1230,9 @@
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
-                        <td v-if="(prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
+                        <!-- <td v-if="(prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
                           置换量<br />(L)
-                        </td>
+                        </td> -->
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
@@ -1247,8 +1245,8 @@
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
-                          {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
-                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
+                          {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: "拒测"}}</td>
+                        <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: "拒测"}}</td>
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td v-if="org_id ==10478">
@@ -1343,7 +1341,7 @@
                             {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
                           </span>
                         </td> -->
-                        <td
+                        <!-- <td
                           v-if="
                             (prescription.mode_id == 2 ||
                             prescription.mode_id == 5 ||
@@ -1359,7 +1357,7 @@
                                 : ""
                             }}
                           </span>
-                        </td>
+                        </td> -->
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
                         <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
                           {{ monitor.ktv?monitor.ktv:"" }}
@@ -2812,6 +2810,7 @@ export default {
       patientInfo_gender_1: false,
       patientInfo_gender_2: false,
       patientInfo_source_2: false,
+      patientInfo_source_3:false,
       patientInfo_source_1: false,
       modeOptions: {},
       replacementWays: [],

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -17,7 +17,7 @@
         color: '#606266',
       }"
       highlight-current-row
-      max-height="380px"
+      max-height="500px"
     >
       <el-table-column
         align="center"
@@ -129,7 +129,7 @@
         id="out-table"
         v-if="prescription.type == 2"
       :data="prescription.project"
-      border
+      borde
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
@@ -137,6 +137,8 @@
         color: '#606266',
       }"
       highlight-current-row
+        max-height="500px"
+
     >
       <el-table-column
         align="center"

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -3,8 +3,9 @@
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10515">湖南省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientTool/queryData.vue

@@ -19,17 +19,17 @@
         </div>
         <div>
           <el-select v-model="refd_setl_flag" placeholder="退费标志" >
-            <el-option label="是" value="0"></el-option>
-            <el-option label="否" value="1"></el-option>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </div>
 
-        <div>
-          <el-select v-model="med_type" placeholder="医疗类别" >
-            <el-option label="普通门诊(11)" value="11"></el-option>
-            <el-option label="门诊特殊病(14)" value="14"></el-option>
-          </el-select>
-        </div>
+<!--        <div>-->
+<!--          <el-select v-model="med_type" placeholder="医疗类别" >-->
+<!--            <el-option label="普通门诊(11)" value="11"></el-option>-->
+<!--            <el-option label="门诊特殊病(14)" value="14"></el-option>-->
+<!--          </el-select>-->
+<!--        </div>-->
         <div style="margin-bottom: 10px;">
           <el-date-picker
             size="small"
@@ -59,9 +59,9 @@
             align="right"
           ></el-date-picker>
         </div>
-        <div>
-            <el-input v-model="certno" placeholder="证件号码" style="width:150px;"></el-input>
-        </div>
+<!--        <div>-->
+<!--            <el-input v-model="certno" placeholder="证件号码" style="width:150px;"></el-input>-->
+<!--        </div>-->
         <div>
           <el-button @click="queryData">查询</el-button>
         </div>
@@ -69,7 +69,6 @@
       <el-table
         :data="tableData"
         border
-        style="width: 100%"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
@@ -155,8 +154,8 @@ export default {
       end_time:"",
       query_type:"",
       crumbs: [
-        {path: false, name: "门诊收费"},
-        {path: false, name: "项目消费明细汇总"},
+        {path: false, name: "His工具"},
+        {path: false, name: "结算数据查询"},
       ],
       tableData: [],
       limit: 10,

src/xt_pages/role/admin.vue

@@ -187,7 +187,7 @@
           @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -200,7 +200,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toCheckPDFInformation">PDF验证</el-button>
+          @click="toCheckPDFInformation">PDF验证</el-button> -->
      </div>
     
       

src/xt_pages/stock/drugs/inventory.vue

@@ -331,11 +331,11 @@ export default {
                    list[i].last_stock_min_number = ""
                    list[i].min_number = list[i].XtBaseDrug.min_number
                    list[i].manufacturer_name  = ""
-                   if(this.org_id == 10489){
-                     list[i].type = 4
-                   }else{
-                     list[i].type = 6
-                    }
+                  //  if(this.org_id == 10489){
+                  //    list[i].type = 4
+                  //  }else{
+                  //    list[i].type = 6
+                  //   }
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/newDrugInventory.vue

@@ -809,7 +809,7 @@ export default {
                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number
                 list[i].manufacturer_name  = ""
-                list[i].type = 4
+                // list[i].type = 4
                 list[i].last_stock_max_number = list[i].stock_max_number
                 list[i].last_stock_min_number = list[i].stock_min_number
                 for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventory.vue

@@ -456,11 +456,11 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
-              if(this.org_id == 10489){
-                list[i].type = 4
-              }else{
-                list[i].type = 6
-              }
+              // if(this.org_id == 10489){
+              //   list[i].type = 4
+              // }else{
+              //   list[i].type = 6
+              // }
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name

src/xt_pages/stock/newInventory.vue

@@ -446,7 +446,7 @@ export default {
           this.manufacturerList = response.data.data.manufacturerList
           loading.close()
           for(let i=0;i<list.length;i++){
-              list[i].type = 4
+              // list[i].type = 4
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               list[i].manufacturer_name = ""

src/xt_pages/user/coursePrint.vue

@@ -61,7 +61,7 @@
               </div>
             </div>
 
-            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440 || org_id == 10131">
+            <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;float:right" v-if="org_id == 0||org_id ==9671 || org_id == 10440 || org_id == 10131 || org_id==9970">
              医生签名：
              <span v-if="setAdminUserES(item.recorder?item.recorder:item.recorder) == ''">
                   {{getName(item.recorder)}}