客户详情接口完善

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -526,9 +526,13 @@ public class CustomerApiController {
                         //计算年缴保费过滤掉缴费方式趸缴的
                         if(!"趸缴".equals(_source.getString("payment"))){
                             prem+=_source.getDouble("prem");
-                            String currentPadateStr = DateUtils.parseDateToStr(currentYear+"-MM-dd",padate);
-                            if(currentDateTime.compareTo(currentPadateStr)>0){
-                                handedinprem+=_source.getDouble("prem");
+                            //String currentPadateStr = DateUtils.parseDateToStr(currentYear+"-MM-dd",padate);
+                            if(_source.containsKey("npdate")){
+                                Date npdate = _source.getDate("npdate");
+                                String npDateStr = DateUtils.parseDateToStr("yyyy-MM-dd", npdate);
+                                if(npDateStr.compareTo(currentDateTime)>0){
+                                    handedinprem+=_source.getDouble("prem");
+                                }
                             }
 
                             String m = DateUtils.parseDateToStr("M", padate);