Bläddra i källkod

优化decimal计算,查询参保信息时更新psnNo

lighter 3 år sedan
förälder
incheckning
81b3b40750

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiQueryDao.java

@@ -66,7 +66,7 @@ public interface SiQueryDao {
      *
      * @param psnBaseinfo 个人基本信息
      */
-    @Update("update t_si_pat_info set age=#{age}, med_type=#{medType} where pat_no=#{patNo} " +
+    @Update("update t_si_pat_info set psn_no=#{psnNo}, age=#{age}, med_type=#{medType} where pat_no=#{patNo} " +
             "and times=#{times} and ledger_sn=#{ledgerSn}")
     void updateSiZyInfoPsnNo(PsnBaseInfo psnBaseinfo);
 

+ 12 - 0
src/main/java/thyyxxk/webserver/utils/DecimalUtil.java

@@ -118,10 +118,22 @@ public class DecimalUtil {
     }
 
     public static BigDecimal add(BigDecimal a, BigDecimal b) {
+        if (null == a) {
+            a = BigDecimal.ZERO;
+        }
+        if (null == b) {
+            b = BigDecimal.ZERO;
+        }
         return a.add(b).setScale(2, RoundingMode.HALF_UP);
     }
 
     public static BigDecimal minus(BigDecimal a, BigDecimal b) {
+        if (null == a) {
+            a = BigDecimal.ZERO;
+        }
+        if (null == b) {
+            b = BigDecimal.ZERO;
+        }
         return a.subtract(b).setScale(2, RoundingMode.HALF_UP);
     }