diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java
index 5cc2d5e..d71f7c6 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java
@@ -47,7 +47,11 @@ public class PremaritalCheckupService {
 
     public List<PremaritalCheckup> queryPremaritalCheckupWithSort(PremaritalCheckupQuery query,String sortkey,Sort.Direction sort){
         MongoQuery mongoQuery = query.convertToQuery();
-        return premaritalCheckupDao.queryPremaritalCheckup(mongoQuery.addOrder(sort,sortkey));
+        if (StringUtils.isNotEmpty(query.getNeed())) {
+            query.mysqlBuild(premaritalCheckupDao.queryPremaritalCheckupCount(mongoQuery));
+            mongoQuery.start(query.getOffset()).end(query.getLimit());
+        }
+        return premaritalCheckupDao.queryPremaritalCheckup(mongoQuery.addOrder(sort, sortkey));
     }
 
 }
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
index be70222..72c9020 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
@@ -424,4 +424,14 @@ public final class StringUtils {
         }
         return "";
     }
+
+    public static String riskCodeStr(Long numCode) {
+        if (numCode != null)
+        {
+            StringBuffer sb = new StringBuffer(String.valueOf(numCode));
+            sb.insert(4,"-");
+            return sb.toString();
+        }
+        return "";
+    }
 }
\ No newline at end of file
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 41a72fd..a60829a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -1223,6 +1223,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     public void setHasBlno(Boolean hasBlno) {
         this.hasBlno = hasBlno;
     }
+    private Boolean riskCodeExist;
     private Long riskCode;
 
     public Long getRiskCode() {
@@ -1232,6 +1233,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     public void setRiskCode(Long riskCode) {
         this.riskCode = riskCode;
     }
+
+    public Boolean getRiskCodeExist() {
+        return riskCodeExist;
+    }
+
+    public void setRiskCodeExist(Boolean riskCodeExist) {
+        this.riskCodeExist = riskCodeExist;
+    }
+
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
@@ -1248,6 +1258,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (StringUtils.isNotEmpty(lastCheckDoctor)) {
             condition = condition.and("lastCheckDoctor", lastCheckDoctor, MongoOper.IS);
         }
+        if (StringUtils.isNotEmpty(riskCode)) {
+            condition = condition.and("riskCode", riskCode, MongoOper.IS);
+        }
 
         if (StringUtils.isNotEmpty(apparatus) && StringUtils.isNotEmpty(doctorJudgement) ) {
             MongoCondition con1 = MongoCondition.newInstance("apparatus", apparatus, MongoOper.IS);//器械判定阳性 类型
@@ -1350,8 +1363,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("dueWeek", dueWeek, MongoOper.LTE);
         }
 
-        if (null != riskCode) {
-            condition = condition.and("riskCode", true, MongoOper.EXISTS);
+        if (null != riskCodeExist) {
+            condition = condition.and("riskCode", riskCodeExist, MongoOper.EXISTS);
         }
         if (StringUtils.isNotEmpty(openDisease)) {
             if ("2".equals(openDisease))
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
index 540ec4c..1d4de6c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
@@ -265,7 +265,8 @@ public class BabyBuildController extends BaseController {
                                           @RequestParam(value = "endCase", required = false) Integer endCase,
                                           @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart,
                                           @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd,
-                                          @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor
+                                          @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor,
+                                          @RequestParam(value = "riskCode", required = false) String riskCode
     ) {
 
         if (CollectionUtils.isNotEmpty(highRiskInfos)) {
@@ -325,6 +326,7 @@ public class BabyBuildController extends BaseController {
         request.setDueWeekStart(dueWeekStart);
         request.setDueWeekEnd(dueWeekEnd);
         request.setLastCheckDoctor(lastCheckDoctor);
+        request.setRiskCode(riskCode);
 
         return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index e980b2b..63278f7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -879,7 +879,7 @@ public class BabyBookbuildingFacade {
             operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
             model.setEndCase(0);//秦皇岛，默认未结案
 
-            setRiksCode(model);
+            setRiskCode(model);
             model = babyBookbuildingService.addBabyBookbuilding(model);
 
 
@@ -939,25 +939,30 @@ public class BabyBookbuildingFacade {
     }
 
 
-    public synchronized void setRiksCode(BabyModel model)
+    public synchronized void setRiskCode(BabyModel model)
     {
-        Long result = Long.valueOf(DateUtil.getYmd()+"0001");
-        BabyModelQuery babyQuery = new BabyModelQuery();
-        babyQuery.setHospitalId(model.getHospitalId());
-        babyQuery.setNeed("true");
-        babyQuery.setPage(1);
-        babyQuery.setLimit(1);
-        babyQuery.setRiskCode(1L);
-        babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
-        List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
-        if (CollectionUtils.isNotEmpty(models))
+        //高危儿童才设置编号
+        if (model.getHighRisk() != null && model.getHighRisk() == 1)
         {
-            if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
+            Long result = Long.valueOf(DateUtil.getYmd()+"1");
+            BabyModelQuery babyQuery = new BabyModelQuery();
+            babyQuery.setHospitalId(model.getHospitalId());
+            babyQuery.setNeed("true");
+            babyQuery.setPage(1);
+            babyQuery.setLimit(1);
+            babyQuery.setRiskCodeExist(true);
+            babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
+            List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+            if (CollectionUtils.isNotEmpty(models))
             {
-                result = models.get(0).getRiskCode()+1;
+                if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
+                {
+                    result = models.get(0).getRiskCode()+1;
+                }
             }
+            model.setRiskCode(result);
         }
-        model.setRiskCode(result);
+
     }
 
     /**
@@ -2566,6 +2571,12 @@ public class BabyBookbuildingFacade {
         babyQuery.setOpenDisease(request.getOpenDisease());
         babyQuery.setLastCheckDoctor(request.getLastCheckDoctor());
 
+        if (StringUtils.isNotEmpty(request.getRiskCode()) && StringUtils.isNum(request.getRiskCode().replace("-","")))
+        {
+            babyQuery.setRiskCode(Long.valueOf(request.getRiskCode().replace("-","")));
+        }
+
+
         //结案查询
         babyQuery.setEndCase(request.getEndCase());
         //体弱儿详情
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index e98253e..f5515ed 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -965,10 +965,10 @@ public class PremaritalCheckupFacade {
         query.setNeed("y");
         query.setYn(YnEnums.YES.getId());
         query.setHospitalId(checkup.getHospitalId());
-        List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
+        List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "numCode", Sort.Direction.DESC);
         if (CollectionUtils.isNotEmpty(data))
         {
-            if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getYmd()))
+            if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getymd6()))
             {
                 result = data.get(0).getNumCode()+1;
             }
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 3639e4a..a5b93bd 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
@@ -5320,6 +5320,8 @@ public class ViewFacade {
                     }
                 }
             }
+
+            result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode()));
         }
 
         /** 优惠券编号 */
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
index 552dedb..c7060cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
@@ -105,6 +105,15 @@ public class BabyManageRequest extends BaseQuery {
     //分娩孕周
     private Integer dueWeekEnd;
     private String lastCheckDoctor;
+    private  String riskCode;
+
+    public String getRiskCode() {
+        return riskCode;
+    }
+
+    public void setRiskCode(String riskCode) {
+        this.riskCode = riskCode;
+    }
 
     public String getLastCheckDoctor() {
         return lastCheckDoctor;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
index ddd51dd..db75857 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
@@ -82,6 +82,15 @@ public class BabyManageListResult {
     private String openDisease;
     private Integer dueWeek;
     private String lastCheckDoctor;
+    private String riskCode;
+
+    public String getRiskCode() {
+        return riskCode;
+    }
+
+    public void setRiskCode(String riskCode) {
+        this.riskCode = riskCode;
+    }
 
     public String getLastCheckDoctor() {
         return lastCheckDoctor;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index bcbfc1f..37d7a28 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -321,7 +321,15 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     private String openDisease;
     private String openDiseaseType;
     private String openDiseaseEndTime;
+    private String riskCode;
 
+    public String getRiskCode() {
+        return riskCode;
+    }
+
+    public void setRiskCode(String riskCode) {
+        this.riskCode = riskCode;
+    }
 
     public Integer getYn() {
         return yn;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
index ec29ef5..e9226e0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
@@ -104,6 +104,12 @@ public class BabyListTask implements Callable {
                     result.setLastCheckDoctor(usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName());
                 }
 
+                if (model.getRiskCode() != null)
+                {
+                    result.setRiskCode(StringUtils.riskCodeStr(model.getRiskCode()));
+                }
+
+
                 result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
                 result.setBabyName(StringUtils.emptyDeal(model.getName()));
                 result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));