diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 66fd04c..0f57b9d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -182,7 +182,7 @@ public class MatDeliverFacade {
             babyModel.setHospitalId(patients.getHospitalId());
             babyModel.setDueDate(patients.getDueDate());
             babyModel.setDueType(patients.getDueType());
-            babyModel.setBuildDoctor("产科病房");
+            babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
             babyModel.setServiceStatus(patients.getServiceStatus());
             babyModel.setServiceType(patients.getServiceType());
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 191b277..9021553 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -14,10 +14,7 @@ import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.UsersService;
-import com.lyms.platform.pojo.AntenatalExaminationModel;
-import com.lyms.platform.pojo.BabyModel;
-import com.lyms.platform.pojo.CommunityConfig;
-import com.lyms.platform.pojo.Patients;
+import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.AntExChuQuery;
 import com.lyms.platform.query.AntExQuery;
 import com.lyms.platform.query.BabyModelQuery;
@@ -196,7 +193,7 @@ public class PatientFacade {
      * @param type                     控制类型 1孕妇  3产妇
      * @return
      */
-    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type,Integer userId) {
+    public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId) {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
         patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
@@ -248,7 +245,7 @@ public class PatientFacade {
         try {
             HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId());
             patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
-            patientBaseResult.setRiskScore(highScoreResult.getScore()+"");
+            patientBaseResult.setRiskScore(highScoreResult.getScore() + "");
         } catch (Exception e) {
         }
         return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
@@ -270,19 +267,19 @@ public class PatientFacade {
             chanResult.convertToResult(patients);
             antExQuery.setParentId(patients.getId());
             antExQuery.setYn(YnEnums.YES.getId());
-            if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){
-                if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){
+            if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
+                if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
                     chanResult.setlName(users.getName());
-                }else{
+                } else {
                     chanResult.setlName(patients.getBookbuildingDoctor());
                 }
             }
-            if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){
-                if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){
+            if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
+                if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
                     chanResult.setCheckDoctor(users.getName());
-                }else{
+                } else {
                     chanResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
             }
@@ -292,9 +289,17 @@ public class PatientFacade {
             antExChuQuery.setParentId(patients.getId());
             antExChuQuery.setYn(YnEnums.YES.getId());
             List<AntenatalExaminationModel> ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+
+
             String nextCheckTime = "";
+//            List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery());
             if (CollectionUtils.isNotEmpty(ant)) {
                 nextCheckTime = DateUtil.getyyyy_MM_dd(ant.get(0).getNextCheckTime());
+            } else {
+                List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
+                if (CollectionUtils.isNotEmpty(list)) {
+                    nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
+                }
             }
             chanResult.setNextCheckTime(nextCheckTime);
             data.add(chanResult);
@@ -312,19 +317,19 @@ public class PatientFacade {
             quanPatientsResult.convertToResult(patients);
             antExQuery.setParentId(patients.getId());
             antExQuery.setYn(YnEnums.YES.getId());
-            if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){
-                if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){
+            if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
+                if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
                     quanPatientsResult.setlName(users.getName());
-                }else{
+                } else {
                     quanPatientsResult.setlName(patients.getBookbuildingDoctor());
                 }
             }
-            if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){
-                if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){
+            if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
+                if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
                     quanPatientsResult.setCheckDoctor(users.getName());
-                }else{
+                } else {
                     quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
             }
@@ -335,6 +340,17 @@ public class PatientFacade {
             //初诊次数
             int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
             quanPatientsResult.setcTimes(i + b);
+            String nextCheckTime = "";
+            List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+            if (CollectionUtils.isNotEmpty(examinationModels)) {
+                nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime());
+            } else {
+                List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
+                if (CollectionUtils.isNotEmpty(list)) {
+                    nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
+                }
+            }
+            quanPatientsResult.setcTime(nextCheckTime);
             data.add(quanPatientsResult);
         }
         return data;
@@ -353,19 +369,19 @@ public class PatientFacade {
         for (Patients patients : patientses) {
             RiskPatientsResult riskPatientsResult = new RiskPatientsResult();
             riskPatientsResult.convertToResult(patients);
-            if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){
-                if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){
-                   Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
+            if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
+                if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
+                    Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
                     riskPatientsResult.setlName(users.getName());
-                }else{
+                } else {
                     riskPatientsResult.setlName(patients.getBookbuildingDoctor());
                 }
             }
-            if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){
-                if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){
+            if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
+                if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
                     riskPatientsResult.setCheckDoctor(users.getName());
-                }else{
+                } else {
                     riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
             }
@@ -377,6 +393,17 @@ public class PatientFacade {
             //初诊次数
             int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
             riskPatientsResult.setcTimes(i + b);
+            String nextCheckTime = "";
+            List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+            if (CollectionUtils.isNotEmpty(examinationModels)) {
+                nextCheckTime = DateUtil.getyyyy_MM_dd(examinationModels.get(0).getNextCheckTime());
+            } else {
+                List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
+                if (CollectionUtils.isNotEmpty(list)) {
+                    nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
+                }
+            }
+            riskPatientsResult.setcTime(nextCheckTime);
             data.add(riskPatientsResult);
         }
         return data;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
index 0092f08..0ee5b7a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java
@@ -281,7 +281,10 @@ public class StopPregnancyFacade {
             }
 
         }
-
+        Map map = new HashMap();
+        map.put("id","a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
+        map.put("name","产科病房");
+        list.add(map);
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         objectResponse.setData(list);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);