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

src/store/modules/globalConfig.js

@@ -187,7 +187,8 @@ const global_config = {
       {
         id: 12,
         name: '退休人员'
-      }
+      },
+    
     ],
     induction_options: [ // 诱导期
       {

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

@@ -1159,8 +1159,7 @@
         }
 
         this.assessmentBeforeDislysis.pathway_formation_time = moment(new Date()).format('YYYY-MM-DD')
-        console.log(" this.assessmentBeforeDislysis.pathway_formation_time", moment(new Date()).format('YYYY-MM-DD'))
-        console.log("hhahhahahah",assessment)
+        
         if(assessment!=null){
           if(assessment.pathway_formation_time >0){
             this.assessmentBeforeDislysis.pathway_formation_time =  this.getTimeOne(assessment.pathway_formation_time)
@@ -1175,7 +1174,7 @@
             this.assessmentBeforeDislysis.lien_necessary = assessment.lien_necessary.toString()
           }
         }
-
+       
 
 
 
@@ -1256,6 +1255,13 @@
             }
           }
 
+        console.log("hhahhahahah",lastAssessment)
+        if (lastAssessment !=null) {
+          this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
+          this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
+           
+        }
+
         } else {
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)
           this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()

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

@@ -138,7 +138,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量')">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -147,6 +147,16 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+                        <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
+                            <el-input
+                                    type="number"
+                                    v-model="dialysisPrescription.prescription_water"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8"
                             v-if="isShows('加糖')">
                         <el-form-item label="加糖：" prop="prescription_water" :rules="isCheckmust('加糖')">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -84,9 +84,9 @@
               </el-form>
               <div class="tabsBox">
 
-                  <el-button v-if="dayorMonth == 'day'" type="text" class="addTab" @click="addCharges"
-                             icon="el-icon-circle-plus">附加收费
-                  </el-button>
+<!--                  <el-button v-if="dayorMonth == 'day'" type="text" class="addTab" @click="addCharges"-->
+<!--                             icon="el-icon-circle-plus">附加收费-->
+<!--                  </el-button>-->
                   <div class="RP" v-if="dayorMonth == 'month'">Rp
                       <el-date-picker
                               v-model="start_time"

src/xt_pages/outpatientTool/components/detail.vue

@@ -33,7 +33,7 @@
                       value-format="yyyy-MM-dd"
                       range-separator="至"
                       start-placeholder="开始日期"
-                      @change="changeDate"
+                      @change="handleDateChangetwo"
                       end-placeholder="结束日期">
               </el-date-picker>
               <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
@@ -115,6 +115,19 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          // 获取当前日期
+          const now = new Date();
+
+          // 设置一个月后的日期
+          const oneMonthLater = new Date();
+          oneMonthLater.setMonth(oneMonthLater.getMonth() + 1);
+
+          // 如果当前日期在一个月后之后，则禁用
+          return time.getTime() > oneMonthLater.getTime() || time.getTime() < now.getTime();
+        },
+      },
       detail_loading: false,
       tempArr: [],
       pos: 0,
@@ -134,6 +147,51 @@ export default {
     }
   },
   methods: {
+    handleDateChangetwo(value) {
+      this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
+
+
+      }).catch(() => {
+      })
+
+      // let start_time = this.chargeDate[0]
+      // let end_time = this.chargeDate[1]
+      // const dateObj1 = new Date(start_time);
+      // const dateObj2 = new Date(end_time);
+      //
+      // // 计算两个日期之间的月份差
+      // const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
+      //   (dateObj2.getMonth() - dateObj1.getMonth());
+      // if (monthDifference >= 1){
+      //   this.$message.error("时间间隔不能超出一个月")
+      //   return
+      // }else{
+      //   this.getSummaryDetailList()
+      // }
+
+    },
+
+    handleDateChange(value) {
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      const dateObj1 = new Date(start_time);
+      const dateObj2 = new Date(end_time);
+
+      // 计算两个日期之间的月份差
+      const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
+        (dateObj2.getMonth() - dateObj1.getMonth());
+      if (monthDifference >= 1){
+        this.$message.error("时间间隔不能超出一个月")
+        return
+      }else{
+        this.getSummaryDetailListtwo()
+      }
+
+    },
     Action(){
       var that = this
       axios.get('http://127.0.0.1:9531/handelExcel', {
@@ -219,15 +277,106 @@ export default {
       return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
     },
     changeDate() {
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
     },
     changeItem() {
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
     },
     searchAction() {
       this.item_type = '0'
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
+
+    },  getSummaryDetailListtwo() {
+      this.detail_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.detail_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.detail_loading = false
+
+          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+
+
+          }).catch(() => {
+          })
+
+
+        }
+
+
+
+
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
 
+      })
     },
     getSummaryDetailList() {
       this.detail_loading = true
@@ -402,7 +551,6 @@ export default {
             }
             tempPatientsTwo[i]['total'] = total
           }
-          console.log('tempPatientsTwo', tempPatientsTwo)
           for (let i = 0; i < tempPatientsTwo.length; i++) {
             // console.log(111,tempPatientsTwo[i].total)
             if (tempPatientsTwo[i].new_order_info.length > 0) {
@@ -442,12 +590,10 @@ export default {
 
           // console.log(tempPatientsTwo.length)
           //
-          console.log(order_infos)
           let advices = []
           let projects = []
           let goods = []
           for(let i = 0; i < order_infos.length; i++){
-            console.log(order_infos[i])
             if(order_infos[i].advice_id > 0 && order_infos[i].project_id == 0){
               advices.push(order_infos[i].advice)
             }
@@ -463,9 +609,6 @@ export default {
             }
           }
 
-          console.log(advices)
-          console.log(projects)
-          console.log(goods)
 
         }
 
@@ -642,7 +785,6 @@ export default {
           sums[index] = '合计'
           return
         }
-        console.log(data)
         const values = data.map(item => Number(item[column.property]))
         if (column.property === 'total') {
           // sums[index] = values.reduce((prev, curr) => {
@@ -668,7 +810,7 @@ export default {
     }
   },
   created() {
-    this.getSummaryDetailList()
+    this.getSummaryDetailListtwo()
 
   }
 }

src/xt_pages/outpatientTool/components/gather.vue

@@ -30,7 +30,7 @@
             value-format="yyyy-MM-dd"
             range-separator="至"
             start-placeholder="开始日期"
-            @change="changeDate"
+            @change="changeDatetwo"
             end-placeholder="结束日期">
         </el-date-picker>
         <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
@@ -142,17 +142,122 @@ export default {
     uniqueTwo(arr) {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr) && res.set(arr, 1))
+    },  changeDatetwo() {
+      // console.log(this.chargeDate)
+      this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
+      }).then(() => {
+
+
+      }).catch(() => {
+      })
     },
     changeDate() {
       // console.log(this.chargeDate)
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
     },
     changeItem() {
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
     },
     searchAction() {
       this.item_type = '0'
-      this.getSummaryDetailList()
+      this.getSummaryDetailListtwo()
+    },getSummaryDetailListtwo() {
+      this.gather_loading = true
+      let start_time = this.chargeDate[0]
+      let end_time = this.chargeDate[1]
+      let params = {
+        start_time: start_time,
+        end_time: end_time,
+        type: this.item_type,
+        keyword: this.keywords
+      }
+      GetSummaryDetail(params).then(response => {
+        if (response.data.state == 0) {
+          this.gather_loading = false
+
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.gather_loading = false
+
+          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+
+
+          }).catch(() => {
+          })
+
+
+
+
+          // this.tableData = tempPatientsTwo
+
+          // console.log(tempPatientsTwo.length)
+          //
+
+        }
+        //
+        // console.log('去重前')
+        // console.log(advice)
+        // console.log(project)
+        // //
+        // //
+
+        // //
+        // console.log('去重后')
+        //
+        // console.log(advice.length)
+        // console.log(project.length)
+        //
+        // for (let i = 0; i < project.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = project[i].price
+        //     obj['type'] = project[i].type
+        //     obj['item_name'] = project[i].item_name
+        //     obj['item_id'] = project[i].item_id
+        //     obj['name'] = project[i].name
+        //     obj['patient_id'] = project[i].patient_id
+        //     obj['count'] = count
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        //
+        //
+        // for (let i = 0; i < advice.length; i++) {
+        //   let obj = {}
+        //   let count = 0
+        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
+        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
+        //       count = count + tempPatientsTwo[a].count
+        //       obj['count'] = count
+        //
+        //     }
+        //     obj['price'] = advice[i].price
+        //     obj['type'] = advice[i].type
+        //     obj['item_name'] = advice[i].item_name
+        //     obj['item_id'] = advice[i].item_id
+        //     obj['name'] = advice[i].name
+        //     obj['patient_id'] = advice[i].patient_id
+        //     this.tableData.push(obj)
+        //   }
+        // }
+        // console.log(this.tableData.length)
+        // this.tableData = this.sort(this.tableData)
+
+      })
     },
     getSummaryDetailList() {
       this.gather_loading = true
@@ -171,6 +276,18 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
+
+          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+
+
+          }).catch(() => {
+          })
+
+
           this.gather_loading = false
 
           let tempPatients = []
@@ -672,7 +789,7 @@ export default {
 
   },
   created() {
-    this.getSummaryDetailList()
+    this.getSummaryDetailListtwo()
 
   }
 }

src/xt_pages/user/components/PatientDetail.vue

@@ -1499,6 +1499,10 @@ export default {
     this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
     this.professionOptions = getDataConfig("patient", "profession_options");
+    var obj ={id:11,name:"退休"}
+    var objOne = {id:12,name:"灵活就业人员"}
+    this.professionOptions.push(obj)
+    this.professionOptions.push(objOne)
     this.inductionOptions = this.$store.getters.induction_options;
     this.contagionList = this.$store.getters.contagions;
     this.checkDisease = this.$store.getters.disease;

src/xt_pages/user/components/PatientForm.vue

@@ -1541,7 +1541,12 @@ export default {
     // this.typeOptions = this.$store.getters.blood_types;
     // this.rhOptions = this.$store.getters.rh;
     this.educationOptions = getDataConfig("patient", "education_types");
+
     this.professionOptions = getDataConfig("patient", "profession_options");
+    var obj ={id:11,name:"退休"}
+    var objOne = {id:12,name:"灵活就业人员"}
+    this.professionOptions.push(obj)
+    this.professionOptions.push(objOne)
 
   
     // this.inductionOptions = this.$store.getters.induction_options;