国家政务、921核酸表联合查询，新增是否需要五天一检字段

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -273,6 +273,11 @@ public class Czrk extends BaseEntity{
      */
     private String toAppropriateTime;
 
+    /**
+     * 是否需要参加五天一检核酸
+     */
+    @Excel(name = "是否需要参加五天一检核酸",readConverterExp = "1=是,2=否,3=重点人员")
+    private String isNucleicAcidFive;
 
 
 

boman-api/boman-domain/src/main/java/com/boman/domain/CzrkJzdz.java

@@ -131,6 +131,12 @@ public class CzrkJzdz {
     @Excel(name = "居住地的组",type = IMPORT)
     private String villagerGroup;
 
+    /**
+     * 是否需要参加五天一检核酸
+     */
+    @Excel(name = "是否需要参加五天一检核酸",readConverterExp = "1=是,2=否,3=重点人员")
+    private String isNucleicAcidFive;
+
     /**
      * Y有效地址，N无效地址
      */

boman-web-core/src/main/java/com/boman/web/core/controller/AccountingDataController.java

@@ -65,6 +65,32 @@ public class AccountingDataController extends BaseController {
         util.exportExcel(response, accountingDataList, "核酸点数据");
     }
 
+    /***
+     *  潜山核酸数据列表页(获取四个站口核酸数据)
+     * @return
+     */
+    @GetMapping("/nucleicAcid/zd")
+    public TableDataInfo nucleicAcidZd( AccountingDataVo accountingData) {
+        List<AccountingDataVo> list = accountingDataService.nucleicAcidZd(accountingData);
+        return getDataTable(list);
+    }
+
+    /**
+     *  核酸数据导出(获取四个站口核酸数据)
+     * @param response
+     * @param accountingData
+     * @throws IOException
+     */
+    @Log(title = "核酸数据", businessType = BusinessType.EXPORT)
+    @PreAuthorize(hasPermi = "system:accountingData:exportZd")
+    @PostMapping("/exportZd")
+    public void exportZd(HttpServletResponse response, @RequestBody AccountingDataVo accountingData) throws IOException
+    {
+        List<AccountingDataVo> accountingDataList = accountingDataService.exportZd(accountingData);
+        ExcelUtil<AccountingDataVo> util = new ExcelUtil<>(AccountingDataVo.class);
+        util.exportExcel(response, accountingDataList, "核酸点数据");
+    }
+
     /***
      *  潜山核酸详细数据列表页(小程序)
      * @return
@@ -162,4 +188,5 @@ public class AccountingDataController extends BaseController {
     public AjaxResult wanShiTongInfo( AccountingDataVo accountingData) {
         return accountingDataService.wanShiTongInfo(accountingData);
     }
+
 }

boman-web-core/src/main/java/com/boman/web/core/controller/CountryProxyQsBdcController.java

@@ -3,14 +3,19 @@ package com.boman.web.core.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.boman.common.core.utils.StringUtils;
 import com.boman.domain.constant.ProxyConstants;
+import com.boman.domain.dto.AjaxResult;
 import com.boman.web.core.utils.GjzwfwptSignUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,7 +41,7 @@ public class CountryProxyQsBdcController {
         String appkey = "d33449a37af825ea4ae9c3a4fb169bb8"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.GJCSYYZMCXSJJK,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.GJCSYYZMCXSJJK);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         //Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -78,13 +83,18 @@ public class CountryProxyQsBdcController {
     //民政部_殡葬服务火化信息查询
     @ApiOperation(value = "民政部_殡葬服务火化信息查询")
     @GetMapping("/bzfwhhxxcx")
-    public String bzfwhhxxcx(
+    public AjaxResult bzfwhhxxcx(
             @ApiParam(value = "姓名") @RequestParam String name,
             @ApiParam(value = "身份证号") @RequestParam String id_card) {
+
+        if(StringUtils.isEmpty(name) || StringUtils.isEmpty(id_card)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "c40c921bea411f13377ea3548e6d1686"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.BZFWHHXXCX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.BZFWHHXXCX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -97,20 +107,27 @@ public class CountryProxyQsBdcController {
         params.putOnce("name", name);
         params.putOnce("id_card", id_card);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.BZFWHHXXCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        String json = postRequest(ProxyConstants.SID.BZFWHHXXCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("result");
+        return AjaxResult.success("成功",map.get("data"));
+
     }
     
 
     // 民政部_婚姻登记信息核验(个人)
     @ApiOperation(value = "民政部_婚姻登记信息核验(个人)")
     @GetMapping("/hydjxxhygr")
-    public String hydjxxhygr(
+    public AjaxResult hydjxxhygr(
             @ApiParam(value = "男/女方姓名") @RequestParam String name_man,
             @ApiParam(value = "男/女方身份证件号码") @RequestParam String cert_num_man) {
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
         String appkey = "e72f935d839db74e407ca9fa13cc78b7"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.HYDJXXHYGR,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.HYDJXXHYGR);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -127,19 +144,31 @@ public class CountryProxyQsBdcController {
         params.putOnce("name_man", name_man);
         params.putOnce("cert_num_man", cert_num_man);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.HYDJXXHYGR, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        String json = postRequest(ProxyConstants.SID.HYDJXXHYGR, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        List<Map<String, Object>> listMap = new ArrayList<>();
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("result");
+        if(map!= null){
+            listMap.add(map);
+        }
+        return AjaxResult.success("成功",listMap);
     }
 
     //	民政部_婚姻登记信息核验(个人)（新）
     @ApiOperation(value = "民政部_婚姻登记信息核验(个人)（新）")
     @GetMapping("/hydjxxhygrx")
-    public String hydjxxhygrx(
+    public AjaxResult hydjxxhygrx(
             @ApiParam(value = "男/女方姓名") @RequestParam String name_man,
             @ApiParam(value = "男/女方身份证件号码") @RequestParam String cert_num_man) {
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
         String appkey = "e6f421141633fa9dce093f17e7763112"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.HYDJXXHYGRX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.HYDJXXHYGRX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
+        System.out.println("gjzwfwpt_rtime"+gjzwfwpt_rtime);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -152,7 +181,14 @@ public class CountryProxyQsBdcController {
         params.putOnce("name_man", name_man);
         params.putOnce("cert_num_man", cert_num_man);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.HYDJXXHYGRX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        String json = postRequest(ProxyConstants.SID.HYDJXXHYGRX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        List<Map<String, Object>> listMap = new ArrayList<>();
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+        if(map.get("result")!=null){
+            listMap.add((Map<String, Object>)map.get("result"));
+        }
+        return AjaxResult.success("成功",listMap);
     }
 
     //民政部_婚姻登记信息核验(双方)
@@ -163,10 +199,16 @@ public class CountryProxyQsBdcController {
             @ApiParam(value = "男方身份证件号码") @RequestParam String cert_num_man,
             @ApiParam(value = "女方姓名") @RequestParam String name_woman,
             @ApiParam(value = "女方身份证件号码") @RequestParam String cert_num_woman) {
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
+        if(StringUtils.isEmpty(name_woman) || StringUtils.isEmpty(cert_num_woman)){
+            AjaxResult.error("请将参数填写完整");
+        }
         String appkey = "30d5c47587af585d8acec5cb68b18ba9"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.HYDJXXHYSF,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.HYDJXXHYSF);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -194,10 +236,18 @@ public class CountryProxyQsBdcController {
             @ApiParam(value = "男方身份证件号码") @RequestParam String cert_num_man,
             @ApiParam(value = "女方姓名") @RequestParam String name_woman,
             @ApiParam(value = "女方身份证件号码") @RequestParam String cert_num_woman) {
+
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
+        if(StringUtils.isEmpty(name_woman) || StringUtils.isEmpty(cert_num_woman)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "76746be3e436eb6ce84b63814ee9cd03"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.HYDJXXHYSFX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.HYDJXXHYSFX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -220,13 +270,18 @@ public class CountryProxyQsBdcController {
     //民政部_民办非企业单位登记证书查询（新）
     @ApiOperation(value = "民政部_民办非企业单位登记证书查询（新）")
     @GetMapping("/mbfqydwdjzscxxx")
-    public String mbfqydwdjzscxxx(
+    public AjaxResult mbfqydwdjzscxxx(
             @ApiParam(value = "唯一社会信用代码") @RequestParam String usc_code,
             @ApiParam(value = "组织名称") @RequestParam String org_name) {
+
+        if(StringUtils.isEmpty(usc_code) || StringUtils.isEmpty(org_name)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "8fcc6c4b9ea44aa6d63096db5cfed126"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.MBFQYDWDJZSCXXX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.MBFQYDWDJZSCXXX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -237,19 +292,31 @@ public class CountryProxyQsBdcController {
         params.putOnce("usc_code", usc_code);
         params.putOnce("org_name", org_name);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.MBFQYDWDJZSCXXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+
+        String json = postRequest(ProxyConstants.SID.MBFQYDWDJZSCXXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_社会组织信息查询服务接口（新）
     @ApiOperation(value = "民政部_社会组织信息查询服务接口（新）")
     @GetMapping("/shzzxxcxfwjkx")
-    public String shzzxxcxfwjkx(
+    public AjaxResult shzzxxcxfwjkx(
             @ApiParam(value = "唯一社会信用代码") @RequestParam String usc_code,
             @ApiParam(value = "社会组织名称") @RequestParam String org_name) {
+
+        if(StringUtils.isEmpty(usc_code) || StringUtils.isEmpty(org_name)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "45596d6b8d24c9d51c037d77ff6451d6"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SHZZXXCXFWJKX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SHZZXXCXFWJKX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -262,17 +329,28 @@ public class CountryProxyQsBdcController {
         params.putOnce("usc_code", usc_code);
         params.putOnce("org_name", org_name);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SHZZXXCXFWJKX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SHZZXXCXFWJKX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_民办非企业名称变更登记记录查询（新）
     @ApiOperation(value = "民政部_民办非企业名称变更登记记录查询（新）")
     @GetMapping("/mbfqymcbgdjjlcxx")
-    public String mbfqymcbgdjjlcxx(@ApiParam(value = "统一社会信用代码") @RequestParam String tyxydm) {
+    public AjaxResult mbfqymcbgdjjlcxx(@ApiParam(value = "统一社会信用代码") @RequestParam String tyxydm) {
+
+        if(StringUtils.isEmpty(tyxydm)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "3268f9654271addb14e01868f4350c5d"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.MBFQYMCBGDJJLCXX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.MBFQYMCBGDJJLCXX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -283,19 +361,30 @@ public class CountryProxyQsBdcController {
 //		params.put("tyxydm", "521000000886907386");
         params.putOnce("tyxydm", tyxydm);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.MBFQYMCBGDJJLCXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.MBFQYMCBGDJJLCXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_社会团体法人登记证书查询(新)
     @ApiOperation(value = "民政部_社会团体法人登记证书查询(新)")
     @GetMapping("/shttfrdjzscxx")
-    public String shttfrdjzscxx(
+    public AjaxResult shttfrdjzscxx(
             @ApiParam(value = "唯一社会信用代码") @RequestParam String usc_code,
             @ApiParam(value = "组织名称") @RequestParam String org_name) {
+
+        if(StringUtils.isEmpty(usc_code) || StringUtils.isEmpty(org_name)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "81d1f6c7b58b098b542c979d52411426"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SHTTFRDJZSCXX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SHTTFRDJZSCXX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -308,17 +397,28 @@ public class CountryProxyQsBdcController {
         params.putOnce("usc_code", usc_code);
         params.putOnce("org_name", org_name);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SHTTFRDJZSCXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SHTTFRDJZSCXX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_社会团体名称变更登记记录查询
     @ApiOperation(value = "民政部_社会团体名称变更登记记录查询")
     @GetMapping("/shttmcbgdjjlcx")
-    public String shttmcbgdjjlcx(@ApiParam(value = "统一社会信用代码") @RequestParam String tyxydm) {
+    public AjaxResult shttmcbgdjjlcx(@ApiParam(value = "统一社会信用代码") @RequestParam String tyxydm) {
+
+        if(StringUtils.isEmpty(tyxydm)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "b90f6831c8ee12e45d21f0fa9421de9b"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SHTTMCBGDJJLCX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SHTTMCBGDJJLCX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -329,19 +429,30 @@ public class CountryProxyQsBdcController {
 //		params.put("tyxydm", "521000000886907386");
         params.putOnce("tyxydm", tyxydm);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SHTTMCBGDJJLCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SHTTMCBGDJJLCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("rows"));
     }
 
     // 民政部_涉外婚姻登记信息查询
     @ApiOperation("83民政部_涉外婚姻登记信息查询")
     @GetMapping("/swhydjxxcx")
-    public String swhydjxxcx(
+    public AjaxResult swhydjxxcx(
             @ApiParam(value = "姓名") @RequestParam String name,
             @ApiParam(value = "身份证号") @RequestParam String cert_num) {
+
+        if(StringUtils.isEmpty(name) || StringUtils.isEmpty(cert_num)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "d7ba1384d8c119823be782c20e2c3570"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SWHYDJXXCX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SWHYDJXXCX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -352,19 +463,31 @@ public class CountryProxyQsBdcController {
         params.putOnce("name", name);
         params.putOnce("cert_num", cert_num);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SWHYDJXXCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SWHYDJXXCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("result"));
     }
 
     //民政部_涉外婚姻登记信息核验（个人）（新）
     @ApiOperation(value = "民政部_涉外婚姻登记信息核验（个人）（新）")
     @GetMapping("/swhydjxxhygrx")
-    public String swhydjxxhygrx(
+    public AjaxResult swhydjxxhygrx(
             @ApiParam(value = "姓名") @RequestParam String name,
             @ApiParam(value = "身份证号码") @RequestParam String cert_num) {
+
+        if(StringUtils.isEmpty(name) || StringUtils.isEmpty(cert_num)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "ffd39c059ce081fd2debac66238d79cd"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SWHYDJXXHYGRX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SWHYDJXXHYGRX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
+        System.out.println("resultObj:" + gjzwfwpt_rtime);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -375,7 +498,13 @@ public class CountryProxyQsBdcController {
         params.putOnce("name", name);
         params.putOnce("cert_num", cert_num);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SWHYDJXXHYGRX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SWHYDJXXHYGRX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("result"));
     }
 
     //民政部_涉外婚姻登记信息核验(双方)
@@ -386,10 +515,19 @@ public class CountryProxyQsBdcController {
             @ApiParam(value = "男方身份证件号码") @RequestParam String cert_num_man,
             @ApiParam(value = "女方姓名") @RequestParam String name_woman,
             @ApiParam(value = "女方身份证件号码") @RequestParam String cert_num_woman) {
+
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
+        if(StringUtils.isEmpty(name_woman) || StringUtils.isEmpty(cert_num_woman)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
+
         String appkey = "2a1c4d5d191d692226aa3cd20861610b"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SWHYDJXXHYSF,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SWHYDJXXHYSF);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -408,15 +546,23 @@ public class CountryProxyQsBdcController {
     //民政部_涉外婚姻登记信息核验(双方)(新)
     @ApiOperation(value = "民政部_涉外婚姻登记信息核验(双方)(新) ")
     @GetMapping("/swhydjxxhysfx")
-    public String swhydjxxhysfx(
+    public AjaxResult swhydjxxhysfx(
             @ApiParam(value = "男方姓名") @RequestParam String name_man,
             @ApiParam(value = "男方身份证件号码") @RequestParam String cert_num_man,
             @ApiParam(value = "女方姓名") @RequestParam String name_woman,
             @ApiParam(value = "女方身份证件号码") @RequestParam String cert_num_woman) {
+
+        if(StringUtils.isEmpty(name_man) || StringUtils.isEmpty(cert_num_man)){
+            AjaxResult.error("请将参数填写完整");
+        }
+        if(StringUtils.isEmpty(name_woman) || StringUtils.isEmpty(cert_num_woman)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "24289506f7b4b5c5f5708bbdd73cb761"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SWHYDJXXHYSFX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SWHYDJXXHYSFX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -429,23 +575,34 @@ public class CountryProxyQsBdcController {
         params.putOnce("name_woman", name_woman);
         params.putOnce("cert_num_woman", cert_num_woman);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SWHYDJXXHYSFX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SWHYDJXXHYSFX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("result"));
     }
 
     //民政部_收养登记证信息（国内）查询
     @ApiOperation(value = "民政部_收养登记证信息（国内）查询")
     @GetMapping("/sydjxxgncx")
-    public String sydjxxgncx(
+    public AjaxResult sydjxxgncx(
             @ApiParam(value = "查询方式:1	根据登记证号查询,\r\n"
                     + "2	根据男收养人姓名和男收养人身份证号查询,\r\n"
                     + "3	根据女收养人姓名和女收养人身份证号查询,\r\n"
                     + "4	根据被收养人姓名和被收养人身份证号查询", allowableValues = "1,2,3,4") @RequestParam String querytype,
             @ApiParam(value = "证件号码") @RequestParam String reqcert_num,
             @ApiParam(value = "姓名") @RequestParam(required = false) String name) {
+
+        if(StringUtils.isEmpty(querytype) || StringUtils.isEmpty(reqcert_num) || StringUtils.isEmpty(name)){
+            AjaxResult.error("请将参数填写完整");
+        }
+
         String appkey = "e8c6e754492a296ecad061a3917ad3c1"; //发送方签名
         String gjzwfwpt_sign = GjzwfwptSignUtil.getGjzwfwptSign(ProxyConstants.SID.SYDJXXGNCX,
                 ProxyConstants.RID.QSBDC_RID, appkey);
-        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(ProxyConstants.SID.SYDJXXGNCX);
+        String gjzwfwpt_rtime = GjzwfwptSignUtil.getGjzwfwptRtime(appkey);
         // 接口调用
         Map<String, Object> postParams = new HashMap<>();
         //组装参数
@@ -459,7 +616,13 @@ public class CountryProxyQsBdcController {
         params.putOnce("cert_num", reqcert_num);
         params.putOnce("name", name);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.SYDJXXGNCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        String json = postRequest(ProxyConstants.SID.SYDJXXGNCX, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+
+        return AjaxResult.success("成功",map.get("result"));
     }
 
 

boman-web-core/src/main/java/com/boman/web/core/mapper/AccountingDataMapper.java

@@ -85,4 +85,6 @@ public interface AccountingDataMapper {
     List<AccountingDataVo>  nucleicAcidJcd(AccountingDataVo accountingData);
 
     AccountingDataVo detailedJcd(@Param("id")String id);
+
+    List<AccountingDataVo> nucleicAcidZd(AccountingDataVo accountingData);
 }

boman-web-core/src/main/java/com/boman/web/core/service/TaskService.java

@@ -1105,6 +1105,10 @@ public class TaskService {
                     accountingData.setCjqxqh("340882400000");
                 } else if (accountingData.getCjssxq().contains("lis")) {
                     accountingData.setCjqxqh("123456789");
+                } else if (accountingData.getCjssxq().contains("高铁高速口")) {
+                    accountingData.setCjqxqh("0123456789");
+                } else if (accountingData.getCjssxq().contains("便民检测点")) {
+                    accountingData.setCjqxqh("1258965412");
                 } else {
                     accountingData.setCjqxqh("340882000000");
                 }

boman-web-core/src/main/java/com/boman/web/core/service/accounting/AccountingDataServiceImpl.java

@@ -98,7 +98,24 @@ public class AccountingDataServiceImpl implements IAccountingDataService {
             throw new BaseException("请下载属于本乡镇数据");
         }
         if(list.size()>150000){
-            throw new BaseException("文件过大，到处失败，请分批到处");
+            throw new BaseException("文件过大，到处失败，请分批导出");
+        }
+        return list;
+    }
+
+    @Override
+    public List<AccountingDataVo> nucleicAcidZd(AccountingDataVo accountingData) {
+        accountingData.setCjqxqh("0123456789");
+        List<AccountingDataVo> list = accountingDataMapper.nucleicAcidZd(accountingData);
+        return list;
+    }
+
+    @Override
+    public List<AccountingDataVo> exportZd(AccountingDataVo accountingData) {
+        accountingData.setCjqxqh("0123456789");
+        List<AccountingDataVo> list = accountingDataMapper.nucleicAcidZd(accountingData);
+        if(list.size()>150000){
+            throw new BaseException("文件过大，到处失败，请分批导出");
         }
         return list;
     }

boman-web-core/src/main/java/com/boman/web/core/service/accounting/IAccountingDataService.java

@@ -71,4 +71,8 @@ public interface IAccountingDataService {
     AjaxResult detailedJcd(String id);
 
     List<AccountingDataVo> exportHsd(AccountingDataVo accountingData);
+
+    List<AccountingDataVo> nucleicAcidZd(AccountingDataVo accountingData);
+
+    List<AccountingDataVo> exportZd(AccountingDataVo accountingData);
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -476,6 +476,7 @@ public class CzrkServiceImpl implements ICzrkService {
             czrkJzdz.setCreateBy(username);
             // 当前登陆人的所属最后一级的dept_id
             czrkJzdz.setDeptId(sysUser.getDeptId());
+            czrkJzdz.setIsNucleicAcidFive(czrk.getIsNucleicAcidFive());
             childCount += czrkJzdzService.insertCzrkJzdz(czrkJzdz);
 
         }
@@ -878,7 +879,7 @@ public class CzrkServiceImpl implements ICzrkService {
             czrkJzdz.setUserName(czrk.getUserName());
             czrkJzdz.setIdCard(czrk.getIdCard());
             czrkJzdz.setCreateBy(username);
-            ;
+            czrkJzdz.setIsNucleicAcidFive(czrk.getIsNucleicAcidFive());
             childCount += czrkJzdzService.insertCzrkJzdz(czrkJzdz);
         }
 
@@ -1606,6 +1607,7 @@ public class CzrkServiceImpl implements ICzrkService {
             return null;
         }
 
+
         //获取网格id
         Long gridId = czrk.getGridId();
         if (gridId != null) {
@@ -1626,6 +1628,9 @@ public class CzrkServiceImpl implements ICzrkService {
         //查询改用户居住地址信息
         List<CzrkJzdz> czrkJzdzList = czrkJzdzService.listByCzrkId(czrk.getId());
         czrk.setCzrkJzdzList(czrkJzdzList);
+        if(czrkJzdzList!=null && czrkJzdzList.size()>0){
+            czrk.setIsNucleicAcidFive(czrkJzdzList.get(0).getIsNucleicAcidFive());
+        }
         // 重新计算年龄
         String birthday = czrk.getBirthday();
         if (StringUtils.isNotBlank(birthday)) {

boman-web-core/src/main/java/com/boman/web/core/utils/GjzwfwptSignUtil.java

@@ -53,7 +53,9 @@ public class GjzwfwptSignUtil {
 		if (StringUtils.isEmpty(gjzwfwpt_sign)) {
 			// 1、sid+rid+rtime+appkey 加密生成gjzwfwpt_sign
 			Long rtime = System.currentTimeMillis();
+			System.out.println("时间戳rtime-"+rtime);
 			String content = sid + rid + rtime; // 内容拼接
+			System.out.println("拼接内容-"+content);
 			String sign = AESUtil.sign(content, appkey); // 获取签名
 			boolean verifyFlag = AESUtil.verifySign(content, appkey, sign); // 签名验证
 			if (verifyFlag) {
@@ -80,8 +82,10 @@ public class GjzwfwptSignUtil {
 						gjzwfwpt_sign = AESUtil.sign(content, appsecret);
 					}
 					// Tips：gjzwfwpt_sign有效期10分钟
+					System.out.println("gjzwfwpt_sign---toString"+rtime.toString());
+					System.out.println("gjzwfwpt_sign-"+String.valueOf(rtime));
 					gjzwfwptSignUtil.redisService.setCacheObject(appkey + ":gjzwfwpt_sign",gjzwfwpt_sign, 600L, TimeUnit.SECONDS );
-					gjzwfwptSignUtil.redisService.setCacheObject(appkey + ":gjzwfwpt_rtime",rtime.toString(), 600L, TimeUnit.SECONDS);
+					gjzwfwptSignUtil.redisService.setCacheObject(appkey + ":gjzwfwpt_rtime",String.valueOf(rtime), 600L, TimeUnit.SECONDS);
 					System.out.println("最终签名"+gjzwfwpt_sign);
 					return gjzwfwpt_sign;
 				} else {

boman-web-core/src/main/resources/mapper/AccountingDateMapper.xml

@@ -107,6 +107,25 @@
         order by cjsj desc
     </select>
 
+    <select id="nucleicAcidZd" resultMap="AccountingDataResult"
+            parameterType="com.boman.web.core.domain.vo.AccountingDataVo">
+        <include refid="selectAccountingDataVo"/>
+        <where>
+            1=1
+            <if test="zjhm != null  and zjhm != ''">and zjhm = #{zjhm}</if>
+            <if test="xm != null  and xm != ''">and xm like concat(#{xm}, '%')</if>
+            <if test="lxdh != null  and lxdh != ''">and lxdh = #{lxdh}</if>
+            <if test="params.startTime != null  and params.startTime != '' and params.startTime != 'null'">and
+                DATE_FORMAT(cjsj,'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{params.startTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="params.endTime != null  and params.endTime != ''  and params.endTime != 'null'">and
+                DATE_FORMAT(cjsj,'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{params.endTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="cjqxqh != null  and cjqxqh != ''">and cjqxqh = #{cjqxqh}</if>
+            <if test="cjdd != null  and cjdd != ''">and cjdd = #{cjdd}</if>
+        </where>
+    </select>
+
 
     <select id="selectAccountingDataHjList" parameterType="com.boman.web.core.domain.vo.AccountingDataVo"
             resultMap="AccountingDataResult">
@@ -508,6 +527,32 @@
                 cjsj > #{startTime}
                 AND #{endTime} >= cjsj
             )
+
+        UNION
+
+        SELECT
+            s.id_card_no AS zjhm,
+            s.user_name AS xm,
+            s.user_phone AS lxdh,
+            s.collect_datetime AS cjsj,
+            r.testing_datetime AS jcsj,
+            t.testing_site_name AS jcdd,
+            (
+                CASE
+                    WHEN r.sign_name = 'negative' THEN
+                        '0'
+                    ELSE
+                        '1'
+                    END
+                ) AS jcjg,
+            s.collect_site_name AS cjdd,
+            c.town AS cjssxq
+        FROM `tb_whole_testing_sample_921` s
+        LEFT JOIN tb_whole_testing_result_921 r ON s.id = r.id
+        LEFT JOIN tb_whole_collect_site_city c ON s.collect_site_code = c.id
+        LEFT JOIN tb_testing_site_921 t ON t.testing_site_code = r.testing_site_code
+        where s.collect_datetime > #{startTime}  and #{endTime}>=s.collect_datetime
+
     </select>
 
     <select id="tongjiHjZ" resultType="java.lang.Integer">
@@ -609,5 +654,4 @@
         where id = #{id}
     </select>
 
-
 </mapper>

boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml

@@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="status"    column="status"    />
+        <result property="isNucleicAcidFive"    column="is_nucleicAcid_five"    />
     </resultMap>
 
     <sql id="selectCzrkJzdzVo">
-        select id, czrk_id, id_card, user_name, sort, dept_id, province_id, province, city_id, city, region_id, region, town_id, town, village_id, village,villager_group,villager_group_id now_in, create_by, create_time, update_by, update_time, status from czrk_jzdz
+        select id, czrk_id, id_card, user_name, sort, dept_id, province_id, province, city_id, city, region_id, region, town_id, town, village_id, village,villager_group,villager_group_id now_in, create_by, create_time, update_by, update_time, status,is_nucleicAcid_five from czrk_jzdz
     </sql>
 
     <select id="selectCzrkJzdzList" resultMap="CzrkJzdzResult">
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{deptId}
                 </foreach>
             </if>
+            <if test="isNucleicAcidFive != null  and isNucleicAcidFive != ''"> and is_nucleicAcid_five = #{isNucleicAcidFive}</if>
         </where>
         order by create_time DESC
     </select>
@@ -139,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            <if test="isNucleicAcidFive != null">is_nucleicAcid_five,</if>
             create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -164,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="status != null">#{status},</if>
+            <if test="isNucleicAcidFive != null">#{isNucleicAcidFive},</if>
             sysdate()
         </trim>
     </insert>

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -59,6 +59,9 @@
         <result property="toAppropriateTime" column="to_appropriate_time"/>
 
 
+        <result property="isNucleicAcidFive" column="isNucleicAcidFive"/>
+
+
         <result property="provinceIdXjd" column="provinceIdXjd"/>
         <result property="cityIdXjd" column="cityIdXjd"/>
         <result property="regionIdXjd" column="regionIdXjd"/>
@@ -163,7 +166,7 @@
         select c.id, c.user_name, c.phone_num,c.dept_id, c.id_card,
         c.province, c.city ,c.region , c.village_towns, c.village ,c.now_in,
         c.gender, c.grid_id, c.house_type, c.update_by, c.code,c.is_rl, c.rlr,c.rlr_nike,
-        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time
+        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time, z.is_nucleicAcid_five
         from czrk c left join czrk_jzdz z on c.id =z.czrk_id
         <where>
             c.is_del = 'N'
@@ -188,6 +191,7 @@
             <if test="regionIdXjd != null and regionIdXjd != ''">and z.region_id = #{regionIdXjd}</if>
             <if test="villageTownsIdXjd != null and villageTownsIdXjd != ''">and z.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null and villageIdXjd != ''">and z.village_id = #{villageIdXjd}</if>
+            <if test="isNucleicAcidFive != null and isNucleicAcidFive != ''">and z.is_nucleicAcid_five = #{isNucleicAcidFive}</if>
         </where>
         order by c.code DESC
     </select>
@@ -1206,6 +1210,7 @@
         ANY_VALUE(cj.town) AS villageTownsXjd,
         ANY_VALUE(cj.village) AS villageXjd,
         ANY_VALUE(REPLACE (cj.now_in, '/', '')) AS nowXjd
+        ANY_VALUE(REPLACE (cj.is_nucleicAcid_five, '/', '')) AS isNucleicAcidFive
         from czrk c
         left join czrk_jzdz cj on c.id =cj.czrk_id
         <where>
@@ -1263,6 +1268,8 @@
             <if test="regionIdXjd != null">and cj.region_id = #{regionIdXjd}</if>
             <if test="villageTownsIdXjd != null">and cj.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null">and cj.village_id = #{villageIdXjd}</if>
+            <if test="isNucleicAcidFive != null">and cj.is_nucleicAcid_five = #{isNucleicAcidFive}</if>
+
         </where>
         order by c.code ,c.house_type desc,c.id_card;
     </select>
@@ -1400,7 +1407,7 @@
         z.province as provinceXjd, z.city as cityXjd,z.region as regionXjd, z.town as villageTownsXjd, z.village as
         villageXjd,z.now_in,
         c.gender, c.grid_id, c.house_type, c.update_by, c.code, c.rlr,c.rlr_nike,
-        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.is_nucleicAcid,c.nucleicAcid_time,c.to_appropriate_phone
+        c.is_confirm,c.confirm_info_user,c.confirm_info_nike_user,c.confirm_info_user_time,c.is_nucleicAcid,c.nucleicAcid_time,c.to_appropriate_phone,z.is_nucleicAcid_five as isNucleicAcidFive
         from czrk c left join czrk_jzdz z on c.id =z.czrk_id
         <where>
             c.is_del = 'N'
@@ -1564,6 +1571,7 @@
             <if test="regionIdXjd != null and regionIdXjd != ''">and z.region_id = #{regionIdXjd}</if>
             <if test="villageTownsIdXjd != null and villageTownsIdXjd != ''">and z.town_id = #{villageTownsIdXjd}</if>
             <if test="villageIdXjd != null and villageIdXjd != ''">and z.village_id = #{villageIdXjd}</if>
+            <if test="isNucleicAcidFive != null and isNucleicAcidFive != ''">and z.is_nucleicAcid_five = #{isNucleicAcidFive}</if>
         </where>
         order by c.create_time DESC
     </select>