Commit 6054e06ca472e5b7b00bf693300dd2f402e699ed
1 parent
9c30a23599
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 25 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
6054e06
| ... | ... | @@ -59,6 +59,26 @@ |
| 59 | 59 | @Autowired |
| 60 | 60 | private BasicConfigService basicConfigService; |
| 61 | 61 | |
| 62 | + private static Map<Integer,String> node_map; | |
| 63 | + //0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩 | |
| 64 | + //--0～12 孕周,16～20 孕周,21～24 孕周,28～36 孕周,37～ 分娩 | |
| 65 | + static { | |
| 66 | + node_map.put(0,"0～12 孕周"); | |
| 67 | + node_map.put(1,"16～20 孕周"); | |
| 68 | + node_map.put(2,"21～24 孕周"); | |
| 69 | + node_map.put(3,"28～36 孕周"); | |
| 70 | + node_map.put(4,"37～ 分娩"); | |
| 71 | + } | |
| 72 | + | |
| 73 | + private static String getNodeName(Integer nodeName) | |
| 74 | + { | |
| 75 | + if (nodeName == null) | |
| 76 | + { | |
| 77 | + return ""; | |
| 78 | + } | |
| 79 | + return node_map.get(nodeName); | |
| 80 | + } | |
| 81 | + | |
| 62 | 82 | public BaseResponse getTicketUsedCount(String time, String hospitalId, |
| 63 | 83 | String provinceId,String cityId, |
| 64 | 84 | String areaId, Integer userId) { |
| ... | ... | @@ -1433,9 +1453,9 @@ |
| 1433 | 1453 | sql+=" AND CC.NODE_ID=2 "; |
| 1434 | 1454 | countSql+=" AND CC.NODE_ID=2 "; |
| 1435 | 1455 | } |
| 1436 | - if (nodeName != null){ | |
| 1437 | - sql+=" AND CC.NODE_NAME= " + nodeName; | |
| 1438 | - countSql+=" AND CC.NODE_NAME= " + nodeName; | |
| 1456 | + if (StringUtils.isNotEmpty(getNodeName(nodeName))){ | |
| 1457 | + sql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; | |
| 1458 | + countSql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; | |
| 1439 | 1459 | } |
| 1440 | 1460 | //" AND CC.NODE_NAME=''\n" + |
| 1441 | 1461 | if (StringUtils.isNotEmpty(time)) |
| ... | ... | @@ -1512,8 +1532,8 @@ |
| 1512 | 1532 | if (pointType != null && pointType == 1){ |
| 1513 | 1533 | sql+=" AND CC.NODE_ID=2 "; |
| 1514 | 1534 | } |
| 1515 | - if (nodeName != null && nodeName == 1){ | |
| 1516 | - sql+=" AND CC.NODE_NAME= "+nodeName; | |
| 1535 | + if (StringUtils.isNotEmpty(getNodeName(nodeName))){ | |
| 1536 | + sql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; | |
| 1517 | 1537 | } |
| 1518 | 1538 | //" AND CC.NODE_NAME=''\n" + |
| 1519 | 1539 | if (StringUtils.isNotEmpty(time)) |