Commit 905199a83c2c96e86f61f04d089a8db7dc71d313

Authored by changpengfei

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/QhdDischargedDiagnose.java View file @ 905199a
... ... @@ -79,6 +79,9 @@
79 79 if (StringUtils.isNotEmpty(diagnoseName)) {
80 80 condition = condition.and("diagnoseName", diagnoseName, MongoOper.IS);
81 81 }
  82 + if (null!=yn) {
  83 + condition = condition.and("yn", yn, MongoOper.IS);
  84 + }
82 85  
83 86  
84 87 Criteria c = null;
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java View file @ 905199a
... ... @@ -38,8 +38,8 @@
38 38  
39 39 private static String fmDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
40 40 private static String fmUrl = "jdbc:sqlserver://168.254.0.99\\hissvr; DatabaseName=JHMK2HIS";
41   - private static String fmUser = "LYMS";
42   - private static String fmPassword = "LYMS";
  41 + private static String fmUser = "sa";
  42 + private static String fmPassword = "qhdfy@123";
43 43  
44 44  
45 45 private static String clDirverClassName = "oracle.jdbc.driver.OracleDriver";
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 905199a
... ... @@ -993,54 +993,54 @@
993 993 public Map<String, Object> queryHisBabyDiagnosis2(String blNo) {
994 994  
995 995 Map<String, Object> map = new HashMap<>();
996   -// StringBuffer sb = new StringBuffer();
997   -// if (StringUtils.isNotBlank(blNo)) {
998   -// Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
999   -// QueryRunner queryRunner = new QueryRunner();
1000   -// String sql = "select syxh from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "' and cyrq is not null and ksdm ='2545' and bqdm = '206' ";
1001   -// try {
1002   -// List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn,sql , new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
1003   -// if (CollectionUtils.isNotEmpty(list)) {
1004   -// for (BabyDischargeDiagnosisModel info : list) {
1005   -// if(info == null && StringUtils.isEmpty(info.getSyxh())){
1006   -// continue;
1007   -// }
1008   -// String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
1009   -// Connection conn2 = null;
1010   -// try {
1011   -// conn2 = ConnTools.qhdzdConnection();
1012   -// QueryRunner queryRunner2 = new QueryRunner();
1013   -// List<BabyDischargeDiagnosisModel> listxq = queryRunner2.query(conn2, sqlstr, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
1014   -// String cyzdxq = "";
1015   -// for (int j = 0; j < listxq.size(); j++) {
1016   -// BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j);
1017   -// if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){
1018   -// if((listxq.size()-1) != j){
1019   -// cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+",";
1020   -// }else {
1021   -// cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" ";
1022   -// }
1023   -// }
1024   -// }
1025   -// if(StringUtils.isNotEmpty(cyzdxq)){
1026   -// map.put("diagnosisItem", cyzdxq);
1027   -// }
1028   -// } catch (SQLException e) {
1029   -// e.printStackTrace();
1030   -// }finally {
1031   -// DbUtils.closeQuietly(conn2);
1032   -// }
1033   -//
1034   -// }
1035   -//
1036   -//
1037   -// }
1038   -// DbUtils.closeQuietly(conn);
1039   -// } catch (SQLException e) {
1040   -// DbUtils.closeQuietly(conn);
1041   -// e.printStackTrace();
1042   -// }
1043   -// }
  996 + StringBuffer sb = new StringBuffer();
  997 + if (StringUtils.isNotBlank(blNo)) {
  998 + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
  999 + QueryRunner queryRunner = new QueryRunner();
  1000 + String sql = "select syxh from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "' and cyrq is not null and ksdm ='2545' and bqdm = '206' ";
  1001 + try {
  1002 + List<BabyDischargeDiagnosisModel> list = queryRunner.query(conn,sql , new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
  1003 + if (CollectionUtils.isNotEmpty(list)) {
  1004 + for (BabyDischargeDiagnosisModel info : list) {
  1005 + if(info == null && StringUtils.isEmpty(info.getSyxh())){
  1006 + continue;
  1007 + }
  1008 + String sqlstr = "select ZDMC as cyzdmc from jhemr.V_DIAGNOSIS_LYMS where syxh='"+info.getSyxh()+"' ORDER BY ZDRQ desc ";
  1009 + Connection conn2 = null;
  1010 + try {
  1011 + conn2 = ConnTools.qhdzdConnection();
  1012 + QueryRunner queryRunner2 = new QueryRunner();
  1013 + List<BabyDischargeDiagnosisModel> listxq = queryRunner2.query(conn2, sqlstr, new BeanListHandler<BabyDischargeDiagnosisModel>(BabyDischargeDiagnosisModel.class));
  1014 + String cyzdxq = "";
  1015 + for (int j = 0; j < listxq.size(); j++) {
  1016 + BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j);
  1017 + if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){
  1018 + if((listxq.size()-1) != j){
  1019 + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+",";
  1020 + }else {
  1021 + cyzdxq += babyDischargeDiagnosisModel1.getCyzdmc()+" ";
  1022 + }
  1023 + }
  1024 + }
  1025 + if(StringUtils.isNotEmpty(cyzdxq)){
  1026 + map.put("diagnosisItem", cyzdxq);
  1027 + }
  1028 + } catch (SQLException e) {
  1029 + e.printStackTrace();
  1030 + }finally {
  1031 + DbUtils.closeQuietly(conn2);
  1032 + }
  1033 +
  1034 + }
  1035 +
  1036 +
  1037 + }
  1038 + DbUtils.closeQuietly(conn);
  1039 + } catch (SQLException e) {
  1040 + DbUtils.closeQuietly(conn);
  1041 + e.printStackTrace();
  1042 + }
  1043 + }
1044 1044 return map;
1045 1045 }
1046 1046