diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 054c489..fe3940a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -59,6 +59,26 @@ public class AreaCountFacade { @Autowired private BasicConfigService basicConfigService; + private static Map node_map; + //0:0~12 孕周 1: 16~20 孕周 2: 21~24 孕周 3:28~36 孕周 4:37~ 分娩 + //--0~12 孕周,16~20 孕周,21~24 孕周,28~36 孕周,37~ 分娩 + static { + node_map.put(0,"0~12 孕周"); + node_map.put(1,"16~20 孕周"); + node_map.put(2,"21~24 孕周"); + node_map.put(3,"28~36 孕周"); + node_map.put(4,"37~ 分娩"); + } + + private static String getNodeName(Integer nodeName) + { + if (nodeName == null) + { + return ""; + } + return node_map.get(nodeName); + } + public BaseResponse getTicketUsedCount(String time, String hospitalId, String provinceId,String cityId, String areaId, Integer userId) { @@ -1433,9 +1453,9 @@ public class AreaCountFacade { sql+=" AND CC.NODE_ID=2 "; countSql+=" AND CC.NODE_ID=2 "; } - if (nodeName != null){ - sql+=" AND CC.NODE_NAME= " + nodeName; - countSql+=" AND CC.NODE_NAME= " + nodeName; + if (StringUtils.isNotEmpty(getNodeName(nodeName))){ + sql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; + countSql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; } //" AND CC.NODE_NAME=''\n" + if (StringUtils.isNotEmpty(time)) @@ -1512,8 +1532,8 @@ public class AreaCountFacade { if (pointType != null && pointType == 1){ sql+=" AND CC.NODE_ID=2 "; } - if (nodeName != null && nodeName == 1){ - sql+=" AND CC.NODE_NAME= "+nodeName; + if (StringUtils.isNotEmpty(getNodeName(nodeName))){ + sql+=" AND CC.NODE_NAME= '" + StringUtils.isNotEmpty(getNodeName(nodeName))+"'"; } //" AND CC.NODE_NAME=''\n" + if (StringUtils.isNotEmpty(time))