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

src/xt_pages/Pharmacy/drugCode.vue

@@ -220,7 +220,7 @@
           } else {
 
             //有打开则调用接口
-            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
+            axios.get('http://127.0.0.1:9532/api/changedrug/five',{params:params}).then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.data.msg);
                 return false

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -1162,7 +1162,7 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span v-if="predialysis.weight_before !=0 && afterdialysis.weight_after !=0">
+                          <span v-if="record.assessment_before_dislysis.weight_before !=0 && record.assessment_after_dislysis.weight_after !=0">
                            {{ record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1033,6 +1033,32 @@
       <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
     </el-dialog>
 
+    <el-dialog title="审核" :visible.sync="eventVisible" :close-on-click-modal="isClose"
+               :close-on-press-escape="isClose" show-close="false">
+      <el-table ref="report-table" :data="roleTableData"  border :row-style="{ color: '#303133' }"
+                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                  max-height="600"
+                 >
+          <el-table-column align="center" prop="name" label="规则名称">
+            <template slot-scope="scope">{{ scope.row.rule_name }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="规则详情">
+            <template slot-scope="scope">
+              {{scope.row.vola_cont}}
+            </template>
+          </el-table-column>
+        </el-table>
+      <div class="list">
+        <el-radio-group v-model="fk_state" style="margin-top: 20px">
+          <el-radio :label="2">返回修改</el-radio>
+        </el-radio-group>
+      </div>
+      <el-input v-model="fankui"  placeholder="请输入反馈内容"  style="margin-top: 20px"></el-input>
+      <div slot="footer" class="dialog-footer">
+<!--        <el-button @click="eventVisible = false">取消</el-button>-->
+        <el-button type="primary" @click="comfirmFanKuiDialog">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1101,6 +1127,16 @@ export default {
   },
   data() {
     return {
+      warm_type:"",
+      fankui:"",
+      roleTableData:[{
+        "rule_name":"11111",
+        "detail":"11111",
+      }],
+      fk_state:2,
+      eventVisible:false,
+      isClose:false,
+      event_result:{},
       ws:null,
       fapiaoCodeDialogVisible:false,
       fapiao_code:"",
@@ -1323,6 +1359,12 @@ export default {
     }
   },
   created() {
+    // var aa = `{"output":{"result":[{"judge_result_detail_dtos":[{"vola_item_type":"1","mdtrt_id":"44039100000707832375","jrd_id":"0d694b59-17bf-4eab-8cca-7210c210d03d","patn_id":"44030000000630214820","rx_id":"","vola_amt":0.0}],"rule_id":"440000202307211449301000210038","vola_evid":"诊断学","mdtrt_id":"44039100000707832375","rule_name":"单次就诊诊断与患者性别不符_事前提 醒（广东）","vola_amt_stas":"1","jr_id":"7edfcae2-8602-4334-a09c-5f4a94171c3b","patn_id":"44030000000630214820","sev_deg":"2","vola_amt":0.0,"vola_bhvr_type":"1","vola_cont":"O16.x00/孕产妇高血压与患者性别不符，患者性别为男性，却给患者下了 女性专有的诊断"}]},"infcode":0,"warn_msg":null,"cainfo":null,"err_msg":null,"refmsg_time":"20241203180314355","signtype":null,"respond_time":"20241203180314408","inf_refmsgid":"440000202412031803143431546478"}`
+    // let jsonData = JSON.parse(aa);
+    // console.log(jsonData)
+    // this.event_result = jsonData
+    // this.roleTableData = this.event_result.output.result
+    // this.eventVisible = true
     this.fetchAllAdminUsers()
     const tableHeight = document.body.clientHeight - 290
     this.tableHeight = tableHeight
@@ -1438,6 +1480,50 @@ export default {
       var nowMinutes = nowDate.getMinutes()
       var nowSeconds = nowDate.getSeconds()
       this.form.diagnosis_time = this.record_date + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes) + ':' + (nowSeconds < 10 ? '0' + nowSeconds : nowSeconds)
+    },comfirmFanKuiDialog(){
+      var str = ""
+      for(let i = 0;i < this.roleTableData.length;i++){
+        if(str.length == 0){
+          str  = this.roleTableData[i].jr_id
+        }else{
+          str  = str +"~" + this.roleTableData[i].jr_id
+        }
+      }
+      var that = this
+      axios.get('http://127.0.0.1:9532/api/3103', {
+        params: {
+          'desc': that.fankui,
+          "warm_type":that.warm_type,
+          "fk_state":that.fk_state,
+          'warm_ids': str,
+          'admin_user_id': that.$store.getters.xt_user.user.id
+        }
+      })
+        .then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg)
+            return false
+          } else {
+            if (response.data.data.failed_code == -10) {
+              this.pwd = ''
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+
+              })
+
+            } else {
+              that.$message.success(response.data.msg)
+              that.eventVisible = false
+            }
+
+          }
+        })
+        .catch(function(error) {
+        })
     },
     comfirmPWDialog() {
       var that = this
@@ -1832,20 +1918,27 @@ export default {
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
-
-                  that.$confirm(response.data.data.msg, '医保错误信息', {
-                    confirmButtonText: '确 定',
-                    type: 'warning'
-                  }).then(() => {
-                    that.$refs.charge.hide()
-                    that.changeRadioAndPatient(1)
-                    that.newLoading = false
-                  }).catch(() => {
-                    that.$refs.charge.hide()
-                    that.changeRadioAndPatient(1)
+                  if(response.data.data.failed_type && response.data.data.failed_type == 100){
+                    that.event_result = response.data.data.msg
+                    that.roleTableData =  that.event_result.output.result
+                    that.warm_type =  response.data.data.warm_type
                     that.newLoading = false
-                  })
+                    that.eventVisible = true
+                  }else{
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+                      that.$refs.charge.hide()
+                      that.changeRadioAndPatient(1)
+                      that.newLoading = false
 
+                    }).catch(() => {
+                      that.$refs.charge.hide()
+                      that.changeRadioAndPatient(1)
+                      that.newLoading = false
+                    })
+                  }
                 } else {
                   that.radio = 2
                   that.changeRadioAndPatient(2)
@@ -1944,15 +2037,23 @@ export default {
               } else {
                 that.loadingone = false
                 if (response.data.data.failed_code == -10) {
-                  that.$confirm(response.data.data.msg, '医保错误信息', {
-                    confirmButtonText: '确 定',
-                    type: 'warning'
-                  }).then(() => {
+                  if(response.data.data.failed_type && response.data.data.failed_type == 100){
+                    that.event_result = response.data.data.msg
+                    that.roleTableData =  that.event_result.output.result
+                    that.warm_type =  response.data.data.warm_type
 
-                  }).catch(() => {
-                  })
-                } else {
 
+                    that.eventVisible = true
+                  }else{
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }
+                } else {
                   that.changeRadio(1)
                   that.$refs.register9504.hide()
                   that.$message({ message: '挂号成功', type: 'success' })
@@ -2007,16 +2108,24 @@ export default {
               return false
             } else {
               if (response.data.data.failed_code == -10) {
-                // that.$message.error(response.data.data.msg);
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
+                if(response.data.data.failed_type && response.data.data.failed_type == 100){
+                  that.event_result = response.data.data.msg
+                  that.roleTableData =  that.event_result.output.result
+                  that.warm_type =  response.data.data.warm_type
 
-                }).catch(() => {
-                })
 
+                  that.eventVisible = true
+                  that.loadingone = false
 
+                }else{
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }
               } else {
                 that.radio = 1
                 that.changeRadioAndPatient(1)
@@ -3679,6 +3788,8 @@ export default {
           })
 
         } else {
+
+
           this.$confirm('是否进行预结算', '预结算', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -3695,17 +3806,30 @@ export default {
                   that.$message.error(response.data.msg)
                   return false
                 } else {
+
                   if (response.data.data.failed_code == -10) {
-                    that.$confirm(response.data.data.msg, '医保错误信息', {
-                      confirmButtonText: '确 定',
-                      type: 'warning'
-                    }).then(() => {
-                      that.changeRadioAndPatient(1)
+                    console.log(response.data.data)
+                    console.log(response.data.data.failed_type)
+                    if(response.data.data.failed_type == 100){
+                      that.event_result = response.data.data.msg
+                      that.roleTableData =  that.event_result.output.result
+                      that.warm_type =  response.data.data.warm_type
+                      that.eventVisible = true
                       that.newLoading = false
-                    }).catch(() => {
-                      that.changeRadioAndPatient(1)
-                      that.newLoading = false
-                    })
+
+                    }else{
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+                        that.changeRadioAndPatient(1)
+                        that.newLoading = false
+
+                      }).catch(() => {
+                        that.changeRadioAndPatient(1)
+                        that.newLoading = false
+                      })
+                    }
                   } else {
                     that.changeRadioAndPatient(1)
                     that.$message({ message: '预结算成功', type: 'success', duration: 5000 })

src/xt_pages/user/templateSummaryPrint.vue

@@ -8,7 +8,7 @@
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
       
-      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
          <span>姓名:{{patientList.patient.name}}</span>  
          <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
          <span style="margin-left:20px;">性别:
@@ -17,7 +17,7 @@
          </span> 
          <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
       </div>
-      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
       </div>
        <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
@@ -46,7 +46,7 @@
           </div>
         </div>
       </div> -->
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;" v-if="org_id !=10013 &&org_id !=10014">
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结总结:</span>
           <!-- {{patientList.template_summary_content}} -->
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word"