零时薪资单8

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -782,10 +782,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             String month = requestVO.getMonth();
             String month = requestVO.getMonth();
             String payoutYearmonth = "";
             String payoutYearmonth = "";
             if (month.length() == 2) {
             if (month.length() == 2) {
-                payoutYearmonth = years + "-" + month;
+                payoutYearmonth = years + month;
 
 
             } else if (month.length() == 1) {
             } else if (month.length() == 1) {
-                payoutYearmonth = years + "-0" + month;
+                payoutYearmonth = years + "0" + month;
             }
             }
 
 
             AgAclSalary agAclSalary = new AgAclSalary();
             AgAclSalary agAclSalary = new AgAclSalary();
@@ -796,8 +796,12 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             BigDecimal abc = BigDecimal.ZERO;
             BigDecimal abc = BigDecimal.ZERO;
             BigDecimal d = BigDecimal.ZERO;
             BigDecimal d = BigDecimal.ZERO;
             for (AgAclSalary item : newSalaryList) {
             for (AgAclSalary item : newSalaryList) {
-                abc = abc.add(item.getAmount());
-                d = d.add(item.getTax());
+                if (null != item.getAmount()) {
+                    abc = abc.add(item.getAmount());
+                }
+                if (null != item.getTax()) {
+                    d = d.add(item.getTax());
+                }
             }
             }
             responseVO.setAbc(abc.toString());
             responseVO.setAbc(abc.toString());
             responseVO.setD(d.toString());
             responseVO.setD(d.toString());