Commit a67b0312ae57c77c23d70215fcdfcee233fa2cfe
1 parent
fad0b31f08
Exists in
master
and in
6 other branches
分娩
Showing 1 changed file with 8 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
View file @
a67b031
| ... | ... | @@ -925,11 +925,11 @@ |
| 925 | 925 | |
| 926 | 926 | SimpleDateFormat fmt2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 927 | 927 | SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |
| 928 | - MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult(); | |
| 928 | + SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHH:mm:ss"); | |
| 929 | 929 | |
| 930 | - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | |
| 931 | - Date startTime = DateUtil.addMonth(new Date(),8); | |
| 932 | - String start = fmt.format(startTime); | |
| 930 | +// SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | |
| 931 | +// Date startTime = DateUtil.addMonth(new Date(),-8); | |
| 932 | +// String start = fmt.format(startTime); | |
| 933 | 933 | |
| 934 | 934 | Connection conn = ConnTools.makeFmConnection(); |
| 935 | 935 | QueryRunner queryRunner = new QueryRunner(); |
| 936 | 936 | |
| ... | ... | @@ -979,12 +979,13 @@ |
| 979 | 979 | " SRKS as srks,\n" + |
| 980 | 980 | " JSZ as jsz"; |
| 981 | 981 | |
| 982 | - String sql1="select "+cloumns+" from JHMK_FMJL_LYMS where JSZ is not null and SC is not null and TZ is not null and CONVERT(DATETIME,left(JLRQ,8)+' '+RIGHT(JLRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and SYXH='"+patInfo.getSyxh()+"'"; | |
| 982 | + String sql1="select "+cloumns+" from JHMK_FMJL_LYMS where JSZ is not null and SC is not null and TZ is not null and SYXH='"+patInfo.getSyxh()+"'"; | |
| 983 | 983 | |
| 984 | 984 | List<FmItem> duoTaiList = queryRunner.query(conn,sql1 |
| 985 | 985 | , new BeanListHandler<FmItem>(FmItem.class)); |
| 986 | 986 | |
| 987 | 987 | if (CollectionUtils.isNotEmpty(duoTaiList)) { |
| 988 | + MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult(); | |
| 988 | 989 | Map<String,List<FmItem>> maps = new HashMap<>(); |
| 989 | 990 | for(FmItem item : duoTaiList) |
| 990 | 991 | { |
| ... | ... | @@ -1099,6 +1100,7 @@ |
| 1099 | 1100 | maternalDeliverResult.setBabies(babys); |
| 1100 | 1101 | } |
| 1101 | 1102 | } |
| 1103 | + return maternalDeliverResult; | |
| 1102 | 1104 | } |
| 1103 | 1105 | } |
| 1104 | 1106 | }catch (Exception e){ |
| ... | ... | @@ -1109,7 +1111,7 @@ |
| 1109 | 1111 | |
| 1110 | 1112 | } |
| 1111 | 1113 | |
| 1112 | - return maternalDeliverResult; | |
| 1114 | + return null; | |
| 1113 | 1115 | } |
| 1114 | 1116 | |
| 1115 | 1117 |