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

src/api/dialysis_record.js

@@ -85,7 +85,7 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
   })
 }
 
-export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode, puncture_point_haematoma, internal_fistula, catheter, cruor, mission) {
+export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode, puncture_point_haematoma, internal_fistula, catheter, cruor, mission,condenser) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -96,7 +96,8 @@ export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mo
     internal_fistula: internal_fistula,
     catheter: catheter,
     cruor: cruor,
-    mission: mission
+    mission: mission,
+    condenser:condenser,
   }
   return request({
     url: '/api/dialysis/finish',

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

@@ -203,7 +203,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('灌流器凝血')">
+          <!-- <el-col :span="8" v-if="isShow('灌流器凝血')">
             <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')" :rules="isCheckmust('灌流器凝血')">
               <el-input
                 v-model="form.condenser "
@@ -211,7 +211,7 @@
                 @focus="showDialog('11')"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8" v-if="isShow('管路凝血')">
             <el-form-item label="管路凝血: " :prop="isName('管路凝血')" :rules="isCheckmust('管路凝血')">

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

@@ -446,7 +446,8 @@ export default {
         dialysis_irrigation: "",
         blood_access_id: "",
         nuclein_date: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
-        catheter_operation:""
+        catheter_operation:"",
+        blood_flow_volume:"" ,
       },
       blood_access_option: [],
       schedual_type: 0,
@@ -476,7 +477,7 @@ export default {
       infoDialogVisible:false,
       selected_date:"",
       remark:"",
-      blood_flow_volume:"" ,
+     
     };
   },
   props: {

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

@@ -53,6 +53,16 @@
           ></el-input>
        </el-form-item>
 
+       <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')"
+              :rules="isCheckmust('灌流器凝血')" v-if="isShowFiled('灌流器凝血')">
+          <el-input
+            style="width:200px"
+            v-model="form.condenser"
+            readonly
+            @focus="showInnerDialog('2')"
+          ></el-input>
+       </el-form-item>
+
         <el-form-item label="宣教知识：" :prop="isName('宣教知识')"
               :rules="isCheckmust('宣教知识')" v-if="isShowFiled('宣教知识')">
           <el-select @change="dialysisAfterTeachSelectChange" v-model="form.mission_id">
@@ -172,6 +182,7 @@
           cruor:"",
           mission:"",
           mission_id:"",
+          condenser:"",
         },
         internal_fistula: [],
         InnerDialogProps: {
@@ -418,6 +429,7 @@
             ParamsQuery["cruor"] = this.form.cruor
             ParamsQuery["mission"] = this.form.mission
             ParamsQuery["mission_id"] = this.form.mission_id
+            ParamsQuery["condenser"] = this.form.condenser
             if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
               ParamsQuery["mode"] = "3"
             }
@@ -465,7 +477,7 @@
              let mode = "1"
              console.log("fomr",this.form.mission_id)
 
-            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor,this.form.mission,this.form.mission_id).then(rs => {
+            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor,this.form.mission,this.form.mission_id,this.form.condenser).then(rs => {
               this.loading = false
               var resp = rs.data
               if (resp.state == 1) {
@@ -548,11 +560,18 @@
             break
             case '1':
             this.InnerDialogProps.values = this.cruorOptions
-            this.InnerDialogProps.titles = '凝血'
+            this.InnerDialogProps.titles = '透析器凝血'
             this.InnerDialogProps.type = 'cruor'
             this.InnerDialogProps.selected = this.form.cruor
             this.InnerDialogProps.isShowTextArea = false
             break
+            case '2':
+            this.InnerDialogProps.values = this.cruorOptions
+            this.InnerDialogProps.titles = '灌流器凝血'
+            this.InnerDialogProps.type = 'condenser'
+            this.InnerDialogProps.selected = this.form.condenser
+            this.InnerDialogProps.isShowTextArea = false
+            break
 
         }
       },
@@ -568,6 +587,9 @@
           case 'cruor':
           this.form.cruor = val.value.join(',')
           break
+          case 'condenser':
+          this.form.condenser = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {

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

@@ -270,14 +270,14 @@
             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -102,7 +102,7 @@
           <div style="flex:1;">
             首剂
             <span class="under-line" style="display:inline-block;width: 50%;">
-              {{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "0" }}
+              {{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "0" }}
             </span>
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
             <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
@@ -146,13 +146,13 @@
           <div style="flex: 1;">
             处方脱水量
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }}
+              {{ prescription.prescription_water ? prescription.prescription_water : "" }}L
             </span>
           </div>
           <div style="flex: 1;">
             透析液流量
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}
+              {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}ml/min
             </span>
           </div>
           <div style="flex: 1;">
@@ -177,7 +177,9 @@
           <div style="flex: 1;">
             透 (滤) 器
             <span class="under-line" style="display: inline-block;width: 50%;" >
-              {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+              {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}
+
+              {{ prescription.dialysis_strainer ? prescription.dialysis_strainer : "" }}
             </span>
           </div>
           <div style="flex: 1;">
@@ -190,15 +192,28 @@
             透析液：
             <div style="display: inline-block;margin-right: 10px;">
               <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span style="position: relative; top: -4px; left: -2px;">√</span>
+                <span style="position: relative; top: -4px; left: -2px;">
+                   <span v-if="prescription.dialyzate.indexOf('碳酸')!=-1">√</span>
+                </span>
               </div>&nbsp;碳酸
-            </div>
-            <div style="display: inline-block;">
-              <!-- <input type="checkbox" style="-webkit-appearance: checkbox">&nbsp;醋酸 -->
+              <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
+                      碳酸
+               </div>
+            </div> -->
+            <!-- <div style="display: inline-block;">
+
               <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span style="position: relative; top: -4px; left: -2px;">√</span>
+                <span v-if="prescription.dialyzate.indexOf('醋酸')!=-1">√</span>
               </div>&nbsp;醋酸
+
+            </div> -->
+            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
+                 碳酸
             </div>
+
+            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('醋酸')>-1">
+                醋酸
+               </div>
           </div>
         </div>
         <div style="display: flex;border-left: 1px solid black;border-right: 1px solid black;padding: 5px;">
@@ -320,7 +335,7 @@
                 {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
-                    : ""
+                    : "0"
                 }}
               </span>
             </td>
@@ -328,7 +343,7 @@
             <!-- T -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.temperature ? monitor.temperature : "" }}
+                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
               </span>
             </td>
             <!-- HR -->

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -60,6 +60,7 @@
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
       <!-- 大冶 -->
       <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
+
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
@@ -1078,7 +1079,7 @@ export default {
                 that.info = response.data.data.info
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
-
+                that.info['psn_cash_pay'] = response.data.data.psn_cash_pay
                 that.info['new_order'] = response.data.data.order
                 that.info['p_admin'] = that.p_admin
                 that.info['charge_admin'] = that.charge_admin

src/xt_pages/outpatientCharges/summary.vue

@@ -1380,6 +1380,7 @@ export default {
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
                 month: order.setl_time.split(" ")[0].split("-")[1],
+                ddd:this.getTimes(order.settle_accounts_date),
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,
@@ -1409,7 +1410,7 @@ export default {
                 "医保类型": list[i].insutype,
                 "年": list[i].year,
                 "月": list[i].month,
-
+                "时间": list[i].ddd,
                 "药品编码": list[i].code,
                 "费用类型": list[i].item_type_name,
                 "名称": list[i].item_name,
@@ -1429,6 +1430,7 @@ export default {
               "医保类型",
               "年",
               "月",
+              "时间",
               "药品编码",
               "费用类型",
               "名称",
@@ -1444,6 +1446,7 @@ export default {
               "医保类型",
               "年",
               "月",
+              "时间",
               "药品编码",
               "费用类型",
               "名称",
@@ -1771,7 +1774,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2023年第三季度",
+              "周期": "2023年第四季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2592,7 +2592,53 @@ export default {
           //   }
           // }
           if (index == 1) {
-            console.log(this.prescriptions)
+            // console.log(this.prescriptions)
+
+            if (this.org_id == 10206 || this.org_id == 0){
+              console.log(this.prescriptions)
+
+              //药品
+              for(let i = 0; i < this.prescriptions.length; i++){
+                  for(let b = 0; b < this.prescriptions[i].advices.length; b++){
+                    // if(this.prescriptions[i].advices[b].advice_id == 0) {
+                      // this.judgmentsDrugStock(this.prescriptions[i].advices[b].drug.bby01, this.prescriptions[i].advices[b].drug.bbx01,this.prescriptions[i].advices[b].drug_name,this.prescriptions[i].advices[b].prescribing_number,isLoading)
+                      for (let c = 0; c < this.zuobiao_drug.length; c++) {
+                        if (this.zuobiao_drug[c].bby01 == this.prescriptions[i].advices[b].drug.bby01) {
+                          if (this.zuobiao_drug[c].sysl < parseInt(this.prescriptions[i].advices[b].prescribing_number)){
+                            isLoading = false
+                            this.$message.error(this.prescriptions[i].advices[b].drug_name + "库存不足，无法保存")
+                            return
+                          }
+                        }
+                      }
+                    // }
+                  }
+              }
+              //耗材
+              for(let i = 0; i < this.prescriptions.length; i++){
+
+                  for(let b = 0; b < this.prescriptions[i].project.length; b++){
+                    if(this.prescriptions[i].project[b].type == 3){
+                      // if(this.prescriptions[i].project[b].id == 0) {
+                        // this.judgmentsGoodStock(this.prescriptions[i].project[b].good_info.bby01, this.prescriptions[i].project[b].good_info.bbx01,this.prescriptions[i].project[b].good_info.good_name,this.prescriptions[i].project[b].good_info.specification_name,this.prescriptions[i].project[b].total,isLoading)
+                        for (let c = 0; c < this.zuobiao_project.length; c++) {
+                          if (this.zuobiao_project[c].bbx01 == this.prescriptions[i].project[b].good_info.bbx01 && this.zuobiao_project[c].bby06 == this.prescriptions[i].project[b].good_info.specification_name) {
+                            if (this.zuobiao_project[c].lsqty < parseInt(this.prescriptions[i].project[b].total)){
+                              isLoading = false
+                              this.$message.error(this.prescriptions[i].project[b].good_info.good_name + "库存不足，无法保存")
+                              return
+                            }
+                          }
+                        }
+
+                      //
+                      // }
+                    }
+                  }
+              }
+            }
+
+
 
             if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2624,6 +2670,10 @@ export default {
               }
             }
 
+            //库存限制
+
+
+
 
             this.$emit('editKeepLoad', true)
             var str = ""
@@ -3119,6 +3169,27 @@ export default {
           }
         }
       }
+    },judgmentsDrugStock(bby01, bbx01,name,count,isLoading){
+      for (let i = 0; i < this.zuobiao_drug.length; i++) {
+          if (this.zuobiao_drug[i].bby01 == bby01) {
+            if (this.zuobiao_drug[i].sysl < parseInt(count)){
+              isLoading = false
+              this.$message.error(name + "库存不足，无法保存")
+              return
+            }
+          }
+      }
+
+    },judgmentsGoodStock(bby01, bbx01,name,specification_name,count,isLoading){
+      for (let i = 0; i < this.zuobiao_project.length; i++) {
+        if (this.zuobiao_project[i].bbx01 == bbx01 && this.zuobiao_project[i].bby06 == specification_name) {
+          if (this.zuobiao_project[i].lsqty < parseInt(count)){
+            isLoading = false
+            this.$message.error(name + "库存不足，无法保存")
+            return
+          }
+        }
+      }
     },
     addTab(targetName) {
 
@@ -3651,6 +3722,8 @@ export default {
                 groupno: index + temp_index,
                 hosp_appr_flag: '1',
                 execution_state:2,
+
+
               }
               if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                 obj.prescribing_number = 1
@@ -3840,6 +3913,7 @@ export default {
               project_name: good_info[i].good_name,
               statistical_classification: '',
               single_dose: good_info[i].specification_name,
+              specification_name: good_info[i].specification_name,
               delivery_way: '',
               execution_frequency: '',
               number_days: 1,

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1143,6 +1143,7 @@ export default {
       })
     },
     setMonthPrescription(month_prescriptions) {
+      console.log("--======-66666777--====")
 
       this.month_prescriptions = []
 
@@ -1271,6 +1272,14 @@ export default {
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
             obj['unit'] = project_month_prescriptions.project[a].unit
             obj['project_id'] = project_month_prescriptions.project[a].project_id
+
+
+            if(project_month_prescriptions.project[a].project_id == 12302){
+              console.log("--======---====")
+              console.log("--======---====")
+              console.log(count)
+            }
+
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
@@ -1945,7 +1954,8 @@ export default {
                     hosp_appr_flag: '1',
                     execution_state: 2,
                     is_self_drug: '',
-                    drug_way_count: '1'
+                    drug_way_count: '1',
+
 
                   }
 
@@ -2289,7 +2299,7 @@ export default {
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
-                        drug_way_count: prescription.advices[b].drug_way_count
+                        drug_way_count: prescription.advices[b].drug_way_count,
 
                       }
                       tempAdvice.push(obj)

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -113,7 +113,7 @@
       </el-table-column>
       <el-table-column align="center" label="金额" prop="total_all">
         <template slot-scope="scope">
-          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
+          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
           <span>{{
             (scope.row.count_number * scope.row.pric).toFixed(2)
@@ -455,7 +455,7 @@ export default {
             this.item_type = this.id;
           }
           console.log(this.item_type,'this.item_type')
-          
+
 
           if (this.keywords != "") {
             for (let i = 0; i < this.tableList.length; i++) {
@@ -1165,7 +1165,7 @@ export default {
     getLaboratoryCostTotal() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
-        if (this.tableList[i].cost_type == "化验费") {
+        if (this.tableList[i].cost_type == "化验费" || this.tableList[i].cost_type == "化验") {
           total_price +=
             this.tableList[i].count_number * this.tableList[i].pric;
         }