From f4b4aa0a4b18d131caa165f120a7306dae7b151c Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 20 Jul 2020 21:52:53 +0800 Subject: [PATCH] update --- .../permission/dao/master/BabyDiagnoseMapper.java | 2 ++ .../permission/service/BabyDiagnoseService.java | 1 + .../permission/service/impl/BabyDiagnoseImpl.java | 4 ++++ .../mainOrm/master/BabyDiagnoseMapper.xml | 14 +++++++++++-- .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 24 ++++++++++++---------- .../operate/web/facade/BabyBookbuildingFacade.java | 17 ++++++++------- 6 files changed, 42 insertions(+), 20 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java index 3a20674..4508163 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java @@ -16,6 +16,8 @@ public interface BabyDiagnoseMapper { void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); + void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel); + List queryBabyDiagnosesList(BabyDiagnoseQuery query); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java index e09cad4..c918545 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java @@ -15,6 +15,7 @@ public interface BabyDiagnoseService { List queryBabyDiagnoses(Map param); void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); + void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel); List queryBabyDiagnosesList(BabyDiagnoseQuery query); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java index 7e3b552..53815ec 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java @@ -33,6 +33,10 @@ public class BabyDiagnoseImpl implements BabyDiagnoseService { public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) { babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel); } + @Override + public void updateBabyDiagnoseType(BabyDiagnoseModel diagnoseModel) { + babyDiagnoseMapper.updateBabyDiagnoseType(diagnoseModel); + } @Override public List queryBabyDiagnosesList(BabyDiagnoseQuery query) { diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml index 4f07044..a89d7ef 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml @@ -36,11 +36,11 @@ SELECT LAST_INSERT_ID() INSERT INTO lyms_baby_diagnose - (blh,syxh,hzxm,birth, + (type,blh,syxh,hzxm,birth, birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh, curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm, cyzdmc,ksdm,bqdm,mblh,msyxh,isbuild) - VALUES (#{blh},#{syxh},#{hzxm},#{birth}, + VALUES (#{type},#{blh},#{syxh},#{hzxm},#{birth}, #{birthtime},#{sex},#{sfzh},#{lxdh},#{lxdz},#{lxr},#{lxrdh}, #{curraddr},#{lrrq},#{ryrq},#{rqrq},#{cyrq},#{cqrq},#{cyzddm}, #{cyzdmc},#{ksdm},#{bqdm},#{mblh},#{msyxh},#{isbuild}) @@ -87,7 +87,17 @@ where blh = #{blh,jdbcType=VARCHAR} + + UPDATE + lyms_baby_diagnose + + + type = #{type,jdbcType=VARCHAR}, + + + where blh = #{blh,jdbcType=VARCHAR} + 1=1 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 c8d8cb8..6dde1ea 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 @@ -1024,14 +1024,14 @@ public class QhdfyHisService { if("1".equals(type)){ Connection conn = null; // String sql = "select blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null "; - String sql = "select type='1',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm <> '206' "; + String sql = "select type='1',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq," + + "rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm = '206' "; try { if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) { sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)"; } conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(); - list = queryRunner.query(conn, sql, new BeanListHandler(BabyDischargeDiagnosisModel.class)); } catch (Exception e) { ExceptionUtils.catchException(e, "queryNewBabyDiagnose error. sql:" + sql); @@ -1039,12 +1039,13 @@ public class QhdfyHisService { DbUtils.closeQuietly(conn); } // 2 获取诊断详情结果遍历填充到list详情字段 - getDetails(list, conn, sql); + getDetails(list, conn); }//产科住院数据 else if ("2".equals(type)){ Connection conn = null; - String sql = "select type='2',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq,rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm <> '206' "; + String sql = "select type='2',blh,syxh,hzxm,birth,birthtime,sex,sfzh,lxdh,lxdz,lxr,lxrdh,curraddr,lrrq,ryrq," + + "rqrq,cyrq,cqrq,cyzddm,cyzdmc,ksdm,bqdm,mblh,msyxh from VW_LYMS_XSE_BRSYK where cyrq is not null and ksdm ='2545' and bqdm <> '206' "; try { if (StringUtils.isNotEmpty(lrrqStart) && StringUtils.isNotEmpty(lrrqEnd)) { sql += " and lrrq >= CONVERT(varchar(100),'" + lrrqStart + "', 120) and lrrq <= CONVERT(varchar(100),'" + lrrqEnd + "', 120)"; @@ -1058,7 +1059,7 @@ public class QhdfyHisService { } finally { DbUtils.closeQuietly(conn); } - getDetails(list, conn, sql); + getDetails(list, conn); } @@ -1066,25 +1067,26 @@ public class QhdfyHisService { return list; } - private void getDetails(List list, Connection conn, String sql) { + private void getDetails(List list, Connection conn) { if(CollectionUtils.isNotEmpty(list)){ for (int i = 0; i listxq = queryRunner.query(conn, sql, new BeanListHandler(BabyDischargeDiagnosisModel.class)); + List listxq = queryRunner.query(conn, sqlstr, new BeanListHandler(BabyDischargeDiagnosisModel.class)); String cyzdxq = ""; for (int j = 0; j < listxq.size(); j++) { - BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(i); + BabyDischargeDiagnosisModel babyDischargeDiagnosisModel1 = listxq.get(j); if(babyDischargeDiagnosisModel1 !=null && StringUtils.isNotEmpty(babyDischargeDiagnosisModel1.getCyzdmc())){ cyzdxq = babyDischargeDiagnosisModel1.getCyzdmc()+" "; } } - babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断 + if(StringUtils.isNotEmpty(cyzdxq)){ + babyDischargeDiagnosisModel.setCyzdmc(cyzdxq);//将诊断详情覆盖以前的主要诊断 + } } catch (SQLException e) { e.printStackTrace(); }finally { 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 7ec0fb0..a85dbec 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 @@ -4436,14 +4436,12 @@ public class BabyBookbuildingFacade { * @Date: 2020/7/14 10:13 */ public int handleBabyDiagnoseQhd(String lrrqStart, String lrrqEnd, String type) { - List list = qhdfyHisService.queryNewBabyDiagnoseQhd(lrrqStart, lrrqEnd,type); if (CollectionUtils.isNotEmpty(list)) { Map param = new HashMap(); for (BabyDischargeDiagnosisModel model : list) { param.put("blh", model.getBlh()); - try { List dbList = babyDiagnoseService.queryBabyDiagnoses(param); if (CollectionUtils.isEmpty(dbList)) { @@ -4451,7 +4449,10 @@ public class BabyBookbuildingFacade { /* 注意：会有个问题，就是以前历史数据会不能区分是1 新生儿科或2 产科住院数据*/ babyDiagnoseModel.setType(type); babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel); - System.out.println("handleBabyDiagnose success " + model.getBlh()); + }else if (CollectionUtils.isNotEmpty(dbList)) { + BabyDiagnoseModel babyDiagnoseModel = dbList.get(0); + babyDiagnoseModel.setType(type); + babyDiagnoseService.updateBabyDiagnoseType(babyDiagnoseModel); } } catch (Exception e) { ExceptionUtils.catchException(e, "handleBabyDiagnose error."); @@ -4475,11 +4476,13 @@ public class BabyBookbuildingFacade { String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end); System.out.println("lrrqStart =" + lrrqStart); System.out.println("lrrqEnd =" + lrrqEnd); - int size = handleBabyDiagnose(lrrqStart, lrrqEnd); +// int size = handleBabyDiagnose(lrrqStart, lrrqEnd); //秦皇岛诊断数据定时同步到mysql数据库中 -// int size1 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"1"); -// int size2 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"2"); - System.out.println("autoGetBabyDiagnose size " + size); + int size1 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"1"); + System.out.println("autoGetBabyDiagnose size1 " + size1); + int size2 = handleBabyDiagnoseQhd(lrrqStart, lrrqEnd,"2"); + System.out.println("autoGetBabyDiagnose size2 " + size2); + } -- 1.8.3.1