Commit ad3ee88903a49a2bc7cc9ff213bfe639433fa750
1 parent
8db08e2960
Exists in
master
and in
6 other branches
初诊和复诊查看页面下次检查孕周
Showing 2 changed files with 18 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
ad3ee88
| ... | ... | @@ -1018,7 +1018,7 @@ |
| 1018 | 1018 | "FROM ODS_D_HOSPITAL A\n" + |
| 1019 | 1019 | "LEFT JOIN ODS_F_EXAMINE_HISTORY B ON A.HOSPITAL_NO=B.HOSPITAL_NO "; |
| 1020 | 1020 | if (pointType != null && pointType == 1){ |
| 1021 | - countSql+=" AND CC.NODE_ID=2 "; | |
| 1021 | + countSql+=" AND B.NODE_ID=2 "; | |
| 1022 | 1022 | } |
| 1023 | 1023 | countSql+= "WHERE 1=1" ; |
| 1024 | 1024 | if (StringUtils.isNotEmpty(time)) |
| ... | ... | @@ -1262,6 +1262,7 @@ |
| 1262 | 1262 | List<Map<String, Object>> checkPointtList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql); |
| 1263 | 1263 | Map<String,Object> data = new HashMap<>(); |
| 1264 | 1264 | data.put("list",checkPointtList); |
| 1265 | + data.put("chartData",chartData); | |
| 1265 | 1266 | data.put("num12",num12); |
| 1266 | 1267 | data.put("num20",num20); |
| 1267 | 1268 | data.put("num24",num24); |
| ... | ... | @@ -1285,6 +1286,7 @@ |
| 1285 | 1286 | " C.NAME,\n" + |
| 1286 | 1287 | " C.CREATE_WEEKS,\n" + |
| 1287 | 1288 | " C.CREATE_WEEKS_DAY,\n" + |
| 1289 | + " DECODE( C.CREATE_WEEKS_DAY,0,'孕'||C.CREATE_WEEKS||'周','孕'||C.CREATE_WEEKS||'周+'||C.CREATE_WEEKS_DAY||'天') AS YZ_NAME, "+ | |
| 1288 | 1290 | " C.HOSPITAL_NAME,\n" + |
| 1289 | 1291 | " C.DOCTOR_NAME,\n" + |
| 1290 | 1292 | " C.HOME_ADDR,\n" + |
| 1291 | 1293 | |
| 1292 | 1294 | |
| 1293 | 1295 | |
| 1294 | 1296 | |
| ... | ... | @@ -1302,33 +1304,33 @@ |
| 1302 | 1304 | } |
| 1303 | 1305 | if (StringUtils.isNotEmpty(provinceId)) |
| 1304 | 1306 | { |
| 1305 | - sql += " AND A.PROVINCE_ID= '"+provinceId+"'"; | |
| 1306 | - countSql += " AND A.PROVINCE_ID= '"+provinceId+"'"; | |
| 1307 | + sql += " AND C.PROVINCE_ID= '"+provinceId+"'"; | |
| 1308 | + countSql += " AND C.PROVINCE_ID= '"+provinceId+"'"; | |
| 1307 | 1309 | } |
| 1308 | 1310 | |
| 1309 | 1311 | if (StringUtils.isNotEmpty(cityId)) |
| 1310 | 1312 | { |
| 1311 | - sql+= " AND A.CITY_ID= '" +cityId+"'"; | |
| 1312 | - countSql+= " AND A.CITY_ID= '" +cityId+"'"; | |
| 1313 | + sql+= " AND C.CITY_ID= '" +cityId+"'"; | |
| 1314 | + countSql+= " AND C.CITY_ID= '" +cityId+"'"; | |
| 1313 | 1315 | } |
| 1314 | 1316 | |
| 1315 | 1317 | if (StringUtils.isNotEmpty(areaId)) |
| 1316 | 1318 | { |
| 1317 | - sql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; | |
| 1318 | - countSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; | |
| 1319 | + sql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'"; | |
| 1320 | + countSql+= " AND C.AREA_COUNTY_ID= '" +areaId+"'"; | |
| 1319 | 1321 | } |
| 1320 | 1322 | if (StringUtils.isNotEmpty(hospitalId)) |
| 1321 | 1323 | { |
| 1322 | - sql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
| 1323 | - countSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
| 1324 | + sql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
| 1325 | + countSql+=" AND C.YCY_STSTEM_ID= '" +hospitalId+"'"; | |
| 1324 | 1326 | } |
| 1325 | 1327 | else |
| 1326 | 1328 | { |
| 1327 | 1329 | String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); |
| 1328 | 1330 | if (StringUtils.isNotEmpty(hospitals)) |
| 1329 | 1331 | { |
| 1330 | - sql+=" AND A.YCY_STSTEM_ID IN " +hospitals; | |
| 1331 | - countSql+=" AND A.YCY_STSTEM_ID IN " +hospitals; | |
| 1332 | + sql+=" AND C.YCY_STSTEM_ID IN " +hospitals; | |
| 1333 | + countSql+=" AND C.YCY_STSTEM_ID IN " +hospitals; | |
| 1332 | 1334 | } |
| 1333 | 1335 | |
| 1334 | 1336 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
ad3ee88
| ... | ... | @@ -306,6 +306,8 @@ |
| 306 | 306 | //产检劵 |
| 307 | 307 | map.put("barCode", data.getBarCode()); |
| 308 | 308 | map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); |
| 309 | + //下次检查孕周 | |
| 310 | + map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime())); | |
| 309 | 311 | /* 初诊信息 */ |
| 310 | 312 | //既往史 |
| 311 | 313 | String pastHistory = ""; |
| ... | ... | @@ -658,6 +660,9 @@ |
| 658 | 660 | } |
| 659 | 661 | map.put("hospital", hospital); |
| 660 | 662 | map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); |
| 663 | + //下次检查孕周 | |
| 664 | + map.put("nextCheckWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getNextCheckTime())); | |
| 665 | + /* 初诊信息 */ | |
| 661 | 666 | map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients)); |
| 662 | 667 | // map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek()))); |
| 663 | 668 |