Merge branch 'dev-1.1.4' into dev-1.1.5

src/main/java/cn/hnthyy/thmz/controller/mz/MzyReqrecController.java

@@ -658,7 +658,7 @@ public class MzyReqrecController {
                 return resultMap;
             }
             mzyReqrec.setAmpm(mzZdWorkTime.getName());
-            BigDecimal totalFee = mzyReqrec.getReqFee().add(mzyReqrec.getClinicFee()).add(mzyReqrec.getOthFee()).add(mzyReqrec.getBrochureFee()).add(mzyReqrec.getBlbFee()).add(mzyReqrec.getZlkFee());
+            BigDecimal totalFee = mzyReqrec.getReqFee().add(mzyReqrec.getClinicFee()).add(mzyReqrec.getOthFee()).add(mzyReqrec.getBrochureFee()).add(mzyReqrec.getBlbFee()==null?BigDecimal.ZERO:mzyReqrec.getBlbFee()).add(mzyReqrec.getZlkFee()==null?BigDecimal.ZERO:mzyReqrec.getZlkFee());
             if (totalFee.compareTo(BigDecimal.ZERO) == 0) {
                 resultMap.put("code", -2);
                 resultMap.put("message", "当前病人无费用信息，无需开具发票");

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -579,8 +579,8 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
             dbMzyReqrec.setReqFee(BigDecimal.ZERO.subtract(dbMzyReqrec.getReqFee()));
             dbMzyReqrec.setClinicFee(BigDecimal.ZERO.subtract(dbMzyReqrec.getClinicFee()));
             dbMzyReqrec.setOthFee(BigDecimal.ZERO.subtract(dbMzyReqrec.getOthFee()));
-            dbMzyReqrec.setBlbFee(BigDecimal.ZERO.subtract(dbMzyReqrec.getBlbFee()));
-            dbMzyReqrec.setZlkFee(BigDecimal.ZERO.subtract(dbMzyReqrec.getZlkFee()));
+            dbMzyReqrec.setBlbFee(dbMzyReqrec.getBlbFee()==null?BigDecimal.ZERO:BigDecimal.ZERO.subtract(dbMzyReqrec.getBlbFee()));
+            dbMzyReqrec.setZlkFee(dbMzyReqrec.getZlkFee()==null?BigDecimal.ZERO:BigDecimal.ZERO.subtract(dbMzyReqrec.getZlkFee()));
             dbMzyReqrec.setSerialNo(-dbMzyReqrec.getSerialNo());
             dbMzyReqrec.setCancelMark(mzyReqrec.getCancelMark());
             dbMzyReqrec.setOpDay(new Date());