diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java
index 05e2e3a..a729aa2 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java
@@ -593,6 +593,17 @@ public class JdbcUtil {
             chuModel.setGonggao(getString(map.get("FE_UTERUSHEIGHT")));
             chuModel.setFuwei(getString(map.get("FE_ABGIRTH")));
 
+
+            String doctorId = getString(map.get("FE_DOCTOR"));
+            if (doctorId != null && !"".equals(doctorId))
+            {
+                String dname = getString(getOralceSingleObjBySql("select e.e_name from mommy_employee e where e.e_id = '" + doctorId + "'"));
+                String id = getString(getMysqlSingleObjBySql("select id  from users where name = '" + dname + "'"));
+                chuModel.setProdDoctor(id);//产检医生
+            }
+
+
+
             Integer tireNum = 1;
             if (map.get("FE_ISSECOND") !=null )
             {
@@ -615,7 +626,7 @@ public class JdbcUtil {
             chuModel.setCreated(getDate(map.get("FE_CREATETIME")));
             chuModel.setNextCheckTime(getDate(map.get("FE_ORDERNEXT")));
             chuModel.setCheckTime(getDate(map.get("FE_ROCTORTIME")));
-
+            chuModel.setOtherHighRisk("{}");
             String hid = getString(map.get("FE_HOSPITALID"));
             if (hid != null && !"".equals(hid))
             {
@@ -736,7 +747,7 @@ public class JdbcUtil {
                 "                        --高危风险关系表\n" +
                 "                        MOMMY_EXAMINWARNING J\n" +
                 "                        --高危内容\n" +
-                "                        INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND  K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43'\n" +
+                "                        INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND  K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43' AND K.DC_NAME<>'其他' \n" +
                 "                        --高危等级\n" +
                 "                        INNER JOIN PLAT_DATACONTENT L ON K.DC_PARENTID=L.DC_ID AND L.DC_ISVALID=1\n" +
                 "                        INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME\n" +
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 584e904..33614c1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -1753,7 +1753,7 @@ public class AntenatalExaminationFacade {
                         if (CollectionUtils.isNotEmpty(basicConfigs2)) {
                             for (BasicConfig bc : basicConfigs2) {
                                 String name = bc.getName();
-                                if (name != null && name.indexOf("预警") > -1) {
+                                if (name.indexOf("预警") > -1) {
                                     name = name.replace("预警", "");
                                 }
                                 map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));