Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

@@ -576,32 +576,32 @@ public class ZLDPStatisticsServiceImpl {
             String orgCode = stCommonService.getAndSetOrgCode(regionCode);
             JSONObject jsonObject6 = new JSONObject();
             jsonObject6.put("key", "jycq");
-            jsonObject6.put("value", this.getQuestionNumber("检验超期",params, orgCode));
+            jsonObject6.put("value", orgCode == null ? 0L: this.getQuestionNumber("检验超期",params, orgCode));
             jsonObject6.put("name", "检验超期");
 
             JSONObject jsonObject7 = new JSONObject();
             jsonObject7.put("key", "jybhg");
-            jsonObject7.put("value", this.getQuestionNumber("检验不合格",params, orgCode));
+            jsonObject7.put("value", orgCode == null ? 0L: this.getQuestionNumber("检验不合格",params, orgCode));
             jsonObject7.put("name", "检验不合格");
 
             JSONObject jsonObject8 = new JSONObject();
             jsonObject8.put("key", "wbcq");
-            jsonObject8.put("value", this.getQuestionNumber("维保超期",params, orgCode));
+            jsonObject8.put("value", orgCode == null ? 0L: this.getQuestionNumber("维保超期",params, orgCode));
             jsonObject8.put("name", "维保超期");
 
             JSONObject jsonObject9 = new JSONObject();
             jsonObject9.put("key", "csjsynx");
-            jsonObject9.put("value", this.getQuestionNumber("超设计使用年限",params, orgCode));
+            jsonObject9.put("value", orgCode == null ? 0L: this.getQuestionNumber("超设计使用年限",params, orgCode));
             jsonObject9.put("name", "超设计使用年限");
 
             JSONObject jsonObject10 = new JSONObject();
             jsonObject10.put("key", "csjsynx");
-            jsonObject10.put("value", stCommonService.getYellowStatusCompany(params));
+            jsonObject10.put("value", orgCode == null ? 0L: stCommonService.getYellowStatusCompany(params).getLongValue());
             jsonObject10.put("name", "许可超期");
 
             JSONObject jsonObject11 = new JSONObject();
             jsonObject11.put("key", "csjsynx");
-            jsonObject11.put("value", stCommonService.getRedStatusCompany(params));
+            jsonObject11.put("value", orgCode == null ? 0L: stCommonService.getRedStatusCompany(params).getLongValue());
             jsonObject11.put("name", "资质超期");
 
             jsonArray.add(jsonObject0);