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

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -2997,6 +2997,7 @@
                       <td >医嘱</td>
                       <td width="80">执行时间</td>
                       <td width="80">执行者签名</td>
+                      <td width="80">核对人签名</td>
                     </tr>
 
                     <tr
@@ -3125,6 +3126,30 @@
                           style="height: 40px"
                         />
                       </td>
+
+                      <td>
+                        <span
+                          v-if="
+                            setAdminUserES(
+                              advice[0],
+                              'checker'
+                            ) == ''
+                          "
+                          >{{
+                            getAdminUser(advice[0], "checker")
+                          }}</span
+                        >
+                        <img
+                          class="es-img"
+                          :src="
+                            setAdminUserES(advice[0], 'checker')
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                          style="height: 40px"
+                        />
+                      </td>
                     </tr>
                   </tbody>
                 </table>

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

@@ -1655,6 +1655,10 @@
          ParamsQuery.whether_unobstructed = parseInt(ParamsQuery.whether_unobstructed)
          ParamsQuery.lien_necessary =  parseInt(ParamsQuery.lien_necessary)
 
+         if(ParamsQuery.additional_weight >=30){
+             this.$message.error("衣物重异常,请重新填写!")
+         }
+
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {
 
           if (response.data.state == 0) {

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

@@ -5296,9 +5296,19 @@ mu
       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
            
-          if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
-            this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
+          if(this.dialysisPrescription.mode_id == 3){
+            if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
+              if(this.dialysisPrescription.prescription_water!=undefined){
+                this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water + 0.3
+              }
+              
+            }
+          }else{
+            if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){
+              this.dialysisPrescription.target_ultrafiltration =  this.dialysisPrescription.prescription_water 
+            }
           }
+         
            
         }
       },

src/xt_pages/hospitalStation/summary.vue

@@ -1138,6 +1138,7 @@ export default {
               就诊id: number,
               登记日期: order.his_hospital_patient.in_hosptial_time,
               出院日期: order.his_hospital_patient.out_hosptial_time,
+              出院诊断疾病名称: '慢性肾病5期血液透析状态',
               结算id: order.setl_id,
               结算日期: order.setl_time,
               医疗费总额: order.medfee_sumamt,
@@ -1176,6 +1177,7 @@ export default {
               "就诊id",
               "登记日期",
               "出院日期",
+              "出院诊断疾病名称",
               "结算id",
               "结算日期",
               "医疗费总额",
@@ -1211,6 +1213,7 @@ export default {
               "就诊id",
               "登记日期",
               "出院日期",
+              "出院诊断疾病名称",
               "结算id",
               "结算日期",
               "医疗费总额",

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -925,7 +925,6 @@
 
     <additionalCharges ref='additionalCharges' @click="addCharges"
                        :addtions_charge="addtions_charge"></additionalCharges>
-
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
     <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
@@ -1877,7 +1876,7 @@ export default {
             this.$refs.register.hide()
             this.loadingone = false
 
-            this.CheckHISPatient(this.record_date,this.patientInfo.id)
+            this.CheckHISPatient(this.record_date,forms.id)
 
           }
         })
@@ -1913,7 +1912,7 @@ export default {
                 that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
                 that.$refs.register.hide()
                 that.loadingone = false
-                that.CheckHISPatient(that.record_date,that.patientInfo.id)
+                that.CheckHISPatient(that.record_date,forms.id)
 
               }
             }

src/xt_pages/outpatientCharges/summary.vue

@@ -145,11 +145,11 @@
           <!--          </el-button-->
           <!--          >-->
 
-<!--          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-          <!--           <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
+<!--                     <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -926,6 +926,12 @@ export default {
         case 21:
           return '普通住院'
           break
+        case 140104:
+          return '城乡门诊特殊病(140104)'
+          break
+        case 992102:
+          return '单病种(992102)'
+          break
       }
     },
     cancelUploadTwo(row) {
@@ -2022,7 +2028,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              '周期': '2023年第四季度',
+              '周期': '2024年第一季度',
               '类别': '门诊',
               '医保目录编码': list[i].code,
               '医保目录名称': list[i].name,
@@ -3462,7 +3468,7 @@ export default {
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
               大额基金金额: order.hifob_pay,
-              大病基金金额: hifmi_pay,
+              大病基金金额: order.hifmi_pay,
               补充保险基金金额: order.hifes_pay,
               医疗救助基金金额: order.maf_pay,
               公务员基金: order.cvlserv_pay,
@@ -3680,7 +3686,7 @@ export default {
         let total = 0
 
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-          if (project_ids[i].price == project_month_prescriptions.project[a].project.price && project_ids[i].id == project_month_prescriptions.project[a].project.project_id) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].pric && project_ids[i].id == project_month_prescriptions.project[a].project.project_id) {
 
             if (project_month_prescriptions.project[a].project.type == 2) {
               obj['name'] = project_month_prescriptions.project[a].project.project.project_name
@@ -3869,8 +3875,8 @@ export default {
       //   console.log('6666666',tableData);
       //   let arr = []
       //   for (let i = 0; i < tableData.length; i++) {
-          
-      //     if (tableData[i].patient.name.indexOf(this.keywords) != -1 || 
+
+      //     if (tableData[i].patient.name.indexOf(this.keywords) != -1 ||
       //       tableData[i].patient.first_letter.indexOf(this.keywords) != -1) {
       //       arr = arr.concat(tableData[i])
       //     }

src/xt_pages/outpatientTool/components/settle.vue

@@ -94,7 +94,8 @@
                   <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
                   <div v-if="scope.row.med_type == '1112'">普通门诊</div>
-
+                  <div v-if="scope.row.med_type == '140104'">城乡门诊特殊病(140104)</div>
+                  <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
               </template>
           </el-table-column>
           <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">

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/drugs/components/purchaseNewDrugQuery.vue

@@ -442,7 +442,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210 || this.org_id==0 || this.org_id ==10402 || this.org_id ==10215){
+              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)

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -455,7 +455,7 @@
 
            
           </el-table-column>
-          <!-- <el-table-column label="自查自检" align="center">
+          <el-table-column label="自查自检" align="center">
             <template slot-scope="scope">
               <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
                 >自查</span
@@ -463,7 +463,7 @@
             </template>
 
            
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </div>
     </div>