diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
index d2b2cca..1e6b80e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
@@ -93,12 +93,25 @@ public class SieveController extends BaseController {
      */
     @ResponseBody
     @TokenRequired
-    @RequestMapping(value = "/querySievePatientInfo", method = RequestMethod.GET)
+    @RequestMapping(value = "/querySievePatientInfohs", method = RequestMethod.GET)
     public BaseResponse querySievePatientInfo(@RequestParam(required = false) String cardNo, @RequestParam(required = false) String vcCardNo, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return sieveFacade.querySievePatientInfohs(cardNo, vcCardNo, loginState.getId());
+    }
+    /**
+     * 添加查询前 查询孕妇基本信息
+     * 如果孕妇没有在本院建档就添加隐藏档案
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/querySievePatientInfo", method = RequestMethod.GET)
+    public BaseResponse querySievePatientInfoqhd(@RequestParam(required = false) String cardNo, @RequestParam(required = false) String vcCardNo, HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return sieveFacade.querySievePatientInfo(cardNo, vcCardNo, loginState.getId());
     }
-
     /**
      * 查看申请单
      * <p>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 7ede8af..d124ed2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -843,7 +843,7 @@ public class SieveFacade {
      * @param userId
      * @return
      */
-    public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) {
+    public BaseResponse querySievePatientInfohs(String cardNo, String vcCardNo, Integer userId) {
 
         String hospitalId = autoMatchFacade.getHospitalId(userId);
 
@@ -939,6 +939,102 @@ public class SieveFacade {
 
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
     }
+    public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) {
+
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
+
+        PatientsQuery patientsQuery = new PatientsQuery();
+        patientsQuery.setHospitalId(hospitalId);
+        patientsQuery.setYn(YnEnums.YES.getId());
+        if (StringUtils.isNotEmpty(cardNo)) {
+            patientsQuery.setPhoneOrCert(cardNo);
+        } else if (StringUtils.isNotEmpty(vcCardNo)) {
+            patientsQuery.setVcCardNo(vcCardNo);
+        }
+
+
+        List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
+        Patients pat = null;
+        if (CollectionUtils.isNotEmpty(localPatients)) {
+            pat = localPatients.get(0);
+        } else {
+            patientsQuery.setHospitalId(null);
+            List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
+            if (CollectionUtils.isNotEmpty(areaPatients)) {
+                pat = areaPatients.get(0);
+                if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
+                    //建立隐藏档案
+                    String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
+
+                    pat = patientsService.findOnePatientById(id);
+                } else {
+                    return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
+                }
+            } else {
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
+            }
+        }
+
+        HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false);
+        PatientBaseResult patientBaseResult = new PatientBaseResult();
+        if (null != pat) {
+
+           /*
+           20200608 产筛修改 wtt ,去掉已申请过产筛限制，可以多次申请产筛*/
+           SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
+            sieveApplyOrderQuery1.setParentId(pat.getId());
+            sieveApplyOrderQuery1.setHospitalId(hospitalId);
+            sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
+
+            List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
+            if (CollectionUtils.isNotEmpty(list)) {
+                return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛！");
+            }
+
+            patientBaseResult.convert(pat);
+        }
+        patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
+        patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
+
+        AntExChuQuery antExChuQuery = new AntExChuQuery();
+        antExChuQuery.setParentId(pat.getId());
+        antExChuQuery.setYn(YnEnums.YES.getId());
+
+        List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
+        if (CollectionUtils.isNotEmpty(list)) {
+            AntExChuModel chuModel = list.get(0);
+            patientBaseResult.setWeight(chuModel.getYqWeight());
+        }
+
+        //查询产前诊断
+        int a = 0;
+        List<Map<String, String>> mList = new ArrayList<Map<String, String>>();
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("cqSieve", "0");//0,未申请；1，已申请；2，已接收；3，已诊断
+        map.put("diaProject", "");
+        map.put("diaResult", "");//(0，阴性；1，阳性)
+        DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
+        diagnosisQuery.setParentId(pat.getId());
+        diagnosisQuery.setHospitalId(hospitalId);
+        List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
+        if (CollectionUtils.isNotEmpty(diaList)) {
+            for (DiagnosisModel diagnosisModel : diaList) {
+                Map<String, String> m = new HashMap<String, String>();
+                m.put("cqSieve", diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断
+                m.put("diaProject", diagnosisModel.getDiaProject());
+                m.put("diaResult", diagnosisModel.getDiaResult());//(0，阴性；1，阳性)
+                a = 1;
+                mList.add(m);
+            }
+        }
+        if (a == 0) {
+            mList.add(map);
+        }
+        patientBaseResult.setDia(mList);
+
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
+    }
 
     public BaseResponse getSieveApplyInfo(String parentId, String lymsSieveId, Integer userId, Integer type) {