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 72c9020..8c7b8f1 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
@@ -84,7 +84,7 @@ public final class StringUtils {
     }
 
    public static void main(String[] args) {
-        System.out.println(numCodeStr(2020010711L));
+        System.out.println("2021122".startsWith("2031"));
     }
 
 
@@ -419,18 +419,7 @@ public final class StringUtils {
         if (numCode != null)
         {
             StringBuffer sb = new StringBuffer(String.valueOf(numCode));
-            sb.insert(8,"-");
-            return sb.toString();
-        }
-        return "";
-    }
-
-    public static String riskCodeStr(Long numCode) {
-        if (numCode != null)
-        {
-            StringBuffer sb = new StringBuffer(String.valueOf(numCode));
-            sb.insert(4,"-");
-            return sb.toString();
+            sb.insert(6,"-");
         }
         return "";
     }
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 a0695d3..6718314 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
@@ -942,7 +942,7 @@ public class BabyBookbuildingFacade {
 
 
 
-    public void setRiskCode(String id)
+    public synchronized void setRiskCode(String id)
     {
         BabyModel babyModel = babyBookbuildingService.queryBabyById(id);
         if (babyModel.getRiskCode() == null)
@@ -954,7 +954,7 @@ public class BabyBookbuildingFacade {
     }
 
 
-    public synchronized void setRiskCode(BabyModel model)
+    public void setRiskCode(BabyModel model)
     {
         //高危儿童才设置编号
         if (("216".equals(model.getHospitalId()) || "2100001377".equals(model.getHospitalId())) && model.getHighRisk() != null && model.getHighRisk() == 1)
@@ -970,9 +970,10 @@ public class BabyBookbuildingFacade {
             List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
             if (CollectionUtils.isNotEmpty(models))
             {
-                if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYearStr()))
+                if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).startsWith(DateUtil.getYearStr()))
                 {
-                    result = models.get(0).getRiskCode()+1;
+                    Long l = Long.valueOf(String.valueOf(models.get(0).getRiskCode()).substring(4))+1;
+                    result = Long.valueOf(String.valueOf(models.get(0).getRiskCode()).substring(0,4)+ l);
                 }
             }
             model.setRiskCode(result);
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 f5515ed..abf5803 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
@@ -968,9 +968,10 @@ public class PremaritalCheckupFacade {
         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.getymd6()))
+            if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).startsWith(DateUtil.getymd6()))
             {
-                result = data.get(0).getNumCode()+1;
+                Long l = Long.valueOf(String.valueOf(data.get(0).getNumCode()).substring(8))+1;
+                result = Long.valueOf(String.valueOf(data.get(0).getNumCode()).substring(0,8)+ l);
             }
         }
         checkup.setNumCode(result);