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 3c397b6..3a49a6b 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
@@ -14,6 +14,7 @@ import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.LisReportQuery;
 import com.lyms.platform.query.PatientsQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
@@ -385,16 +386,31 @@ public class QhdfyHisService {
     public Map<String,Object> queryHisBabyDiagnosis(String blNo) {
 
         Map<String,Object> map = new HashMap<>();
+        StringBuffer sb = new StringBuffer();
         if (StringUtils.isNotBlank(blNo)) {
-            Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
+            Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection();
             QueryRunner queryRunner = new QueryRunner();
+
             try {
-                List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK  where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
-                if (list.size() > 0) {
-                    for (DiagnosisInfo info:list) {
+               // List<DiagnosisInfo> list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK  where blh= '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
+                List<DiagnosisInfo> list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK  where ZYHM = '"+blNo+"'", new BeanListHandler<DiagnosisInfo>(DiagnosisInfo.class));
+                if (CollectionUtils.isNotEmpty(list)) {
+//                    for (DiagnosisInfo info:list) {
+//                        map.put("diagnosisItem", info.getDiagnosisItem());
+//                        break;
+//                    }
 
-                        map.put("diagnosisItem", info.getDiagnosisItem());
-                        break;
+                    for (int i = 0 ; i < list.size() ; i++)
+                    {
+                        if (i < list.size() -1)
+                        {
+                            sb.append(list.get(i).getDiagnosisItem());
+                            sb.append(", ");
+                        }
+                        else
+                        {
+                            sb.append(list.get(i).getDiagnosisItem());
+                        }
                     }
                 }
                 DbUtils.closeQuietly(conn);
@@ -403,6 +419,7 @@ public class QhdfyHisService {
                 e.printStackTrace();
             }
         }
+        map.put("diagnosisItem", sb.toString());
         return map;
     }
 }