From 486e1f5dc66a68a63affbefbc03fc560ffeeeb1b Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Thu, 13 Jun 2019 16:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=87=BA=E9=99=A2=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 116 +++++++++++---------- .../web/controller/BabyBuildController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- 3 files changed, 63 insertions(+), 57 deletions(-) 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 769fe23..0eb0f6c 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 @@ -864,7 +864,7 @@ public class QhdfyHisService { public List> getBabyDiacrisis(String startDischargeDate, String endDischargeDate, String startBirthDate, String endBirthDate, String hospitalizationNo, String babyName, - Integer finalDiagnosis, Integer page, Integer limit) { + String finalDiagnosis, Integer page, Integer limit) { List> result = new ArrayList<>(); String startDate = startDischargeDate + " 00:00:00"; String endDate = endDischargeDate + " 00:00:00"; @@ -882,43 +882,44 @@ public class QhdfyHisService { long start = System.currentTimeMillis(); - /* Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); +// Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeClConnection(); QueryRunner queryRunner = new QueryRunner(); - */ + long end = System.currentTimeMillis(); System.out.println("times3 = " + (end - start)); - //try { - String sql = ""; - String hospitalizationNoSql = ""; - String babyNameSql = ""; - String finalDiagnosisSql = ""; - String dischargeDateSql = ""; - String birthDateSql = ""; - if (StringUtils.isNotEmpty(hospitalizationNo) || StringUtils.isNotEmpty(startDischargeDate) || StringUtils.isNotEmpty(endDischargeDate) - || StringUtils.isNotEmpty(babyName) || null != finalDiagnosis || StringUtils.isNotEmpty(startBirthDate) || StringUtils.isNotEmpty(endBirthDate)) { - if (StringUtils.isNotEmpty(hospitalizationNo)) { - hospitalizationNoSql = " and blh= " + "'" + hospitalizationNo + "'"; - } - if (StringUtils.isNotEmpty(babyName)) { - babyNameSql = " and hzxm= " + "'" + babyName + "'"; - } - if (null != finalDiagnosis) { - finalDiagnosisSql = " and cyzddm like " + "'" + finalDiagnosis + "%" + "'"; - } - if (StringUtils.isNotEmpty(startBirthDate) && StringUtils.isNotEmpty(endBirthDate)) { - birthDateSql = " and birth >= CONVERT(varchar(100),'" + startBirthDate + "', 112) and birth <= CONVERT(varchar(100),'" + endBirthDate + "', 112)"; - } - if (StringUtils.isNotEmpty(startDischargeDate) && StringUtils.isNotEmpty(endDischargeDate)) { - dischargeDateSql = " and cyrq >= CONVERT(varchar(100),'" + startDate + "', 120) and cyrq <= CONVERT(varchar(100),'" + endDate + "', 120)"; + try { + String sql = ""; + String hospitalizationNoSql = ""; + String babyNameSql = ""; + String finalDiagnosisSql = ""; + String dischargeDateSql = ""; + String birthDateSql = ""; + if (StringUtils.isNotEmpty(hospitalizationNo) || StringUtils.isNotEmpty(startDischargeDate) || StringUtils.isNotEmpty(endDischargeDate) + || StringUtils.isNotEmpty(babyName) || null != finalDiagnosis || StringUtils.isNotEmpty(startBirthDate) || StringUtils.isNotEmpty(endBirthDate)) { + if (StringUtils.isNotEmpty(hospitalizationNo)) { + hospitalizationNoSql = " and blh= " + "'" + hospitalizationNo + "'"; + } + if (StringUtils.isNotEmpty(babyName)) { + babyNameSql = " and hzxm= " + "'" + babyName + "'"; + } + if (null != finalDiagnosis) { + finalDiagnosisSql = " and cyzddm like " + "'" + finalDiagnosis + "%" + "'"; + } + if (StringUtils.isNotEmpty(startBirthDate) && StringUtils.isNotEmpty(endBirthDate)) { + birthDateSql = " and birth >= CONVERT(varchar(100),'" + startBirthDate + "', 112) and birth <= CONVERT(varchar(100),'" + endBirthDate + "', 112)"; + } + if (StringUtils.isNotEmpty(startDischargeDate) && StringUtils.isNotEmpty(endDischargeDate)) { + dischargeDateSql = " and cyrq >= CONVERT(varchar(100),'" + startDate + "', 120) and cyrq <= CONVERT(varchar(100),'" + endDate + "', 120)"; + } + sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql; } - sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql; - } - System.out.println("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"); + System.out.println("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 map = new HashMap<>(); map.put("dischargeDate", "20190524"); map.put("babyName", "陈晨"); map.put("sex", "女"); @@ -926,34 +927,39 @@ public class QhdfyHisService { 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 (SQLException e) { + 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) { DbUtils.closeQuietly(conn); ExceptionUtils.catchException(e, "qhd his exception "); e.printStackTrace(); - }*/ + } return result; } + public static void main(String[] args) { + + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index b2f048b..c7c9ea0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -559,7 +559,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "endBirthDate", required = false) String endBirthDate, @RequestParam(value = "hospitalizationNo", required = false) String hospitalizationNo, @RequestParam(value = "babyName", required = false) String babyName, - @RequestParam(value = "finalDiagnosis", required = false) Integer finalDiagnosis, + @RequestParam(value = "finalDiagnosis", required = false) String finalDiagnosis, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit) { 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 de82d51..b96c4b2 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 @@ -4035,7 +4035,7 @@ public class BabyBookbuildingFacade { public BaseListResponse getBabyDiacrisis(String startDischargeDate, String endDischargeDate, String startBirthDate, String endBirthDate, String hospitalizationNo, String babyName, - Integer finalDiagnosis, Integer page, Integer limit) { + String finalDiagnosis, Integer page, Integer limit) { List list = qhdfyHisService.getBabyDiacrisis(startDischargeDate, endDischargeDate, startBirthDate, endBirthDate, hospitalizationNo, babyName, finalDiagnosis, page, limit); BaseListResponse objectResponse = new BaseListResponse(); -- 1.8.3.1