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 ff9d899..ef0f583 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
@@ -35,6 +35,8 @@ import org.apache.commons.dbutils.handlers.BeanListHandler;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -52,6 +54,7 @@ import java.util.*;
  */
 @Service("qhdfyHisService")
 public class QhdfyHisService {
+    private static final Logger logger = LoggerFactory.getLogger(QhdfyHisService.class);
 
     //血红蛋白70~99g/L
     private static final  String MSG1="提示：您好，您在产检过程中，检验报告提示血红蛋白为datag/L，属于中度贫血，为避免对您和您的宝宝带来不好的结局，请收到消息后尽快到产科门诊105室就诊。";
@@ -979,6 +982,58 @@ public class QhdfyHisService {
         return map;
     }
 
+    public Map<String, Object> queryHisBabyDiagnosis2(String blNo) {
+
+        Map<String, Object> map = new HashMap<>();
+        StringBuffer sb = new StringBuffer();
+        if (StringUtils.isNotBlank(blNo)) {
+            Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
+            QueryRunner queryRunner = new QueryRunner();
+            String sql = "select syxh  from VW_LYMS_XSE_BRSYK where blh =  '" + blNo + "' and cyrq is not null and ksdm ='2545' and bqdm = '206' ";
+            logger.info("----1-----VW_LYMS_XSE_BRSYK---------"+sql);
+            try {
+                List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn,sql , new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
+                if (CollectionUtils.isNotEmpty(list)) {
+                    for (BabyDischargeDiagnosisModel info : list) {
+                        if(info!=null && StringUtils.isNotEmpty(info.getSyxh())){
+                            continue;
+                        }
+                        String sqlstr = "select ZDMC as cyzdmc  from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
+                        logger.info("----2-----hemr.V_DIAGNOSIS_LYMS---------"+sqlstr);
+                        Connection conn2 = null;
+                        try {
+                            conn2 = ConnTools.qhdzdConnection();
+                            QueryRunner queryRunner2 = new QueryRunner();
+                            List<BabyDischargeDiagnosisModel> listxq = queryRunner2.query(conn2, sqlstr, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
+                            String cyzdxq = "";
+                            for (int j = 0; j < listxq.size(); j++) {
+                                BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j);
+                                if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){
+                                    cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" ";
+                                }
+                            }
+                            if(StringUtils.isNotEmpty(cyzdxq)){
+                                map.put("diagnosisItem", cyzdxq);
+                            }
+                        } catch (SQLException e) {
+                            e.printStackTrace();
+                        }finally {
+                            DbUtils.closeQuietly(conn2);
+                        }
+
+                    }
+
+
+                }
+                DbUtils.closeQuietly(conn);
+            } catch (SQLException e) {
+                DbUtils.closeQuietly(conn);
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
+
     public BaseListResponse getBabyDiacrisis(String startDischargeDate, String endDischargeDate,
                                              String startBirthDate, String endBirthDate,
                                              String hospitalizationNo, String babyName,
@@ -1181,7 +1236,8 @@ public class QhdfyHisService {
             for (int i = 0; i <list.size() ; i++) {
                 BabyDischargeDiagnosisModel babyDischargeDiagnosisModel = list.get(i);
                 if(babyDischargeDiagnosisModel!=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel.getSyxh())){
-                    String sqlstr = "select ZDMC as cyzdmc  from jhemr.v_卫宁诊断数据 where syxh='"+babyDischargeDiagnosisModel.getSyxh()+"' ORDER BY ZDRQ desc ";
+//                    String sqlstr = "select ZDMC as cyzdmc  from jhemr.v_卫宁诊断数据 where syxh='"+babyDischargeDiagnosisModel.getSyxh()+"' ORDER BY ZDRQ desc ";
+                    String sqlstr = "select ZDMC as cyzdmc  from jhemr.V_DIAGNOSIS_LYMS where syxh='"+babyDischargeDiagnosisModel.getSyxh()+"' ORDER BY ZDRQ desc ";
                     try {
                         conn = ConnTools.qhdzdConnection();
                         QueryRunner queryRunner = new QueryRunner();
@@ -1190,7 +1246,7 @@ public class QhdfyHisService {
                         for (int j = 0; j < listxq.size(); j++) {
                             BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j);
                             if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){
-                                cyzdxq = babyDischargeDiagnosisModel1.getCyzdmc()+" ";
+                                cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" ";
                             }
                         }
                         if(StringUtils.isNotEmpty(cyzdxq)){
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 1d4de6c..e1f7764 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
@@ -709,6 +709,7 @@ public class BabyBuildController extends BaseController {
                                              @RequestParam(value = "type", required = true) String type,
                                              @RequestParam(value = "lrrqEnd", required = true) String lrrqEnd
     ) {
+
         return babyBookbuildingFacade.queryNewBabyDiagnoseQhd(lrrqStart, lrrqEnd, type);
     }
 
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 004ca0c..5c660e8 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
@@ -3757,7 +3757,8 @@ public class BabyBookbuildingFacade {
     public BaseResponse queryHisBabyDiagnosis(String blNo) {
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         if ("4".equals(HIS_VERSION)) {
-            Map <String, Object> results = qhdfyHisService.queryHisBabyDiagnosis(blNo);
+//            Map <String, Object> results = qhdfyHisService.queryHisBabyDiagnosis(blNo);
+            Map <String, Object> results = qhdfyHisService.queryHisBabyDiagnosis2(blNo);//20210108 新规则
             //results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！");
             objectResponse.setData(results);
             objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);