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

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

@@ -1655,7 +1655,7 @@
          ParamsQuery.whether_unobstructed = parseInt(ParamsQuery.whether_unobstructed)
          ParamsQuery.lien_necessary =  parseInt(ParamsQuery.lien_necessary)
 
-         if(ParamsQuery.additional_weight >=30){
+         if(ParamsQuery.additional_weight >=70){
              this.$message.error("衣物重异常,请重新填写!")
              return
          }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1820,7 +1820,10 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644"><br/> {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</td>
+                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644"><br/>
+                           <span v-if="org_id!=10644">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: "0"}}</span> 
+                           <span v-if="org_id==10644">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span> 
+                          </td>
                         <td
                           v-if="
                             (prescription.mode_id == 2 ||

src/xt_pages/hospitalStation/summary.vue

@@ -156,6 +156,13 @@
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
         <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
+        <el-table-column align="center" width="90" prop="name" label="患者性别">
+          <template slot-scope="scope">{{ scope.row.patient.gender == 1 ? '男':'女' }}</template>
+        </el-table-column>
+
+        <el-table-column align="center" width="90" prop="name" label="患者年龄">
+          <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
+        </el-table-column>
         <el-table-column align="center" prop="name" label="应收金额">
           <template slot-scope="scope">{{
             scope.row.medfee_sumamt.toFixed(2)
@@ -506,6 +513,19 @@ export default {
   },
 
   methods: {
+    getAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        //获取年龄
+        var myDate = new Date();
+        var month = myDate.getMonth() + 1;
+        var day = myDate.getDate();
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++;
+        }
+        return age;
+      }
+    },
     handleSelectionChange(val) {
       this.selecting_schs = val
     },
@@ -1077,6 +1097,17 @@ export default {
             let balance_accounts = "";
             let charge_name = "";
             let order_status = "";
+            let  gender = ""
+            let  age = 0
+
+            if(order.patient.gender == 1){
+              gender = "男"
+            }else{
+              gender = "女"
+            }
+
+            age = this.getAge(order.patient.id_card_no)
+
 
             if (
               order.his_hospital_patient != null &&
@@ -1133,6 +1164,8 @@ export default {
               保地医保区: order.his_hospital_patient.insuplc_admdvs,
               身份证号: order.patient.id_card_no,
               患者姓名: name,
+              患者性别: gender,
+              患者年龄: age,
               险种: order.insutype,
               医疗类别: order.med_type,
               就诊id: number,
@@ -1172,6 +1205,8 @@ export default {
               "保地医保区",
               "身份证号",
               "患者姓名",
+              "患者性别",
+              "患者年龄",
               "险种",
               "医疗类别",
               "就诊id",
@@ -1208,6 +1243,8 @@ export default {
               "保地医保区",
               "身份证号",
               "患者姓名",
+              "患者性别",
+              "患者年龄",
               "险种",
               "医疗类别",
               "就诊id",

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1509,6 +1509,7 @@ export default {
         var hours = nowDate.getHours()
         var min = nowDate.getMinutes()
 
+        var preTime = ""
         var nowTime =
           nowYear +
           '-' +
@@ -1516,7 +1517,19 @@ export default {
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        this.prescriptions[i]['pre_time'] = nowTime
+        if(nowTime.split(" ")[0] != this.record_date){
+          if(this.org_id == 10206  || this.org_id == 0) {
+            preTime = this.record_date+ ' '  + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+          }else {
+            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+          }
+        } else {
+          preTime = nowTime
+        }
+
+        this.prescriptions[i]['pre_time'] = preTime
 
         this.prescriptions[i].name = '处方' + (i + 1)
         if (i == 0) {
@@ -1569,9 +1582,23 @@ export default {
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
+      var preTime  = ""
+      console.log(nowTime.split(" ")[0] )
+      console.log(this.record_date)
+
+      if(nowTime.split(" ")[0] != this.record_date){
+          preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+            ':' + (min < 10 ? '0' + min : min)
+      } else {
+        preTime = nowTime
+      }
+
+
+
+
       for (let i = 0; i < this.prescriptions.length; i++) {
         this.prescriptions[i].name = '处方' + (i + 1)
-        this.prescriptions[i]['pre_time'] = nowTime
+        this.prescriptions[i]['pre_time'] = preTime
 
         if (i == 0) {
           if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -3226,6 +3253,23 @@ export default {
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
+
+
+      var preTime  = ""
+      console.log(nowTime.split(" ")[0] )
+      console.log(this.record_date)
+
+      if(nowTime.split(" ")[0] != this.record_date){
+
+            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+
+      } else {
+        preTime = nowTime
+      }
+
+
+
       let obj = {
         id: 0,
         name: newTabName,
@@ -3233,7 +3277,7 @@ export default {
         advices: [],
         project: [],
         addition: [],
-        pre_time: nowTime
+        pre_time: preTime
 
       }
 

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -207,12 +207,12 @@
                     @click="handleBatch(scope.row)"
                     >批次
                     </el-button>
-                    <el-button
+                    <!-- <el-button
                       size="small"
                       type="primary"
                       @click="handleCheckBatch(scope.row)"
                       >自查
-                    </el-button>
+                    </el-button> -->
                 </template>
 
                  

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -456,7 +456,7 @@
 
            
           </el-table-column>
-          <el-table-column label="自查自检" align="center">
+          <!-- <el-table-column label="自查自检" align="center">
             <template slot-scope="scope">
               <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
                 >自查</span
@@ -464,7 +464,7 @@
             </template>
 
            
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
     </div>