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

src/api/fallassement.js

@@ -61,4 +61,49 @@ export function getAllNurseList(params){
       method:"post",
       data:data,
     })
+  }
+
+  export function getPedDiatricFallAssessmentList(params){
+   
+    return request({
+      url:"/api/patient/getbeddiatricfallassessmentlist",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function getPedPatientFallAssessmentById(id,params){
+   
+    return request({
+      url:"/api/patient/getpedpatientfallassessmentbyid?id="+id,
+      method:"get",
+      params:params
+    })
+  }
+
+  export function deletePedPatientFallassment(id,params){
+   
+    return request({
+      url:"/api/patient/deletepedpatientfallassment?id="+id,
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function savePatientPressuresore(data){
+   
+    return request({
+      url:"/api/patient/savepatientpressuresore",
+      method:"post",
+      data:data,
+    })
+  }
+
+  export function savePatientHpressuresore(data){
+   
+    return request({
+      url:"/api/patient/savepatienthpressuresore",
+      method:"post",
+      data:data,
+    })
   }

src/xt_pages/dialysis/PatientBox.vue

@@ -361,6 +361,7 @@ export default {
       modedata: 0,
       stockType: [],
       dryWeightList:[],
+      lastAccept:{id:0}
     };
   },
   props: {
@@ -580,6 +581,9 @@ export default {
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation;
           console.log("上次透前评估", lastPredialysisEvaluation);
+          this.lastAccept = resp.data.lastAcceptTreatment
+          console.log("上次透析数据----",this.lastAccept)
+          
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0;

src/xt_pages/dialysis/batch_print/batch_print_order_seventyone.vue

@@ -689,7 +689,9 @@
                     </td>
                     <td v-if="advice_index === 4">净脱水量</td>
                     <td v-if="advice_index === 4">
-                      {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '0'}}L
+                      {{record.assessment_after_dislysis.actual_ultrafiltration ? record.assessment_after_dislysis.actual_ultrafiltration : '0'}}
+                      <span v-if="org_id ==10617"> ml</span>
+                      <span v-else>L</span>
                     </td>
                     <td v-if="advice_index === 5">透后体重</td>
                     <td v-if="advice_index === 5">

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -1170,10 +1170,10 @@
                                   v-if=" record.dialysis_order && monitor_record.operate_time == 
                                     record.dialysis_order.start_time
                                   "
-                                  >【开始透析】引血100ml/min</template
+                                  >【开始透析】引血 {{ record.dialysis_order.blood_drawing }} ml/min</template
                                 >
                                 {{ monitor_record.end }}
-                                 &nbsp;{{ monitor_record.dispose}}
+                                 &nbsp;
                                 &nbsp;
                               </span>
                             </div>
@@ -1991,15 +1991,15 @@ export default {
             for(let j=0;j<this.records[i].monitor_records.length;j++){
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
-              this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
+              this.records[i].monitor_records[j].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
               tempmonitorflag = false;
             }
             if(this.org_id!=10515 ){
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
-              this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
+              this.records[i].monitor_records[j].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
              }
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
+               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血"+this.records[i].dialysis_order.blood_drawing +"ml/min"
              }
             }
 

src/xt_pages/dialysis/details/NavIgation.vue

@@ -110,6 +110,7 @@
       ref="accepts"
       :patient="patient"
       :receiver_treatment_access="receiver_treatment_access"
+      :lastTreat="lastTreat"
     ></accepts-treatment-dialog>
 
     <assessment-before-dislysis-dialog
@@ -588,6 +589,12 @@ export default {
     },
     record_date:{
       type:String
+    },
+    lastTreat:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
     }
   },
   methods: {

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

@@ -77,7 +77,7 @@
         :rules="isCheckmust('病人情况')"
         v-if="isShow('病人情况')"
       >
-      <el-radio-group v-model="receiveTreatmentAsses.condition">
+      <el-radio-group v-model="receiveTreatmentAsses.condition" @change="changeRaido">
         <el-radio label="1"
           >住院</el-radio
         >
@@ -717,7 +717,20 @@ export default {
              this.infoDialogVisible = false
            }
         })
-      }
+      },
+      changeRaido(val){
+        console.log("val---",val)
+        console.log("lastt",this.lastTreat)
+        if(val ==1){
+          if(this.lastTreat!=null){
+            this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+          }
+        }else{
+          if(this.lastTreat!=null){
+            this.receiveTreatmentAsses.admission_number = ""
+          }
+        }
+    }
   },
   props: {
     receiver_treatment_access: {
@@ -734,6 +747,12 @@ export default {
         return { id: 0 };
       },
     },
+    lastTreat:{
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    }
   },
   watch: {
     isVisibility(val) {},
@@ -747,6 +766,13 @@ export default {
     },
   },
   created() {
+    console.log("lastTreat",this.lastTreat)
+    if(this.lastTreat!=null){
+      if(this.receiveTreatmentAsses.condition ==1){
+        this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+      }
+    
+    }
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
     this.record_date = date
@@ -764,6 +790,7 @@ export default {
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
   },
+ 
 };
 </script>
 

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

@@ -551,6 +551,7 @@ export default {
     this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
     this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
     this.form.blood_access_id = this.dialysis_order.blood_access_id;
+    this.form.blood_drawing = this.dialysis_order.blood_drawing
     this.blood_access_option_name = this.changeBloodAccessOpion(this.dialysis_order.blood_access_id)
     // this.form.schedual_type = this.dialysis_order.schedule_type
     // this.schedual_type = this.dialysis_order.schedule_type
@@ -608,7 +609,7 @@ export default {
       this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers;
       this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation;
       this.form.blood_access_id = this.dialysis_order.blood_access_id;
-
+      this.form.blood_drawing = this.dialysis_order.blood_drawing
       var blood_access_option_name = this.changeBloodAccessOpionOne(this.dialysis_order.blood_access_id)
       // this.form.schedual_type = this.dialysis_order.schedule_type
       // console.log("8823832323223",this.form.schedual_type)

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

@@ -2528,7 +2528,7 @@ mu
          console.log("开始啊",admins)
          this.dialysisPrescription.admin_user_id = this.$store.getters.xt_user.user.id
        }else{
-          this.dialysisPrescription.admin_user_id = prescription.admin_user_id
+          this.dialysisPrescription.admin_user_id = prescription.admin_user_id?this.$store.getters.xt_user.user.id:0
        }
 
        this.adminRoles = []
@@ -2537,7 +2537,6 @@ mu
             this.adminRoles.push(admins[i])
           }
         }
-        console.log("admin_user_+id2332323223332", this.$store.getters.xt_user.user.id)
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("pres",pre)

src/xt_pages/dialysis/details/index.vue

@@ -1041,7 +1041,7 @@
           :lastOrder="lastOrder"
           :dryWeightList="dryWeightList"
           :docList="docList"
-
+          :lastTreat="lastTreat"
         >
         </nav-igation>
 
@@ -1522,6 +1522,7 @@ export default {
       start_time:moment().startOf('months').format('YYYY-MM-DD'),
       end_time:moment().endOf('months').format('YYYY-MM-DD'),
       orderList:[],
+      lastTreat:{id:0}
       // start_time2:'',
       // end_time2:'',
     }
@@ -2021,6 +2022,9 @@ export default {
           var stockType =  resp.data.stockType
           this.stockType = stockType
 
+          this.lastTreat = resp.data.lastAcceptTreatment
+          console.log("上次透后平出-----------",this.lastTreat)
+
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList
           console.log("doclist-----",this.docList)

src/xt_pages/dialysis/details/indexs.vue

@@ -106,6 +106,7 @@
           :lastOrder="lastOrder"
           :dryWeightList="dryWeightList"
           :docList="docList"
+          :lastTreat="lastTreat"
 
         >
         </nav-igation>
@@ -538,6 +539,7 @@ export default {
       dryWeightList:[],
       docList:[],
       blood_access_part_opera: [],
+      lastTreat:{id:0}
     }
   },
   created() {
@@ -1033,6 +1035,9 @@ export default {
           this.dryWeightList = resp.data.dryWeightList
           this.docList = resp.data.docList
           console.log("doclist-----",this.docList)
+
+          this.lastTreat = resp.data.lastAcceptTreatment
+          console.log("上次透后平出-----------",this.lastTreat)
           var prepare = resp.data.prepare
           if(prepare!=null){
             this.preparestock = prepare

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -55,7 +55,6 @@ export default {
             start_time:"",
             end_time:"",
             print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-
             zone_selected: 0,
             scheduleMap:[],
             time:'',
@@ -195,18 +194,35 @@ export default {
           }
         }
        
-        this.list = list
+       
         this.total = response.data.data.total
         var adviceList = response.data.data.adviceList
         this.adviceList = adviceList
 
-        for(let i=0;i<list.length;i++){
-          for(let j=0;j<adviceList.length;j++){
-            if(list[i].patient_id == adviceList[j].patient_id){
-                list[i].his_advice_list.push(adviceList[j])
-            }
-          }
+        var longHisAdviceList = response.data.data.longHisAdviceList
+        
+        if(this.org_id!=10571 && this.org_id!=0){
+            for(let i=0;i<list.length;i++){
+                for(let j=0;j<adviceList.length;j++){
+                    if(list[i].patient_id == adviceList[j].patient_id){
+                        list[i].his_advice_list.push(adviceList[j])
+                    }
+                }
+             }
         }
+
+        if(this.org_id ==10571 || this.org_id == 0){
+            for(let i=0;i<list.length;i++){
+                for(let j=0;j<longHisAdviceList.length;j++){
+                    if(list[i].patient_id == longHisAdviceList[j].patient_id){
+                        list[i].his_advice_list.push(longHisAdviceList[j])
+                    }
+                }
+             }
+        }
+       
+
+        this.list = list
       
         var druglist = response.data.data.drugList
         this.drugList =druglist

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -512,8 +512,8 @@
           </th>
 
           <th style="width: 80px; font-weight: normal">
-            <p style="height: 20px; line-height: 20px">SpO₂</p>
-            <p style="height: 20px; line-height: 20px">%</p>
+            <p style="height: 20px; line-height: 20px">肝素余量</p>
+            <!-- <p style="height: 20px; line-height: 20px">%</p> -->
           </th>
           <th style="width: 333px; font-weight: normal">
             <p style="height: 20px; line-height: 20px">

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -73,6 +73,12 @@
                   : ""
               }}</span>
               <span v-else>{{ "/" }}</span> -->
+
+              <span>{{
+                patientInfo.DialysisSchedule.device_zone.name
+                  ? patientInfo.DialysisSchedule.device_zone.name
+                  : ""
+              }}</span>
             </div>
           </div>
           <div class="inline_block" >
@@ -86,6 +92,12 @@
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
               <span v-else>{{ "/" }}</span> -->
+              {{dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+                }}
             </div>
           </div>
           <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1084,10 +1084,10 @@
                                   monitor.operate_time ==
                                     dialysisOrder.start_time)
                                 "
-                                >【开始透析】引血100ml/min
+                                >【开始透析】引血{{ dialysisOrder.blood_drawing }} ml/min
                                 </template>
 
-                              {{ monitor.end }}  &nbsp;{{ monitor.dispose}}
+                              {{ monitor.end }}  &nbsp;
                               &nbsp;
                             </span>
                           </div>
@@ -2638,11 +2638,11 @@ export default {
               (this.dialysisOrder &&
               monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
             ) {
-              this.monitors[index].end = "【结束透析】回血100ml/min";
+              this.monitors[index].end = "【结束透析】"+"回血"+this.dialysisOrder.blood_drawing +"ml/min";
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
-              this.monitors[index].end = "【结束透析】回血100ml/min";
+              this.monitors[index].end = "【结束透析】"+"回血"+this.dialysisOrder.blood_drawing +"ml/min";
             }
           }
         }

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -137,7 +137,8 @@
         <div class="row">
           血管通路 
           <div class="inline_block under_line" style="width:92%;text-align: left;">
-            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
+            {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
+            <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
             （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
             &nbsp;
@@ -151,10 +152,13 @@
             &nbsp;
             <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股')>-1?true:predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股')>-1?true:false" showValue="股"></label-box>
             &nbsp;
+           
             <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉-左')>-1?true:predialysis.blood_access_part_opera_name.indexOf('股静脉-右')>-1?true:false" showValue="股静脉"></label-box>
             （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉-左') > -1 ? true : false" showValue="左"></label-box>
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉-右') > -1 ? true : false" showValue="右"></label-box>）
             &nbsp;
+            <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左-股')>-1?true:predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右-股')>-1?true:false" showValue="股"></label-box>
+            &nbsp; -->
           </div>
         </div>
         <div class="row">

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -72,7 +72,10 @@
           <div style="flex: 1;">
             置换方式
             <span class="under-line" style="display: inline-block;width: 50%;" v-if="prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12">
-              {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+              <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
+              {{
+                getDisplaceLiquiPart(prescription.displace_liqui_part)
+             }}
             </span>
             <span class="under-line" style="display: inline-block;width: 50%;" v-else>
               /
@@ -497,7 +500,10 @@
               <td v-if="advice_index === 3">较干体重增加量</td>
               <td v-if="advice_index === 3">{{ (predialysis.weight_before - predialysis.dry_weight - predialysis.additional_weight).toFixed(2) }}kg</td>
               <td v-if="advice_index === 4">净脱水量</td>
-              <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}L</td>
+              <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }} 
+                <span v-if="org_id ==10617"> ml</span>
+                <span v-else>L</span>
+              </td>
               <td v-if="advice_index === 5">透后体重</td>
               <td v-if="advice_index === 5">{{ afterdialysis.weight_after }}kg</td>
               <td v-if="advice_index === 6">本次透析体重下降量</td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1906,6 +1906,7 @@ export default {
                 }).catch(() => {
                 })
 
+
               } else {
                 that.radio = 1
                 that.changeRadioAndPatient(1)

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -76,6 +76,7 @@
           <p class="chartTitle">统计表</p>
         </div>
         <div>
+          <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="toExportList">导出</el-button>
           <el-table :data="tableData" v-loading="isLoadingTwo" border style="width: 100%"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
@@ -105,7 +106,7 @@
                     v-if="scope.row.data[modeItem.item_name].range_type == 1 && scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) > parseInt(scope.row.data[modeItem.item_name].range_max))">
                 <span>{{ scope.row.data[modeItem.item_name].inspect_value }}</span><span
                     style="color:#F56C6C;margin-left:5px;">↑</span>
-              </span>
+               </span>
                 <span
                     v-if="scope.row.data[modeItem.item_name].range_type == 1 && scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) >= parseInt(scope.row.data[modeItem.item_name].range_min))&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) <= parseInt(scope.row.data[modeItem.item_name].range_max)) ">{{ scope.row.data[modeItem.item_name].inspect_value }}</span>
                 <span
@@ -137,7 +138,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="listQuery.page"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100,200,300,400,500,600]"
               :page-size="10"
               background
               style="margin-top:20px;"
@@ -586,10 +587,6 @@ export default {
           }
           console.log(newArr)
 
-          console.log("newArr")
-
-
-
           let dataInfo = {}
           newArr.forEach((item, index) => {
             let { patient_id } = item
@@ -644,7 +641,7 @@ export default {
           })
 
 
-
+          console.log("arrthree",arrthree)
           var dd = {}
           for (const index in arrthree) {
             if (!(arrthree[index].patient_id in dd)) {
@@ -655,6 +652,7 @@ export default {
 
             }
           }
+          console.log("dad00000000000000",dd)
 
           let dataInfotwo = {}
           newArr.forEach((item, index) => {
@@ -795,7 +793,56 @@ export default {
       this.listQuery.search = val.name
       this.patient_id = val.id
       this.onSearch()
-    }
+    },
+    toExportList(){
+      import("@/vendor/Export2Excel").then((excel) => {
+       
+         var arr =["序号","姓名","透析号"]
+          if(this.normData!=null && this.normData.length>0){
+            for(let i=0;i<this.normData.length;i++){
+               arr.push(this.normData[i].item_name)
+            }
+          }
+         
+         if(this.tableData!=null && this.normData!=null && this.tableData.length>0&&this.normData.length>0){
+           
+          var newArr =[]
+         
+          for(let i=0;i<this.tableData.length;i++){
+            var obj = {index:0,name:"",patient_id:0,dialysis_no:"",item_name:""}
+            for(let j=0;j<this.normData.length;j++){
+               obj.index = i+1
+               obj.patient_id = this.tableData[i].patient_id
+               obj.name = this.tableData[i].name
+               obj.dialysis_no = this.tableData[i].dialysis_no
+               obj[this.normData[j].item_name] = this.tableData[i].data[this.normData[j].item_name].inspect_value
+            }
+            newArr.push(obj)
+          }
+         }
+        console.log("患者质控达标统计",newArr) 
+        const tHeader = arr
+         var newList = ["index","name","dialysis_no"]
+         if(this.normData!=null && this.normData.length>0){
+            for(let i=0;i<this.normData.length;i++){
+              newList.push(this.normData[i].item_name)
+            }
+          }
+          var filterVal = []
+          filterVal = newList
+
+          const data = this.formatJson(filterVal, newArr);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "患者质控达标统计",
+          });
+          this.downloadLoading = false;
+        });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) => filterVal.map((j) => v[j]));
+    },
   },
   created() {
     var nowDate = new Date()

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

@@ -144,7 +144,7 @@
            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"
@@ -438,7 +438,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402){
+              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402 || this.org_id ==10215){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(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)
@@ -463,7 +463,7 @@ export default {
               list[i].drugOutSalePrice = "/"
 
          
-            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402){
+            if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402 || this.org_id ==10215){
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }else{
               list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)

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

@@ -347,7 +347,7 @@ export default {
                 list[i].drugAddOne= 0
                 list[i].drugOutOne =0
                
-                if(this.org_id ==10210 || this.org_id ==10402){
+                if(this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
                    list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
                 }else{
                   list[i].drugIn = this.GetInitStartFlow(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)
@@ -371,7 +371,7 @@ export default {
                 list[i].drugOutSalePrice = "/"
 
                
-                if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402){
+                if(this.org_id ==10265 || this.org_id ==10210 || this.org_id ==10402 || this.org_id ==10215){
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
                 }else{
                   list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -151,7 +151,7 @@
            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"
@@ -265,13 +265,24 @@ export default {
             this.loading = false
             for(let i=0;i<list.length;i++){
                
-              if(this.org_id == 0 || this.org_id ==10210){
+              if(this.org_id ==10210){
                 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)
-                if(list[i].stockIn <0){
-                  list[i].stockIn =0
+                console.log("good_id",list[i].id)
+                console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
+                console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
+                console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )
+                console.log("盘亏",this.getAllStockOutFlow(list[i].WareStartOutStockFlow))
+                //针对武穴软水盐的问题
+                if(list[i].id== 5052){
+                  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)
+                  if(list[i].stockIn <0){
+                    list[i].stockIn =0
+                  }
                 }
+               
               }
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                list[i].stock_in_price = "/"
@@ -285,10 +296,18 @@ export default {
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
               list[i].stockOutprice = "/"
               list[i].saleOutMoney = "/"
-              if(this.org_id == 10265 || this.org_id == 0){
+              if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
-                list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+                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{
+                  list[i].overStock = 0
+                }
+               
               }
             
             

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -172,10 +172,14 @@ export default {
                     if(this.org_id == 0 || this.org_id ==10210){
                        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)
-                       if(list[i].stockIn <0){
-                         list[i].stockIn =0
-                       }
+                      if(list[i].id== 5052){
+                        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)
+                        if(list[i].stockIn <0){
+                          list[i].stockIn =0
+                        }
+                      }
                     }
                     list[i].stock_in_price = "/"
                     list[i].stockMoney = "/"

src/xt_pages/user/components/PatientSidebar.vue

@@ -204,68 +204,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱落风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-           ]
-         },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱落风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //    ]
+        //  },
         {
           name: '6',
           label: '文书管理',

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -518,7 +518,6 @@
     data() {
       return {
         patient_id:0,
-        postdata:{
         ping_date:'',
         Nurse:'',
         input:'',
@@ -543,7 +542,6 @@
         content:"",
         contentOne:"",
         listOne:[],
-
         is_check:false,
         is_check_one:false,
         is_check_two:false,
@@ -564,11 +562,10 @@
         is_check_seventeen:false,
         is_check_eighteen:false,
         is_check_nineteen:false,
-
         nurseList:[],
         admin_user_id:"",
         record_date:"",
-        }
+        
       }
 
     },

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -278,6 +278,7 @@
 import PatientSidebar from '../components/PatientSidebar.vue'
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -318,8 +319,9 @@ export default {
       oh_huli:'',//护理措施
       oh_date:this.getTime(new Date()),
       oh_appraiser:null,
-      dayintime:this.getTime(new Date())//打印
+      dayintime:this.getTime(new Date()),//打印
       // oh_pinggr:[],
+      nurseList:[],
     }
   },
   methods:{
@@ -429,26 +431,29 @@ export default {
           oh_appraiser:this.oh_appraiser,
           Totalpoints:this.Totalpoints
         }
-        const arr={
-          id:'002',
-          date:this.oh_date,
-          mark:this.Totalpoints,
-          evaluate:this.oh_appraiser
-        }
-        console.log('rrrrr',arr,params);
-        this.history_OH.push(arr)
-        const lenOH= this.history_OH
-        var nameoh=''
-        for(let i=0;i<lenOH.length;i++){
-          lenOH[i].mark= this.Totalpoints
-          for(let y=0;y<this.oh_pinggr.length;y++){
-            if(this.oh_appraiser==this.oh_pinggr[y].id){
-              nameoh=this.oh_pinggr[y].label
-            }
-          }
-          lenOH[i].evaluate= nameoh
-        }
-        return this.cancel_num
+      savePatientHpressuresore(params).then(response=>{
+
+      })
+        // const arr={
+        //   id:'002',
+        //   date:this.oh_date,
+        //   mark:this.Totalpoints,
+        //   evaluate:this.oh_appraiser
+        // }
+        // console.log('rrrrr',arr,params);
+        // this.history_OH.push(arr)
+        // const lenOH= this.history_OH
+        // var nameoh=''
+        // for(let i=0;i<lenOH.length;i++){
+        //   lenOH[i].mark= this.Totalpoints
+        //   for(let y=0;y<this.oh_pinggr.length;y++){
+        //     if(this.oh_appraiser==this.oh_pinggr[y].id){
+        //       nameoh=this.oh_pinggr[y].label
+        //     }
+        //   }
+        //   lenOH[i].evaluate= nameoh
+        // }
+        // return this.cancel_num
       }
     },
     //编辑
@@ -541,13 +546,23 @@ export default {
           return this.oh_pinggr[i].label
         }
       }
-    }
+    },
+    getAllNurseList(){
+     getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.nurseList =nurseList
+        }
+    })
+  },
   },
   computed:{
     Totalpoints(){
       return this.gaunjie_num*1 + this.edema_num*1 + this.bingli_num*1 + this.tiwei_num*1
     }
-  }
+  },
+ 
 }
 </script>
 <style lang="scss" scoped>

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -115,9 +115,9 @@
                             <el-select v-model="tumble" placeholder="请选择" >
                                 <el-option
                                 v-for="item in tumble_options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
+                                :key="item.admin_user_id"
+                                :label="item.user_name"
+                                :value="item.admin_user_id"
                                 style="width:150px;">
                                 </el-option>
                             </el-select>
@@ -157,7 +157,7 @@
 import PatientSidebar from '../components/PatientSidebar.vue'
 import Falloutbedprint from './Falloutbedprint.vue'
 import { uParseTime } from '@/utils/tools'
-import { savePediatrcFallAssesment } from '@/api/fallassement'
+import { savePediatrcFallAssesment,getAllNurseList } from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar,
@@ -209,6 +209,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patient_id = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     ageclick(e,item){
@@ -309,7 +310,7 @@ export default {
     },
     // 历史评估
     childerHistory(){
-      this.$router.push({path: '/patients/Children_history'})
+      this.$router.push({path: '/patients/Children_history?patient_id='+this.patient_id})
     },
     getTime(val) {
         if(val < 0){
@@ -338,10 +339,22 @@ export default {
           patient:this.patient,
        }
        console.log("params----",params)
-      savePediatrcFallAssesment(params).then(Response=>{
-
+      savePediatrcFallAssesment(params).then(response=>{
+         if(response.data.state ==1){
+           var pedFallssessment =  response.data.data.pedFallssessment
+           this.$message.success("保存成功!")
+         }
       })
-    }
+    },
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+           if(response.data.state ==1){
+             var nurseList  = response.data.data.nurseList
+
+             this.tumble_options =nurseList
+           }
+        })
+    },
   },
   computed:{
     pedia_Totalpoints(){

src/xt_pages/user/evaluationtool/pressuresore.vue

@@ -348,6 +348,7 @@
 <script>
 import PatientSidebar from '../components/PatientSidebar'
 import { uParseTime } from '@/utils/tools'
+import {getAllNurseList,savePatientPressuresore } from '@/api/fallassement'
 export default {
    components:{
     PatientSidebar
@@ -382,7 +383,8 @@ export default {
       hulicheckarr:[],
       hulicuoshi:[{id:1,label:'挂床头警示标识',hulicheck:0,is_check:false},{id:2,label:'保护受压皮肤，使用减压用具(气垫床/压疮床)',hulicheck:0,is_check:false},
       {id:3,label:'定时翻身，移动避免拖拉',hulicheck:0,is_check:false},{id:4,label:'加强营养',hulicheck:0,is_check:false},
-      {id:5,label:'保持被衣物清洁舒适',hulicheck:0,is_check:false},{id:6,label:'其他',hulicheck:0,is_check:false}]
+      {id:5,label:'保持被衣物清洁舒适',hulicheck:0,is_check:false},{id:6,label:'其他',hulicheck:0,is_check:false}],
+      nurseList:[]
     }
    },
    methods:{
@@ -421,6 +423,15 @@ export default {
         return uParseTime(val, '{y}-{m}-{d}')
         }
     },
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+           if(response.data.state ==1){
+             var nurseList  = response.data.data.nurseList
+
+             this.nurseList =nurseList
+           }
+        })
+    },
     // 确认
     Pressuresore(){
       var params={
@@ -442,15 +453,24 @@ export default {
         nurse_options:this.nurse_options,
         nurse_date:this.nurse_date,
         patientID:this.patientID,
-        checkList:this.checkList
+        checkList:this.checkList,
+        hulicuoshi:this.hulicuoshi,
       }
       console.log('params----',params);
+      savePatientPressuresore.then(response=>{
+        if(response.data.state == 1){
+
+        }
+      })
     }
    },
    computed:{
     mark(){
       return this.ganzhi*1 + this.shidu*1 + this.huodong*1 + this.yidong*1 + this.mocha*1 + this.yingyang*1
     }
+   },
+   created(){
+     this.getAllNurseList()
    }
 }
 </script>

src/xt_pages/user/history/Children_history.vue

@@ -62,6 +62,7 @@
             </template>
           </el-table-column>
         </el-table>
+
       </div>
 
     </div>
@@ -341,7 +342,7 @@
       <span>是否删除该记录</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="delete_centerDialogVisible=false">取 消</el-button>
-        <el-button type="primary" @click="delete_childer">确 定</el-button>
+        <el-button type="primary" @click="deletePedPatientFallassment">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -349,6 +350,7 @@
 <script>
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
+import {  getPedDiatricFallAssessmentList,getPedPatientFallAssessmentById,deletePedPatientFallassment } from '@/api/fallassement'
 export default{
   data(){
     return{
@@ -395,10 +397,23 @@ export default{
       patient_id:0,
       patient:'',
       touxihao:0,//透析号
-      dayintime:new Date()//打印时间
+      dayintime:new Date(),//打印时间
+      patient_id:0,
+      page:1,
+      limit:10,
+      total:0,
+      id:0,
     }
   },
   methods:{
+    handleSizeChange(limit){
+      this.limit = limit
+      this.getPedDiatricFallAssessmentList()
+    },
+    handleCurrentChange(page){
+      this.page = page;
+      this.getPedDiatricFallAssessmentList();
+    },
     fanhui(){
       window.history.go(-1);
     },
@@ -420,10 +435,17 @@ export default{
       }
     },
     open_editor(row){
-      this.editor_dialogVisible =true
+      getPedPatientFallAssessmentById(row.id).then(response=>{
+        if(response.data.state ==1){
+          this.editor_dialogVisible =true
+          var fallassessment = response.data.data.fallassessment
+        }
+      })
+     
+      
     },
     deletes(row){
-      this.row=row.id
+      this.id =row.id
       this.delete_centerDialogVisible = true
     },
     delete_childer(){
@@ -584,11 +606,40 @@ export default{
         return uParseTime(val, '{y}-{m}-{d}')
         }
     },
+
+    getPedDiatricFallAssessmentList(){
+        var params = {
+          patient_id:this.patient_id,
+          is_type:1,
+          page:this.page,
+          limit:this.limit,
+        }
+      getPedDiatricFallAssessmentList(params).then(response=>{
+         if(response.data.state ==1){
+          var list = response.data.data.list
+          console.log("list------",list)
+          var total =  response.data.data.total
+          this.total = total
+         }
+      })
+    },
+    deletePedPatientFallassment(){
+      deletePedPatientFallassment(this.id).then(response=>{
+         if(response.data.state==1){
+           var msg = response.data.data.msg
+           this.$message.success("保存成功!")
+         }
+      })
+    }
   },
   computed:{
     pedia_Totalpoints(){
       return this.agevalue + this.sexvalue + this.diagnosis_val +this.cognize_val + this.environment_val + this.medicine_val
     },
+  },
+  created(){
+    this.patient_id = this.$route.query.patient_id
+    this.getPedDiatricFallAssessmentList()
   }
 }
 </script>

src/xt_pages/user/history/tumble_history.vue

@@ -17,6 +17,7 @@
         <el-table
           ref="multipleTable"
           :data="tableData"
+          @selection-change="handleSelectionChange"
           border
           tooltip-effect="dark"
           :header-cell-style="{
@@ -816,6 +817,7 @@ export default{
       id:0,
       index:0,
       fallassesment_id:0,
+      ids:[]
     }
   },
   methods:{
@@ -823,10 +825,28 @@ export default{
       window.history.go(-1);
     },
     handleSelectionChange(val) {
-      this.multipleSelection=val;
-      console.log('0000',this.multipleSelection);
+      if(val!=null && val.length>0){
+        for(let i=0;i<val.length;i++){
+          this.ids.push(val[i].id)
+        }
+      }
     },
     open_pingfen(ids){
+      console.log("this.multipleSelection", this.ids)
+      if(ids ==1){
+        
+        if(this.ids.length==0){
+          this.$message('请选择需要打印的记录')
+        }
+         var params = {
+          ids:this.ids.join(","),
+         }
+         console.log("params----",params)
+        getPatientFallaessmentList(params).then(response=>{
+
+       })
+      }
+    
       if(this.multipleSelection.length==0){
         this.$message('请选择需要打印的记录')
       }else{

src/xt_pages/user/templateSummary.vue

@@ -1833,11 +1833,19 @@
           this.startYear = val+"-" + "31"
         }else if(val == "2021-12"){
           this.startYear = val+"-" + "31"
+        }else if(val == "2024-02"){
+          this.startYear = val+"-" + "29"
         }else{
           this.startYear = val+"-" + "30"
         }
 
-        this.lastYear = val+"-"+"01"
+        if(val == "2024-02"){
+          this.lastYear = val+"-"+"01"
+        }else{
+          this.lastYear = val+"-"+"01"
+        }
+
+       
         this.getInspectionMajor()
       },
       selectSummary(val){