Merge branch 'dev-1.0.6' into dev-1.0.5

src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -419,7 +419,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         //本院记账金额
         BigDecimal byjzAmount = totalPayable.subtract(mzReceiptSerial.getTotalCharge());
         if (byjzAmount.compareTo(BigDecimal.ZERO) == 1) {
-            byjzAmount = byjzAmount.setScale(1, BigDecimal.ROUND_HALF_UP);
+            byjzAmount = byjzAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
             MzReceiptSerial jzMzReceiptSerial = CloneUtil.clone(mzReceiptSerial);
             jzMzReceiptSerial.setCharge1(BigDecimal.ZERO);
             jzMzReceiptSerial.setCharge2(BigDecimal.ZERO);

src/main/resources/static/js/request.js

@@ -687,7 +687,11 @@ function saveRequest() {
             if (res.code == 0) {
                 $("#editModal").modal("hide");
                 clearInput();
-                initSourceList();
+                if(showTwoTable){
+                    initSourceList();
+                }else {
+                    $('#tb_table').bootstrapTable('refresh');
+                }
                 successMesage(res);
                 if (showTwoTable) {
                     $('#sourceRange span').html($('#newRange span').html());