Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/hospitalStation/invoiceTemplate/printfour.vue

@@ -32,7 +32,7 @@
         </div>
       </div>
       <div style="display:flex;margin-top: 10px;">
-        <div style="width: 150px;"><span >护理费</span> 0</div>
+        <div style="width: 150px;"><span >护理费 </span>{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : '0'}}</div>
         <div style="width: 150px;margin:0 30px;">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
         <div style="width: 150px;margin:0 30px;">化验费 {{ list.laboratoryCostTotal }}</div>
         <div style="width: 150px;margin:0 30px;">手术费 {{ list.operationCostTotal }}</div>
@@ -140,7 +140,8 @@ import {jsGetAge, uParseTime} from "@/utils/tools";
 
 export default {
     props:{
-        paramsObj:Object
+        paramsObj:Object,
+        hisPatient:Object,
     },
     data(){
         return{
@@ -160,6 +161,7 @@ export default {
     },
     mounted(){
         console.log('paramsObj',this.paramsObj)
+        
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
@@ -204,6 +206,7 @@ export default {
               this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
                                     this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
                 this.smalltoBIG( this.list.order.medfee_sumamt)
+                console.log('hisPatient',this.hisPatient);
                 // var data = new Date(res.data.data.date * 1000);
                 var data = new Date(this.paramsObj.setl_time);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
@@ -285,6 +288,9 @@ export default {
             },
             deep:true
         }
+    },
+    created(){
+      console.log('hisPatient',this.hisPatient);
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -133,6 +133,7 @@
       <el-form-item label="体格检查: " prop="name">
         <el-input
           type="textarea"
+          :rows="3"
           v-model="physical_examination"
           placeholder="体格检查"
         ></el-input>
@@ -141,6 +142,7 @@
       <el-form-item label="专科检查: " prop="name">
         <el-input
           type="textarea"
+          :rows="3"
           v-model="special_inspection"
           placeholder="专科检查"
         ></el-input>
@@ -149,6 +151,7 @@
       <el-form-item label="实验室及器械检查: " prop="name" label-width="160px">
         <el-input
           type="textarea"
+          :rows="3"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
@@ -261,7 +264,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.chief_conplaint"
         >
@@ -282,7 +285,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.history_of_present_illness"
         >
@@ -303,7 +306,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.past_history"
         >
@@ -324,7 +327,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.personal_history"
         >
@@ -345,7 +348,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.family_history"
         >
@@ -366,7 +369,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.diagnostic"
         >
@@ -388,7 +391,7 @@
         </el-select>
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.doctor_advice"
         >
@@ -398,7 +401,7 @@
       <el-form-item label="备注" prop="name" style="width: 49%">
         <el-input
           type="textarea"
-          :rows="2"
+          :rows="3"
           placeholder="请输入内容"
           v-model="case_history.remark"
         >

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -38,7 +38,14 @@
                 透析号:{{ item.patient.dialysis_no }}
               </div>
               <div style="flex: 1;">
-                费别:居民医保/职工医保/自费
+                费别:
+                <span v-if="hisPatient.balance_accounts_type==1">
+                  <span v-if="hisPatient.insutype==390">城乡医保</span>
+                  <span v-if="hisPatient.insutype==310">职工医保</span>
+                </span>
+                <span v-else>
+                  {{ getsettlement(hisPatient.balance_accounts_type) }}
+                </span>
               </div>
             </div>
             <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
@@ -301,7 +308,7 @@
                     <div style="flex: 1;">其他:</div>
                   </div>
                   <div style="display: flex;">
-                    <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+                    <div style="flex: 1;">审核药师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
                     <div style="flex: 1;">调配药师：</div>
                     <div style="flex: 1;">核/发药师：</div>
                   </div>
@@ -382,7 +389,7 @@
               <div style="flex: 1;">收费员:</div>
             </div>
             <div style="display: flex;">
-              <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+              <div style="flex: 1;">审核药师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
               <div style="flex: 1;">调配药师：</div>
               <div style="flex: 1;">核/发药师：</div>
             </div>
@@ -396,7 +403,7 @@
               <div style="flex: 1;">其他:</div>
             </div>
             <div style="display: flex;">
-              <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+              <div style="flex: 1;">审核药师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
               <div style="flex: 1;">调配药师：</div>
               <div style="flex: 1;">核/发药师：</div>
             </div>
@@ -454,6 +461,16 @@ export default{
       operators: [],
       doctorList_1: [],
       adminUser:[],
+      settlement:[
+        { value: 1, label: '医保' },
+        { value: 2, label: '自费' },
+        { value: 3, label: '公费' },
+        { value: 4, label: '农保' },
+        { value: 5, label: '会员' },
+        { value: 6, label: '职工' },
+        { value: 7, label: '合同' },
+        { value: 8, label: '医保自费' }
+      ],
     };
   },
   methods: {
@@ -587,7 +604,7 @@ export default{
 
           // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          // console.log("hisPatient", hisPatient);
+          console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           var projectlist = response.data.data.projectlist;
           // console.log("所有项目列表", projectlist);
@@ -738,6 +755,15 @@ export default{
       }
       console.log('777777777',this.arr);
       return this.arr
+    },
+    // 费别
+    getsettlement(ids){
+      const settl = this.settlement
+      for(let i in settl){
+        if(ids == settl[i].value){
+          return settl[i].label
+        }
+      }
     }
   },
   created() {

src/xt_pages/role/admin.vue

@@ -227,12 +227,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button>
 
         <!-- <el-button
           type="primary"

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -265,7 +265,7 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id ==10210 || this.org_id ==10215){
+              if(this.org_id ==10210 || this.org_id ==10215 || this.org_id == 10265){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
                
@@ -278,6 +278,7 @@ export default {
                   list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                 }else{
                   list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                  console.log("剩余库存---------------",list[i].stockIn)
                   if(list[i].stockIn <0){
                     list[i].stockIn =0
                   }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -169,7 +169,7 @@ export default {
                 for(let i=0;i<list.length;i++){
                     // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
 
-                    if(this.org_id == 0 || this.org_id ==10210){
+                    if(this.org_id == 0 || this.org_id ==10210 || this.org_id == 10265){
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                     }else{
                       if(list[i].id== 5052){