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

src/xt_pages/Pharmacy/drugCode.vue

 
 
     </el-table>
+    
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10633  && this.$store.getters.xt_user.org_id != 0"
                  style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
           :value="item.value">
         </el-option>
       </el-select>
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10633"
+                 style="width:50%;" v-model="temp_med_type"
+                 placeholder="医疗类型" @change="changevalue">
+        <el-option
+          v-for="(item,index) in register10633"
+          :key="index"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
 
       <el-select v-if="this.$store.getters.xt_user.org_id == 10721  "
                  style="width:50%;" v-model="temp_med_type"
       //   { value: '91', label: '新冠肺炎门诊' },
 
       // ],
+      register10633: [
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊特殊病' },
+        { value: '140201', label: '门诊特殊病(140201)' },
+        { value: '1104', label: '异地门特'},
+        { value: '999999', label: '自费' },
+      ],
       register: [
         { value: 11, label: '普通门诊' },
         { value: 12, label: '门诊挂号' },
         })
     },
     openDialog(item) {
+
+      if(this.org_id == 10644 && item.order.order_status == 1 && item.order.med_type == item.med_type){
+        this.$confirm("当前处方处于预结算状态，无法调整医疗类型，请撤销明细后再进行调整医疗类型", '错误信息', {
+          confirmButtonText: '确 定',
+          type: 'warning'
+        }).then(() => {
+          this.dialogVisible = false
+        }).catch(() => {
+          this.dialogVisible = false
+        })
+        return
+      }
+      if(this.org_id == 10633){
+        this.temp_med_type = "140201"
+      }
       this.dialogVisible = true
       this.temp_prescriptions = item
     },

src/xt_pages/outpatientTool/components/settle.vue

               <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
           </el-table-column>
 
+        <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
+          <template slot-scope="scope">{{scope.row.preselfpay_amt.toFixed(2)}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
+          <template slot-scope="scope">{{scope.row.overlmt_self_pay.toFixed(2)}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
+          <template slot-scope="scope">{{scope.row.fulamt_ownpay_amt.toFixed(2)}}</template>
+        </el-table-column>
 
-          <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
+        <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
+          <template slot-scope="scope">{{scope.row.inscp_scp_amt.toFixed(2)}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
               <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
           </el-table-column>
 
       <el-table-column align="center" prop="hifob_pay" label="大额基金支付">
         <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
       </el-table-column>
+      <el-table-column align="center" prop="preselfpay_amt" label="先行自付金额">
+        <template slot-scope="scope">{{scope.row.preselfpay_amt.toFixed(2)}}</template>
+      </el-table-column>
 
+      <el-table-column align="center" prop="overlmt_self_pay" label="超限价金额">
+        <template slot-scope="scope">{{scope.row.overlmt_self_pay.toFixed(2)}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="fulamt_ownpay_amt" label="全自费金额">
+        <template slot-scope="scope">{{scope.row.fulamt_ownpay_amt.toFixed(2)}}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="inscp_scp_amt" label="符合政策范围金额">
+        <template slot-scope="scope">{{scope.row.inscp_scp_amt.toFixed(2)}}</template>
+      </el-table-column>
 
       <el-table-column align="center" prop="maf_pay" label="医疗救助基金">
         <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
           }
 
         }else if(row.insutype == '310'){
-          // let a =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
+          // let c =  config.mdtrtarea_admvs.slice(0, 4); //就医地前4位编码
           let a = this.config.mdtrtarea_admvs.slice(0, 3); //就医地前3位编码
 
 
-          // let aa=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
+          // let d=  row.his.insuplc_admdvs.slice(0, 4); //参保地前4位编码
           let b=  row.his.insuplc_admdvs.slice(0, 3); //参保地前3位编码
           if(a == b){
+
             name = "本地职工"
           }else{
             name = "异地职工"

src/xt_pages/outpatientTool/gatherPrint.vue

          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 20px;">
             <div>预交款：</div>
             <div>总费用：{{getAllPice()}}</div>
-            <div>门诊日期：{{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id != 10387">门诊日期：{{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id == 10387">门诊日期：{{this.$route.query.start_time}} ~ {{this.$route.query.end_time}}</div>
+
         </div>
         <div class="listInfo">
             <div>西药：{{getWesternMedicineCostTotal()}}</div>

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

            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
              
-              if(this.org_id == 0 || this.org_id == 10644){
+              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugInMoney = ""
               }else{
                 list[i].drugInMoney = list[i].last_price
               }
               if(this.org_id == 10697){
                 list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
               
                 list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
               } else{
               if( this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 console.log("本期增加加淀粉",list[i].drugAddSalePrice)
               if( this.org_id == 10697){
                 list[i].drugOutPrice = list[i].retail_price
                 list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugOutPrice = "/"
                 list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               } else{
             if(this.org_id == 10697){
                 list[i].overDrugPrice = list[i].retail_price
                 list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-            }else if(this.org_id == 0 || this.org_id ==10644){
+            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
               console.log("加个2323323",list[i].drugAddSalePrice)
                 list[i].overDrugPrice = ""
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)

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

               
                list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                
-               if(this.org_id == 0 || this.org_id == 10644){
+               if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugInMoney = ""
               }else{
                 list[i].drugInMoney = list[i].last_price
 
                 if( this.org_id == 10697){
                   list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
-                }else if(this.org_id == 0 || this.org_id == 10644){
+                }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                   list[i].drugAddPrice = ""
                   list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
                 if(this.org_id == 10697){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-                }else if(this.org_id == 0 || this.org_id ==10644){
+                }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
                   list[i].drugAddPrice = "/"
                   list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                   console.log("本期增加加淀粉",list[i].drugAddSalePrice)
                 if( this.org_id == 10697){
                   list[i].drugOutPrice = list[i].retail_price
                   list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-                }else if(this.org_id == 0 || this.org_id == 10644){
+                }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                   list[i].drugOutPrice = "/"
                   list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
                 } else{
                 if(this.org_id == 10697){
                   list[i].overDrugPrice = list[i].retail_price
                   list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-                }else if(this.org_id == 0 || this.org_id ==10644){
+                }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
                   list[i].overDrugPrice = ""
                   list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 } else{

src/xt_pages/stock/drugs/drugStockOutOrder.vue

        
           this.outList = drugoutlist
           this.drugOutInfo = drugoutlist
+
           if (is_sys == 1) {
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
             this.drugFlowList = drugFlowList;
           }
 
+
+
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
             //出库详情
             var flowlist = response.data.data.flowlist;
+            console.log("flowList========================",flowlist)
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
                flowlist[i].childOne = []
          
           this.tableList = list;
         }
+
+
+
         if(is_sys == 12){
           
           for(let i=0;i<list.length;i++){
           this.tableList = list;
         }
 
+
+
         if(is_sys == 0){
           console.log("list999992332232323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
-              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id))
-               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id)
+              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehousing_detail_id))
+               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].childOne[j].warehousing_detail_id)
+
             }
+            
           }
+          console.log("中国list=====================",list)
+
 
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
           this.tableList = list;
         }
          
-         console.log("tableLIST==================",this.tableList)
+         console.log("hhahhahwotableLIST==================",this.tableList)
 
         }
       });
       return max_str + min_str;
     },
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id,warehousing_detail_id){
-      
-      console.log("warehousing_detail_id",warehousing_detail_id)
-      console.log("tabList-----------------",this.tabList)
+     
       var arr = []
       var total = 0
       var max_str = ""
       }
       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
     
-      console.log("taolaa------",total,drug_id)
+     
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            price = arr[0].price

src/xt_pages/stock/query/purchaseNewStockQuery.vue

                if(this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 0 || this.org_id == 10644){
+               }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                  list[i].stock_in_price = "/"
                  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
                  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
               if(this.org_id ==10697){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
               if(this.org_id == 10697){
                 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){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                 if(list[i].saleOutMoney == "NaN"){
               if(this.org_id ==10697){
                 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){
+              }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
                 list[i].overPrice = "/"
                 // console.log("stockMoney-00000000000000",list[i].stockMoney)
                 // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

                     if(this.org_id == 0 || this.org_id ==10697){
                       list[i].stock_in_price = list[i].buy_price
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-                    }else if(this.org_id == 0 || this.org_id == 10644){
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
                       if(list[i].stockMoney>0){
                     if(this.org_id == 0 || this.org_id ==10697){
                         list[i].addStockMoney = list[i].buy_price 
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-                    }else if(this.org_id == 0 || this.org_id == 10644){
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].addStockMoney = "/"
                       list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
                      
                     if(this.org_id == 0 || this.org_id == 10697){
                       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){
+                    }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].stockOutprice = "/"
                       list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                       if(list[i].saleOutMoney == "NaN"){
                     if(this.org_id == 0 || this.org_id ==10697){
                       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){
+                     }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].overPrice = "/"
                       console.log("stockMoney-00000000000000",list[i].stockMoney)
                       console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)

src/xt_pages/user/courseOfDisease_new.vue

                 记录时间:
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
                               style="width: 250px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              format="yyyy-MM-dd HH:mm:ss"
+                               value-format="yyyy-MM-dd HH:mm:ss"
+                              type="datetime" placeholder="选择日期时间" align="right" 
                               ></el-date-picker>
               </div>
               <div style="flex: 1;">
       },
       getCurrentChangeOne(val){
         this.$refs.editor.contents = val.content
-        this.record_date = this.getTimeThree(val.record_time)
+        this.record_date = ""
+        if(val.id > 0){
+          this.record_date = this.getTimeThree(val.record_time)
+        }else{
+          this.record_date  = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        }
+        console.log("record_date----------------",this.record_date)
         this.admin_user_id = val.recorder
         if(this.admin_user_id == 0){
            this.admin_user_id = ""
         var params = {
           id:this.id,
           patient_id:this.patient_id,
-          record_date:"",
+          record_date:this.record_date,
           content:this.new_content,
           admin_user_id:this.admin_user_id,
         }
-        if(this.id == 0){
-          params.record_date = this.getTimeThree(this.record_date)
-        }
-        if(this.id > 0){
-          params.record_date = this.record_date
-        }
+       
         console.log("params",params)
 
-      
-
         createNewCourseOfDiseaseRecord(params).then(response => {
          if(response.data.state == 1){
            var msg = response.data.data.msg