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

src/api/drug/drug.js

@@ -954,4 +954,14 @@ export function getPatientAdviceListDetail(params){
     method:"Get",
     params:params
   })
+}
+
+
+export function getSelfDrugWarhouseInfo(params){
+
+  return request({
+    url:"/api/drug/getselfdrugwarehouseinfo",
+    method:"get",
+    params:params,
+  })
 }

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

@@ -478,6 +478,27 @@ export default {
         accepts.consciousness = 1
         accepts.appetite =1
 
+        if(this.$store.getters.xt_user.template_info.org_id== 10293 || this.$store.getters.xt_user.template_info.org_id == 0){
+          accepts.way =1 
+          accepts.posture = 1
+          accepts.consciousness =1
+          accepts.appetite =1
+          accepts.danger_level=1
+          console.log("this.precaution_arr",this.precaution_arr)
+          this.receiveTreatmentAsses.way =1
+          this.receiveTreatmentAsses.consciousness =2
+          this.receiveTreatmentAsses.appetite =2
+          this.receiveTreatmentAsses.posture= 1
+          this.receiveTreatmentAsses.danger_level=2
+          this.receiveTreatmentAsses.precaution = 3
+          var arr = [3,4]
+          this.precautionTwo.push(...arr)
+          this.receiveTreatmentAsses.precaution = this.precautionTwo   
+          accepts.precaution= ""
+          accepts.precaution = "3,4"
+          
+       }
+
       }
       this.accepts = accepts;
      console.log("accepts", accepts);
@@ -770,6 +791,8 @@ export default {
     if(this.lastTreat!=null){
       if(this.receiveTreatmentAsses.condition ==1){
         this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+        this.receiveTreatmentAsses.his_bed = this.lastTreat.his_bed
+        this.receiveTreatmentAsses.his_department = this.lastTreat.his_department
       }
     
     }
@@ -789,6 +812,8 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
+
+   
   },
  
 };

src/xt_pages/dialysis/patientAdviceList.vue

@@ -71,28 +71,52 @@
                         </div>
                     </div> -->
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                        <el-table-column align="center" prop="dialysis_no" label="药品名称">
+                       
+                      <el-table-column align="center" prop="dialysis_no" label="药品编号">
+                            <template slot-scope="scope">
+                                {{ scope.row.drug_id }}
+                            </template>
+                        </el-table-column>
+                       <el-table-column align="center" prop="dialysis_no" label="药品名称">
                             <template slot-scope="scope">
-                                {{ scope.row.advice_name }}
+                               <span v-if="scope.row.drug_id >0">
+                                 {{ scope.row.advice_name }}
+                               </span>
+                               <span v-if="scope.row.drug_id ==0" style="color: red;">
+                                 {{ scope.row.advice_name }}
+                               </span>
                             </template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="规格名称">
                             <template slot-scope="scope">{{ scope.row.specification_name }}</template>
                         </el-table-column>
+
+                        <el-table-column align="center" prop="name" label="自备药入库数量">
+                            <template slot-scope="scope">
+                              {{ getCountInfo(scope.row.drug_id) }}
+                            </template>
+                        </el-table-column>
                        
                         <el-table-column align="center" prop="name" label="开药数量">
                             <template slot-scope="scope">
                               {{getTotal(scope.row.child)}}
                             </template>
                         </el-table-column>
+
+                        <el-table-column align="center" prop="name" label="剩余数量">
+                            <template slot-scope="scope">
+                               {{ getCountInfo(scope.row.drug_id) - getTotal(scope.row.child)}}
+                            </template>
+                        </el-table-column>
                         <el-table-column align="center" prop="dialysis_no" label="单位">
                             <template slot-scope="scope">{{scope.row.prescribing_number_unit}}</template>
                         </el-table-column>
                        
                        
-                        <el-table-column align="center" prop="name" label="操作">
+                        <el-table-column align="center" prop="name" label="操作" width="300">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="primary" @click="toDetail(scope.row.advice_name,scope.row.patient_id)">明细</el-button>
+                                <el-button size="mini" type="primary" @click="getSelfDrugWarhouseInfo(scope.row.drug_id,scope.row.patient_id)">入库明细</el-button>
+                                <el-button size="mini" type="primary" @click="toDetail(scope.row.advice_name,scope.row.patient_id)">使用明细</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -132,6 +156,36 @@
             <el-button type="primary" @click="adviceDialogVisible = false">确 定</el-button>
         </span>
      </el-dialog>
+
+
+     <el-dialog
+         title="入库详情"
+        :visible.sync="drugInfoDialogVisible"
+        width="50%">
+        <span>
+         <el-table :data="drugWarehouseInfo" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                
+                <el-table-column align="center" prop="name" label="入库时间">
+                    <template slot-scope="scope">{{getTime(scope.row.ctime)}}</template>
+                </el-table-column>
+                
+                <el-table-column align="center" prop="name" label="入库数量">
+                    <template slot-scope="scope">
+                        {{scope.row.warehousing_count}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="dialysis_no" label="单位">
+                    <template slot-scope="scope">{{scope.row.max_unit}}</template>
+                </el-table-column>
+                
+                
+            </el-table> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="drugInfoDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="drugInfoDialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
     </div>
 </template>
 
@@ -141,7 +195,7 @@
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 const moment = require('moment')
 import { PostSearch } from '@/api/patient'
-import { getCurrentPatient,saveRadio,getPatientAdviceList,DeleteDrugNameById,getDrugSet,getPatientDetail,getPatientAdviceListDetail} from "@/api/drug/drug"
+import { getCurrentPatient,saveRadio,getPatientAdviceList,DeleteDrugNameById,getDrugSet,getPatientDetail,getPatientAdviceListDetail,getSelfDrugWarhouseInfo} from "@/api/drug/drug"
 import { TimeSelect } from "element-ui";
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -172,7 +226,10 @@ export default {
             outStocklist:[],
             outList:[],
             tableList:[],
-            adviceDialogVisible:false
+            adviceDialogVisible:false,
+            drugInfo:[],
+            drugWarehouseInfo:[],
+            drugInfoDialogVisible:false
         }
     },
     methods:{
@@ -294,6 +351,12 @@ export default {
                    }
                    this.tableData = []
                    this.tableData = arr
+
+                  var drugInfo  = response.data.data.drugInfo
+
+                  this.drugInfo = drugInfo
+
+                  console.log("drugInfo============",drugInfo)
                 }
               
               }
@@ -406,7 +469,43 @@ export default {
         }else {
             return uParseTime(val, '{y}-{m}-{d}')
         }
-     },
+       },
+       getCountInfo(drug_id){
+        var count = 0
+        var arr = []
+        for(let i=0;i<this.drugInfo.length;i++){
+          if(drug_id == this.drugInfo[i].drug_id){
+              arr.push(this.drugInfo[i])
+          }
+        }
+        if(arr!=null && arr.length>0){
+          for(let i =0;i<arr.length;i++){
+             count+=arr[i].warehousing_count
+          }
+        }
+        if (count > 0) {
+           return count
+        }else{
+          return ""
+        }
+       },
+       getSelfDrugWarhouseInfo(drug_id,patient_id){
+          var params = {
+            drug_id:drug_id,
+            patient_id:patient_id
+          }
+         getSelfDrugWarhouseInfo(params).then(response=>{
+          
+            if(response.data.state ==1){
+             
+              var drugWarehouseInfo = response.data.data.drugInfo
+
+              this.drugWarehouseInfo = drugWarehouseInfo
+              this.drugInfoDialogVisible = true
+             
+            }
+         })
+       }
 
     },
     created(){

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1193,6 +1193,7 @@ export default {
         { value: 12, label: '门诊挂号' },
         { value: 1102, label: '新冠门诊' },
         { value: 14, label: '门诊特殊病' },
+        { value: '140201', label: '门诊特殊病(140201)' },
         { value: '992102', label: '单病种(992102)' },
         { value: '140104', label: '城乡门诊特殊病(140104)' },
         { value: '1104', label: '异地门特'},
@@ -5935,14 +5936,13 @@ export default {
             case 992102:
               return '单病种(992102)' + '处方' + index
               break
-            case 1104:
-              return '异地门特(1104)' + '处方' + index
-              break
 
             case 140104:
               return '门诊特殊病(140104)' + '处方' + index
               break
-
+            case 140201:
+              return '门诊特殊病(140201)' + '处方' + index
+              break
             case 999999:
               return '自费' + '处方' + index
               break
@@ -5991,7 +5991,9 @@ export default {
             case 990101:
               return '单病种(990101)' + '处方' + index
               break
-
+            case 140201:
+              return '门诊特殊病(140201)' + '处方' + index
+              break
           }
 
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -661,10 +661,9 @@ export default {
         { value: 9922, label: '家庭通道' },
         { value: 9933, label: '门诊特殊病(9933)' },
         { value: 990602, label: '门诊特殊病(990602)' },
-
+        { value: 140201, label: '门诊特病(140201)' },
         { value: 992102, label: '单病种(992102)' },
         { value: 140104, label: '城乡门诊特殊病(140104)' },
-
         { value: 1402, label: '门诊特殊病(1402)' },
         { value: 1401, label: '门诊慢特病(1401)' },
         { value: 2302, label: '异地就医(2302)' },
@@ -673,8 +672,6 @@ export default {
         { value: 999999, label: '自费' },
         { value: 118801, label: '118801' }
 
-
-
       ],
       register10721: [
         { value: 11, label: '普通门诊' },

src/xt_pages/outpatientTool/components/print9919.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id != 10480">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id != 10480 && this.$store.getters.xt_user.org.id != 10387">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org.id == 10387">湖南省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-else>安徽省社会医疗保险医疗费用结算单</div>
     <table class="statementTable" border="1" style="border-collapse: collapse;">
       <tr>

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

@@ -210,7 +210,7 @@
            {{getStorehouseName(scope.row.storehouse_id)}}
           </template>
         </el-table-column>
-        <el-table-column label="出货价" align="center">
+        <el-table-column label="出库价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
            <span v-else>
@@ -591,7 +591,11 @@ export default {
              if(this.org_id == 9919){
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
-             }else{
+             }else if(this.org_id == 0){
+                order[i].total_price = order[i].total_price
+             }else if(this.org_id == 10721){
+              order[i].total_price = order[i].total_price
+             } else{
                if(order[i].price > 0){
                   order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
@@ -601,7 +605,7 @@ export default {
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
-                    
+                     
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
@@ -752,8 +756,7 @@ export default {
     },
 
      exportList(){
-        
-        
+         
        
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
@@ -770,7 +773,12 @@ export default {
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
             
-           }else{
+           }else if(this.org_id == 10721){
+            this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+            this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+            this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))))*this.tablePrint[i].price).toFixed(2)
+            this.tablePrint[i].total = this.getTotalPriceTwo(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
+           } else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
@@ -785,7 +793,7 @@ export default {
         
         console.log("wowowoowowowowo",this.tablePrint)
         
-       
+      
       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
@@ -866,8 +874,15 @@ export default {
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
               }
 
-            }else{
+            }else if(this.org_id == 10721){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            }else if(this.org_id == 0){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            } else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+
               if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
@@ -1184,6 +1199,7 @@ export default {
         }
         return str + min_str
       },
+      
       getTotalPrice(arr,max_unit,min_number,min_price){
         console.log("arrwoowowow",arr)
       
@@ -1217,6 +1233,14 @@ export default {
 
         return total*min_price
       },
+      getTotalPriceTwo(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+
+        return total*min_price
+      },
       getCountSix(drug_id,val){
 
         var count = 0

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -319,6 +319,7 @@
         var str = ""
         var min_str = ""
         for(let i=0;i<arr.length;i++){
+          console.log("arr-----",arr)
           arr[i].total_count = 0
           if(arr[i].count_unit == max_unit){
             arr[i].total_count = parseInt(arr[i].count) * min_number

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1164,7 +1164,7 @@ export default {
    },
    exportList: function() {
 
-       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697){
+       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697 && this.org_id!=10375){
          
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1

src/xt_pages/stock/selfPreparedMedicine/selfDrugQuery.vue

@@ -12,6 +12,7 @@
             
               <el-tab-pane label="患者查询" name="second">
                   <patient-drug-query ref="mychildtwo"></patient-drug-query>
+
               </el-tab-pane>
           </el-tabs>
        </div>