diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 74ad75b..3afee87 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1577,12 +1577,12 @@ public class DateUtil {
 
     public static void main(String[] args) {
 
-        Date last = parseDate("2020-02-29");
+        Date bir = parseYMD("1992-03-29");
+        Date bir1 = parseYMD("2020-03-29");
 
+        Integer i =  getAge(bir, bir1);
+        System.out.println(i);
 
-        Date st = DateUtil.addDay(last, 280);
-
-        System.out.println(getyyyy_MM_dd(st));
     }
 
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index a8550fd..cd114d6 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -1016,7 +1016,7 @@ public class QhdfyHisService {
     public String queryPatientCardNoByBlNo(String blNo) {
 
         Connection conn = null;
-        String sql = "select blh,syxh,hzxm,birth,birthtime,sex from VW_LYMS_XSE_BRSYK where ";
+        String sql = "select sfzh as cardNo from VW_LYMS_XSE_BRSYK where blh='"+blNo+"'";
         try {
 
             conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 78b8ac6..2ae20c2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -205,13 +205,16 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
             patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
         }
 
-        List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
+        //List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
+
+        List<Patients> patientsList = patientsService.queryPatient1(patientsQuery, "created");
+
         if (patientsList == null || patientsList.size() == 0) {
             dischargeAbstractQueryResult.setStatus("0");
             dischargeAbstractQueryResult.setErrormsg("没有孕妇或产妇档案");
             return dischargeAbstractQueryResult;
         }
-        Patients patients = patientsList.get(patientsList.size() - 1);
+        Patients patients = patientsList.get(0);
 
         if (new Integer(1).equals(patients.getDueStatus())) {
             // 终止妊娠不能进行出院小结
@@ -242,11 +245,11 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
         }
 
 
-        if (!hospitalId.equals(patients.getFmHospital())) {
-            dischargeAbstractQueryResult.setStatus("6");
-            dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
-            return dischargeAbstractQueryResult;
-        }
+//        if (!hospitalId.equals(patients.getFmHospital())) {
+//            dischargeAbstractQueryResult.setStatus("6");
+//            dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
+//            return dischargeAbstractQueryResult;
+//        }
 
         BeanUtils.copy(patients, dischargeAbstractQueryResult);
         dischargeAbstractQueryResult.setPatientId(patients.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 1f99fe7..bf22f42 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -6283,7 +6283,9 @@ public class ViewFacade {
             List<Patients> list;
             String patientId = getPatientId(idCard);
             if (StringUtils.isNotEmpty(patientId)) {
-                list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
+                //list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
+
+                list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId)), Patients.class);
             } else {
                 list = patientsService.queryPatient1(patientsQuery, "created");
             }