解决原始价格为空

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

@@ -2080,7 +2080,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     unitPrice = BigDecimal.valueOf(0.01D);
                     mzChargeDetail.setUnitPrice(unitPrice);
                 }
-
+                mzChargeDetail.setOrigPrice(unitPrice);
                 //进行营销折扣计算并写入库 优先申请科室的折扣率  医生系统做完移走开始
                 if(needDiscount){
                     Discount discount=null;
@@ -2091,7 +2091,6 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         discount= discountService.getDiscountRate(YesNoEnum.NO.code,mzChargeDetail.getExecDept(),mzChargeDetail.getChargeItemCode());
                     }
                     if(discount!=null){
-                        mzChargeDetail.setOrigPrice(unitPrice);
                         if(YesNoEnum.YES.code.equals(discount.getDiscountType())){
                             unitPrice= discount.getDiscountRate().multiply(mzChargeDetail.getUnitPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
                         }else {

src/main/resources/static/js/toll_administration.js

@@ -622,7 +622,9 @@ function initChargeDetailTablePublic(url, obj, params) {
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
-                    return value.toFixed(2);
+                   if(value!=undefined && value!=null){
+                       return value.toFixed(2);
+                   }
                 }
             }, {
                 field: 'unitPrice',