diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java
index 88461c7..5b90886 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java
@@ -38,8 +38,8 @@ public class ConnTools {
 
     private static String fmDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
     private static String fmUrl = "jdbc:sqlserver://168.254.0.99\\hissvr; DatabaseName=JHMK2HIS";
-    private static String fmUser = "LYMS";
-    private static String fmPassword = "LYMS";
+    private static String fmUser = "sa";
+    private static String fmPassword = "qhdfy@123";
 
 
     private static String clDirverClassName = "oracle.jdbc.driver.OracleDriver";
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 5e6b7b1..43131a7 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
@@ -993,54 +993,54 @@ public class QhdfyHisService {
     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' ";
-//            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.isEmpty(info.getSyxh())){
-//                            continue;
-//                        }
-//                        String sqlstr = "select ZDMC as cyzdmc  from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
-//                        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())){
-//                                    if((listxq.size()-1) != j){
-//                                        cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+"，";
-//                                    }else {
-//                                        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();
-//            }
-//        }
+        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' ";
+            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.isEmpty(info.getSyxh())){
+                            continue;
+                        }
+                        String sqlstr = "select ZDMC as cyzdmc  from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
+                        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())){
+                                    if((listxq.size()-1) != j){
+                                        cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+"，";
+                                    }else {
+                                        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;
     }