Merge remote-tracking branch 'origin/master'

src/api/business/inHospital.js

@@ -86,3 +86,12 @@ export function listInHospitalNoPage(query) {
     params: query
   })
 }
+
+// 住院详情押金信息
+export function listCashPage(query) {
+  return request({
+    url: '/business/trade/his/selectFinListPage',
+    method: 'get',
+    params: query
+  })
+}

src/views/data-statistics/echars-components/china-map-bigger.vue

@@ -89,7 +89,12 @@ export default {
           trigger: 'item', // 出发方式
           formatter: (item) => {
             const unit = _this.unit
-            const percent = (item.data.value / _this.sum * 100).toFixed(0)
+            let percent = 0
+            if (item.data.value !== 0) {
+              percent = (item.data.value / _this.sum * 100).toFixed(0)
+            } else {
+              percent = percent.toFixed(0)
+            }
             return `<div>
                 ${item.data.name}
                 <br>

src/views/medical-record-management/medical-edit.vue

@@ -2434,6 +2434,11 @@ export default {
           row.state = '1'
           const updateForm = JSON.parse(JSON.stringify(this.recordDetail))
           row.diseaseLevel = this.inHosForm.diseaseLevel
+          if (row.diseaseLevel === '1') {
+            row.wardType = '2'
+          } else {
+            row.wardType = '1'
+          }
           row.bathe = this.inHosForm.bathe
           updateForm.inHospitalBo = row
           updateForm.inHospitalBo.createTime = null
@@ -2441,6 +2446,13 @@ export default {
           updateForm.doctorHospitalId = updateForm.hospitalId
           if (updateForm.inHospitalBo.id) {
             updateHospitalRecord(updateForm).then(res => {
+              this.petInHospitalUpdateShow = false
+              this.$message.success('保存成功')
+              this.getInHospitalList(this.$route.params.id)
+              this.getPaymentList()
+            }).catch(error => {
+              console.log('报错住院', error)
+              this.$message.success('保存成功')
               this.petInHospitalUpdateShow = false
               this.getInHospitalList(this.$route.params.id)
               this.getPaymentList()
@@ -2448,10 +2460,12 @@ export default {
           } else {
             addHospital(updateForm).then(res => {
               this.petInHospitalUpdateShow = false
+              this.$message.success('保存成功')
               this.getInHospitalList(this.$route.params.id)
               this.getPaymentList()
             }).catch(error => {
               console.log('报错住院', error)
+              this.$message.success('保存成功')
               this.petInHospitalUpdateShow = false
               this.getInHospitalList(this.$route.params.id)
               this.getPaymentList()

src/views/service-management/hospitalization-management/components/handling-admissions.vue

@@ -136,14 +136,13 @@
             </el-button>
             <el-button
               v-else
-              icon="el-icon-document"
               plain
               size="mini"
-              style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
+              class="el-button--success--solid--four"
               type="success"
               :disabled="row.medicalRecordId===null"
               @click="goMedical(row)"
-            >查看病历
+            ><svg-icon icon-class="liebiao_icon_xiangqing" />查看病历
             </el-button>
           </template>
         </el-table-column>
@@ -213,7 +212,7 @@ export default {
       // 搜索病房表单参数
       queryParams: {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 6,
         chooseStatus: '',
         wardType: ''
       },

src/views/service-management/hospitalization-management/hospitalization-details.vue

@@ -397,6 +397,14 @@
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              v-show="totalCash>10"
+              :total="totalCash"
+              :page.sync="cashParams.pageNum"
+              :limit.sync="cashParams.pageSize"
+              :page-sizes="[10]"
+              @pagination="getCashList"
+            />
           </div>
 
           <div v-if="detailInfo.status<4" style="margin-left: -1rem;padding-left: 16px;">
@@ -425,7 +433,7 @@
 </template>
 
 <script>
-import { getHospital } from '@/api/business/inHospital'
+import { getHospital, listCashPage } from '@/api/business/inHospital'
 import HandlingAdmissions from '@/views/service-management/hospitalization-management/components/handling-admissions.vue'
 import HandleDischarge from '@/views/service-management/hospitalization-management/components/handle-discharge.vue'
 import AssignWards from '@/views/service-management/hospitalization-management/components/assign-wards.vue'
@@ -455,6 +463,7 @@ export default {
       disChargeFlag: '1',
       // 押金信息
       finTradeHis: [],
+      totalCash: 0,
       // 住院信息
       hosDetailBos: [],
       // 入院弹出框
@@ -472,13 +481,24 @@ export default {
           value: '1',
           label: '否'
         }
-      ]
+      ],
+      cashParams: {
+        pagenum: 1,
+        pagesize: 20,
+        medicalRecordId: ''
+      }
     }
   },
   created() {
     this.getInfo(this.$route.params.id)
   },
   methods: {
+    getCashList() {
+      listCashPage(this.cashParams).then(res => {
+        this.totalCash = res.total
+        this.finTradeHis = res.rows
+      })
+    },
     moneyFormat,
     admissionModleClose() {
       this.getInfo(this.$route.params.id)
@@ -536,8 +556,9 @@ export default {
       getHospital(id).then(res => {
         this.detailInfo = res.data
         this.hosDetailBos = res.data.hosDetailBos
-        this.finTradeHis = res.data.finTradeHis
+        this.cashParams.medicalRecordId = res.data.medicalRecordId
         console.log('详情', res)
+        this.getCashList()
       })
     }
   }