From 579390c0173c98801ff17e8e53a2ac35350879a3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 9 Oct 2016 16:33:15 +0800 Subject: [PATCH] code update --- .../lyms/platform/common/enums/WyTypeEnums.java | 11 +++++- .../web/controller/BookbuildingController.java | 4 +-- .../operate/web/facade/BookbuildingFacade.java | 39 ++++++++++++++++++---- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java index 00d10bd..2df0277 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java @@ -14,7 +14,7 @@ import java.util.Map; */ public enum WyTypeEnums { - MR(0,"纯母乳喂养"),HH(1,"混合喂养"),RG(2,"人工喂养"); + MR(0,"母乳喂养"),HH(1,"混合喂养"),RG(2,"人工喂养"); private WyTypeEnums(int id, String name) { this.id = id; @@ -30,6 +30,15 @@ public enum WyTypeEnums { return ""; } + public static String getIdByName(String name){ + for(WyTypeEnums s : values()){ + if(s.name.equals(name)){ + return String.valueOf(s.getId()); + } + } + return ""; + } + public static List> getWyTypeEnums() { List> list = new ArrayList<>(); for (WyTypeEnums e : WyTypeEnums.values()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 9fbeea5..8d90674 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -166,7 +166,7 @@ public class BookbuildingController extends BaseController{ @RequestMapping(value = "/queryChanJianReport", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryChanJianReport(HttpServletRequest request, + public BaseListResponse queryChanJianReport(HttpServletRequest request, @RequestParam(required = false) String exDateStart, @RequestParam(required = false) String exDateEnd, @RequestParam(required = false) String name, @@ -184,7 +184,7 @@ public class BookbuildingController extends BaseController{ @RequestParam(required = false) Integer limit ){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(), + BaseListResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(), exDateStart, exDateEnd, name, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 75ad9a1..3d829ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -4,6 +4,7 @@ import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; import com.lyms.platform.biz.dal.IPersonDao; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; @@ -1049,7 +1050,7 @@ public class BookbuildingFacade { return objectResponse; } - public BaseObjectResponse queryChanJianReport(Integer userId, String exDateStart, + public BaseListResponse queryChanJianReport(Integer userId, String exDateStart, String exDateEnd, String name, Integer weekStarts, @@ -1074,6 +1075,12 @@ public class BookbuildingFacade { start = (page -1) * limit+1; end = page*limit; } + String countSql =" SELECT count(*) as allCount "+ + "FROM ODS_F_AUXILIARY_EXAMI A\n" + + "INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" + + "INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" + + "WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'"; + String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT A.EXAMINE_DATE,\n" + " A.NAME,\n" + @@ -1114,72 +1121,92 @@ public class BookbuildingFacade { if (StringUtils.isNotEmpty(exDateStart)) { sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; + countSql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')"; } if (StringUtils.isNotEmpty(exDateEnd)) { sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; + countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')"; } if (StringUtils.isNotEmpty(name)) { sql += " AND A.NAME LIKE '%"+name+"%'"; + countSql += " AND A.NAME LIKE '%"+name+"%'"; } if (weekStarts != null) { sql += " AND A.NOW_WEEKS>= "+weekStarts; + countSql += " AND A.NOW_WEEKS>= "+weekStarts; } if (weekEnds != null) { sql += " AND A.NOW_WEEKS>= "+weekEnds; + countSql += " AND A.NOW_WEEKS>= "+weekEnds; } if (StringUtils.isNotEmpty(hbsag)) { sql += " AND A.HBSAG = "+hbsag; + countSql += " AND A.HBSAG = "+hbsag; } if (StringUtils.isNotEmpty(hbeag)) { sql += " AND A.HBEAG = "+hbeag; + countSql += " AND A.HBEAG = "+hbeag; } if (StringUtils.isNotEmpty(hbeab)) { sql += " AND A.HBEAB = "+hbeab; + countSql += " AND A.HBEAB = "+hbeab; } if (StringUtils.isNotEmpty(hbcab)) { sql += " AND A.HBCAB = "+hbcab; + countSql += " AND A.HBCAB = "+hbcab; } if (StringUtils.isNotEmpty(syphilis)) { sql += " AND A.SYPHILIS = "+syphilis; + countSql += " AND A.SYPHILIS = "+syphilis; } if (StringUtils.isNotEmpty(hiv)) { sql += " AND A.HIV = "+hiv; + countSql += " AND A.HIV = "+hiv; } if (StringUtils.isNotEmpty(hcv)) { sql += " AND A.HCV = "+hcv; + countSql += " AND A.HCV = "+hcv; } if (StringUtils.isNotEmpty(doctorNo)) { sql += " AND A.DOCTOR_NO = "+doctorNo; + countSql += " AND A.DOCTOR_NO = "+doctorNo; } sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >= "+start; + List> list = JdbcUtil.getListDataBySql(sql); - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(list); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setErrormsg("成功"); - return objectResponse; + Integer count = (Integer)JdbcUtil.getOralceSingleObjBySql(countSql); + BaseListResponse listResponse= new BaseListResponse(); + listResponse.setData(list); + + PageInfo pageInfo = new PageInfo(page, 0,count,limit); + + listResponse.setPageInfo(pageInfo); + + listResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + listResponse.setErrormsg("成功"); + return listResponse; } } \ No newline at end of file -- 1.8.3.1