lihong 1 년 전
부모
커밋
a4fcd307fb

+ 2 - 0
src/main/java/cn/hnthyy/thmz/entity/his/zd/MzZdYpYsh.java

@@ -220,6 +220,8 @@ public class MzZdYpYsh {
      * 药品自付比例 非数据库字段
      */
     private BigDecimal selfpayProp;
+
+    private String ybBlNew;
     /**
      * 药品医保编码
      */

+ 1 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/zd/MzZdYpYshServiceImpl.java

@@ -64,6 +64,7 @@ public class MzZdYpYshServiceImpl implements MzZdYpYshService {
                     if(ypZdDict.getSelfpayProp() != null && ypZdDict.getSelfpayProp().compareTo(BigDecimal.ZERO) == 1){
                         m.setSelfpayProp(ypZdDict.getSelfpayProp().multiply(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_HALF_UP));
                     }
+                    m.setYbBlNew(ypZdDict.getYbBlNew());
                     m.setYbComment(ypZdDict.getYbCommentNew());
                 }
             });

+ 7 - 7
src/main/resources/static/js/mz/clinic.js

@@ -7186,16 +7186,16 @@ function loadYpList(index, event) {
                 valign: 'middle',
                 //  sortable: true
             }, {
-                field: 'selfpayProp',
-                title: '自付比例',
+                field: 'ybBlNew',
+                title: '医保报销比例',
                 align: "center",
                 valign: 'middle',
                 // sortable: true
-                formatter: function (value, row, index) {
-                    if (value != null) {
-                        return value + '%';
-                    }
-                }
+                // formatter: function (value, row, index) {
+                //     if (value != null) {
+                //         return value + '%';
+                //     }
+                // }
             }, {
                 field: 'ybComment',
                 title: '医保说明',

+ 1 - 1
src/main/resources/static/js/mz/refund_medicine.js

@@ -369,7 +369,7 @@ function saveRefundMedicine() {
                 });
                 return;
             }
-            if(parseFloat(dec_amount) <= 0){
+            if(parseFloat(dec_amount) < 0){
                 new PNotify({
                     title: '警告提示',
                     text: "【"+data[i].drugname+"】"+'的退药量请填写正数',