diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/BabyDischargeDiagnosisModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/BabyDischargeDiagnosisModel.java index d8cceb5a..234de39 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/BabyDischargeDiagnosisModel.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/BabyDischargeDiagnosisModel.java @@ -7,7 +7,7 @@ public class BabyDischargeDiagnosisModel { private String blh; //出院日期 - private Date cyrq; + private String cyrq; //姓名 private String hzxm; @@ -29,14 +29,22 @@ public class BabyDischargeDiagnosisModel { this.blh = blh; } - public Date getCyrq() { + public String getCyrq() { return cyrq; } - public void setCyrq(Date cyrq) { + public void setCyrq(String cyrq) { this.cyrq = cyrq; } + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } + public String getHzxm() { return hzxm; } @@ -53,13 +61,6 @@ public class BabyDischargeDiagnosisModel { this.sex = sex; } - public String getBirth() { - return birth; - } - - public void setBirth(String birth) { - this.birth = birth; - } public String getCyzdmc() { return cyzdmc; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 0eb0f6c..c7e60c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -6,9 +6,12 @@ import com.lyms.platform.biz.dal.AssayConfigDao; import com.lyms.platform.biz.param.AssayConfigQuery; import com.lyms.platform.biz.param.ReferConfigQuery; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.base.PageInfo; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; @@ -861,13 +864,15 @@ public class QhdfyHisService { return map; } - public List> getBabyDiacrisis(String startDischargeDate, String endDischargeDate, - String startBirthDate, String endBirthDate, - String hospitalizationNo, String babyName, - String finalDiagnosis, Integer page, Integer limit) { + public BaseListResponse getBabyDiacrisis(String startDischargeDate, String endDischargeDate, + String startBirthDate, String endBirthDate, + String hospitalizationNo, String babyName, + String finalDiagnosis, Integer page, Integer limit) { List> result = new ArrayList<>(); - String startDate = startDischargeDate + " 00:00:00"; - String endDate = endDischargeDate + " 00:00:00"; + String startDate = startDischargeDate + "00:00:00"; + String endDate = endDischargeDate + "00:00:00"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + PageInfo pageInfo = new PageInfo(); int startPage = 1; int endlimit = 10; if (null != page && null != limit) { @@ -914,52 +919,62 @@ public class QhdfyHisService { } sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql; } - System.out.println("select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY lrrq DESC ) " + + String sqls = "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY lrrq DESC ) " + "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null " + sql + ") " + - "AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc"); - - - /*Map map = new HashMap<>(); - map.put("dischargeDate", "20190524"); - map.put("babyName", "陈晨"); - map.put("sex", "女"); - map.put("birth", "20190404"); - map.put("monthAge", "2月2天"); - map.put("hospitalizationNo", "123456"); - map.put("dischargeDiagnosis", "新生儿肺炎"); - result.add(map);*/ - -// List list = queryRunner.query(conn, "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY lrrq DESC ) " + -// "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null " + sql + ") " + -// "AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc", new BeanListHandler(BabyDischargeDiagnosisModel.class)); -// if (list.size() > 0) { -// for (BabyDischargeDiagnosisModel info : list) { -// Map map = new HashMap<>(); -// map.put("dischargeDate", DateUtil.getyyyy_MM_dd(info.getCyrq())); -// map.put("babyName", info.getHzxm()); -// map.put("sex", info.getSex()); -// map.put("birth", info.getBirth()); -// map.put("monthAge", ""); -// map.put("hospitalizationNo", info.getBlh()); -// map.put("dischargeDiagnosis", info.getCyzdmc()); -// result.add(map); -// } -// } -// long end1 = System.currentTimeMillis(); -// System.out.println("times4 = " + (end1 - end)); -// DbUtils.closeQuietly(conn); - } catch ( - Exception e) { + "AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc"; + + String count = "select top 99999999 ROW_NUMBER() OVER(ORDER BY lrrq DESC ) " + + "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null" + sql + " "; + List counts = queryRunner.query(conn, count, new BeanListHandler(BabyDischargeDiagnosisModel.class)); + pageInfo.setCount(counts.size()); + List list = queryRunner.query(conn, sqls, new BeanListHandler(BabyDischargeDiagnosisModel.class)); + if (list.size() > 0) { + for (BabyDischargeDiagnosisModel info : list) { + Map map = new HashMap<>(); + try { + if (StringUtils.isNotEmpty(info.getCyrq())) { + Date date = sdf.parse(info.getCyrq()); + map.put("dischargeDate", DateUtil.getyyyy_MM_dd(date)); + } + } catch (Exception e) { + map.put("dischargeDate", ""); + } + try { + if (StringUtils.isNotEmpty(info.getBirth())) { + Date date = sdf.parse(info.getBirth()); + map.put("birth", DateUtil.getyyyy_MM_dd(date)); + map.put("monthAge", DateUtil.getBabyMonthAge(date, new Date())); + } + } catch (Exception e) { + map.put("birth", ""); + } + map.put("babyName", info.getHzxm()); + map.put("sex", info.getSex()); + map.put("hospitalizationNo", info.getBlh()); + map.put("dischargeDiagnosis", info.getCyzdmc()); + result.add(map); + } + } + long end1 = System.currentTimeMillis(); + System.out.println("times4 = " + (end1 - end)); + DbUtils.closeQuietly(conn); + } catch (SQLException e) { DbUtils.closeQuietly(conn); ExceptionUtils.catchException(e, "qhd his exception "); e.printStackTrace(); } - return result; - } - public static void main(String[] args) { + BaseListResponse objectResponse = new BaseListResponse(); + pageInfo.setPage(page); + pageInfo.setLimit(limit); + objectResponse.setPageInfo(pageInfo); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b96c4b2..6da4a3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -4037,13 +4037,7 @@ public class BabyBookbuildingFacade { String hospitalizationNo, String babyName, String finalDiagnosis, Integer page, Integer limit) { - List list = qhdfyHisService.getBabyDiacrisis(startDischargeDate, endDischargeDate, startBirthDate, endBirthDate, hospitalizationNo, babyName, finalDiagnosis, page, limit); - BaseListResponse objectResponse = new BaseListResponse(); - //objectResponse.setPageInfo(); - objectResponse.setData(list); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setErrormsg("成功"); - return objectResponse; + return qhdfyHisService.getBabyDiacrisis(startDischargeDate, endDischargeDate, startBirthDate, endBirthDate, hospitalizationNo, babyName, finalDiagnosis, page, limit); }