diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
index 3afad3c..e264975 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
@@ -17,7 +17,7 @@ import sun.misc.BASE64Encoder;
 public class LymsEncodeUtil {
 
     public static void main(String[] args) throws Exception {
-        String key = "Lymsh@2016";
+        String key = "Lymsh@2020";
         /*
          * String content = "我爱你"; System.out.println("加密前：" + content); System.out.println("加密密钥和解密密钥：" + key);
           *
@@ -26,12 +26,13 @@ public class LymsEncodeUtil {
 
         //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
 
-        String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key);
+//        String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB", key);
+        String json = aesDecrypt("B9B53173ADF73A82548800F08358F4C3", key);
         System.out.println("解密后：" + json);
 
-        String key1 = "Lymsh@2020";
+//        String key1 = "Lymsh@2020";
 
-        String d = aesEncrypt("2020-06-30",key1);
+        String d = aesEncrypt("2020-11-30",key);
         System.out.println("加密：" + d);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java
index eb19890..914ff61 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java
@@ -16,6 +16,8 @@ public class CommonParamRequest implements Serializable {
      */
     private String cardNo;
 
+    private String vcCardNo;
+
     /**
      * 住院号..
      */
@@ -26,6 +28,14 @@ public class CommonParamRequest implements Serializable {
      */
     private String code;
 
+    public String getVcCardNo() {
+        return vcCardNo;
+    }
+
+    public void setVcCardNo(String vcCardNo) {
+        this.vcCardNo = vcCardNo;
+    }
+
     public String getCode() {
         return code;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
index fc669d3..d5c16e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
@@ -580,14 +580,38 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
     @Override
     public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
         String cardNo = param.getCardNo();
-        if (StringUtils.isEmpty(cardNo)) {
+        String vcCardNo = param.getVcCardNo();
+        if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)) {
             return new BaseResponse("参数缺失",ErrorCodeConstants.PARAMETER_ERROR);
         }
         BaseResponse baseResponse = new BaseResponse();
-        List<CervicalCancerModel> modelByIdCardNos = mongoTemplate.find(Query.query(Criteria.where("idCardNo").is(cardNo)), CervicalCancerModel.class);
+        List <CervicalCancerModel> modelByIdCardNos = null;
+        if(StringUtils.isNotEmpty(cardNo)){
+            modelByIdCardNos = mongoTemplate.find(Query.query(Criteria.where("idCardNo").is(cardNo)), CervicalCancerModel.class);
+        }
+        //20201021处理宫颈癌检查没有存储就诊卡号问题
+        if(StringUtils.isNotEmpty(vcCardNo)){
+            List <ResidentsArchiveModel>  residentsArchiveModels = mongoTemplate.find(
+                    Query.query(Criteria.where("vcCardNo").is(vcCardNo).and("certificateNum").ne(null))
+                            .with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
+            if(CollectionUtils.isNotEmpty(residentsArchiveModels)){
+                ResidentsArchiveModel residentsArchiveModel = residentsArchiveModels.get(0);
+                if(StringUtils.isNotEmpty(residentsArchiveModel.getCertificateNum())){
+                    String certificateNum = residentsArchiveModel.getCertificateNum();
+                    modelByIdCardNos = mongoTemplate.find(Query.query(Criteria.where("idCardNo").is(certificateNum)), CervicalCancerModel.class);
+                }
+            }
+        }
         CervicalCancerModelResult result = new CervicalCancerModelResult();
         if (CollectionUtils.isEmpty(modelByIdCardNos)) {
-            List<ResidentsArchiveModel> models = mongoTemplate.find(Query.query(Criteria.where("certificateNum").is(cardNo)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
+            List <ResidentsArchiveModel> models = null;
+            if(StringUtils.isNotEmpty(cardNo)){
+                models = mongoTemplate.find(
+                        Query.query(Criteria.where("certificateNum").is(cardNo)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
+            }else if(StringUtils.isNotEmpty(vcCardNo)){//宫颈癌检查增加就诊卡号查询
+                models = mongoTemplate.find(
+                        Query.query(Criteria.where("vcCardNo").is(vcCardNo)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
+            }
             if (CollectionUtils.isEmpty(models)) {
                 return new BaseResponse("查无数据，请先到妇女建档进行建档操作", ErrorCodeConstants.NO_DATA);
             }