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

@@ -2033,7 +2033,8 @@
                 年龄：
                 <div class="under_line" style="width: 30px; text-align: center">
                   <!-- {{ record.patient.age }} -->
-                  {{ getAge(record.patient) }}
+                  <!-- {{ getAge(record.patient) }} -->
+                  {{ calculateAge(record.patient.id_card_no,record.schedule_date) }}
                 </div>
                 岁
               </div>
@@ -3454,6 +3455,48 @@ export default {
       });
   },
   methods: {
+  
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+
+     return ageYear
+    },
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;

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

@@ -358,24 +358,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('追加肝素量')" >
-                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2"
-                       :label="'追加肝素量(mg) : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
-                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                            </el-form-item>
-
-                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1"
-                            :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
-                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.add_amount"></el-input>
-                            </el-form-item>
-                    </el-col>
-
+                 
                   <el-col :span="8" v-if="isShows('减肝素量')">
                        <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'减肝素量(mg) : '" prop="calculateAnticoagulantZL" :rules="isCheckmust('减肝素量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -500,6 +483,26 @@
                     </el-col>
 
 
+                    <el-col :span="8" v-if="isShows('追加肝素量')" >
+                       <el-form-item v-if="dialysisPrescription.anticoagulant == 2"
+                       :label="'追加肝素量(mg) : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+
+                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1"
+                            :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '" prop="add_amount" :rules="isCheckmust('追加肝素量')">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.add_amount"></el-input>
+                            </el-form-item>
+                    </el-col>
+
+
+
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10510 && this.$store.getters.xt_user.template_info.org_id != 10480">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -48,6 +48,7 @@
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
               {{ getAge(patientInfo) }}
+              <!-- {{ calculateAge(patientInfo.id_card_no,xtdate) }} -->
             </div>
             岁
           </div>
@@ -1711,6 +1712,7 @@
             <div class="inline_block" style="margin-left: 10px">
               年龄：
               <div class="under_line" style="width: 30px; text-align: center">
+                <!-- {{ calculateAge(patientInfo.id_card_no,xtdate) }} -->
                 {{ getAge(patientInfo) }}
               </div>
               岁
@@ -3927,6 +3929,48 @@ export default {
         return age
       }
     },
+    
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+
+     return ageYear
+    },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -916,7 +916,7 @@ export default {
             }
           }
 
-          if(this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537  ||  this.$store.getters.xt_user.org_id == 10480 ) {
+          if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537  ||  this.$store.getters.xt_user.org_id == 10480 ) {
             for (let i = 0; i < array.length; i++) {
               if (array[i].drug_code.length == 0) {
                 this.$message.error(array[i].drug_name + " 药品溯源码不能为空");

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -294,7 +294,7 @@ export default {
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id == 0 || this.org_id == 10644){
                  list[i].stock_in_price = "/"
-                list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                list[i].stockMoney = this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)
                 
                }else{
                 list[i].stock_in_price = "/"
@@ -310,7 +310,7 @@ export default {
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
               }else if(this.org_id == 0 || this.org_id == 10644){
                 list[i].addStockMoney = "/"
-                list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
                list[i].addStockMoney = "/"
                list[i].saleStockMoney = "/"
@@ -338,9 +338,6 @@ export default {
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                // console.log("期初",list[i].stockIn)
-                // console.log("增加",list[i].stockAdd)
-                // console.log("出库",list[i].outStock)
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
                   list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                 }else{
@@ -760,7 +757,7 @@ export default {
     all_count_price = count_price + count_one_price
 
     if(all_count_price > 0 ){
-      return all_count_price
+      return all_count_price.toFixed(2)
     }else{
       return 0
     }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -189,7 +189,7 @@ export default {
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].stock_in_price = "/"
-                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)).toFixed(2)
+                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
                     } else{
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = "/"
@@ -203,7 +203,7 @@ export default {
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].addStockMoney = "/"
-                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
                      
                     }else{
                         list[i].addStockMoney = "/"
@@ -218,8 +218,11 @@ export default {
                       list[i].stockOutprice = list[i].packing_price
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
-                      list[i].addStockMoney = "/"
-                      list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit).toFixed(2)
+                      list[i].stockOutprice = "/"
+                      list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                      if(list[i].saleOutMoney == "NaN"){
+                        list[i].saleOutMoney = ""
+                      }
                       
                     }else{
                       list[i].stockOutprice = "/"
@@ -236,10 +239,13 @@ export default {
                       list[i].overPrice = list[i].packing_price
                       list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
                      }else if(this.org_id == 0 || this.org_id == 10644){
-                      list[i].stockOutprice = "/"
-                      list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-                      if(list[i].saleOutMoney == "NaN"){
-                        list[i].saleOutMoney = ""
+                      list[i].overPrice = "/"
+                      console.log("stockMoney-00000000000000",list[i].stockMoney)
+                      console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
+                      console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
+                      list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
+                      if(list[i].overMoney == "NaN"){
+                        list[i].overMoney = ""
                       }
                      }else{
                         list[i].overPrice = "/"

src/xt_pages/user/components/PatientSidebar.vue

@@ -169,7 +169,7 @@ export default {
             // },
             {
               name: '3-4',
-              label: '病史新'
+              label: '病史'
             },
             {
               name: '3-2',

src/xt_pages/user/sickHistory_new.vue

@@ -471,6 +471,10 @@ export default {
     },
     template_dele(){
       console.log("hahhahahah",this.template_id)
+      if(this.template_id == 0){
+          this.$message.error("默认模版不能删除!")
+          return false
+      }
      deleteSickHistoryTempalte(this.template_id).then(response=>{
         if(response.data.state == 1){
           var msg =  response.data.data.msg
@@ -988,7 +992,8 @@ export default {
 
     },
     getCurrentChangeOne(val){
-      console.log("val-------------------",val.id)
+     
+     
       this.$refs.editorOne.contents = val.content
       this.template_content = ""
       this.template_content = val.content