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 new file mode 100644 index 0000000..54b1317 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyDiagnoseMapper.java @@ -0,0 +1,17 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.pojo.BabyDiagnoseModel; + +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2019-06-24. + */ +public interface BabyDiagnoseMapper { + void addBabyDiagnose(BabyDiagnoseModel diagnoseModel); + + List queryBabyDiagnoses(Map param); + + void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); +} 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 new file mode 100644 index 0000000..3108ee3 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyDiagnoseService.java @@ -0,0 +1,17 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.pojo.BabyDiagnoseModel; + +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2018-08-06. + */ +public interface BabyDiagnoseService { + void addBabyDiagnose(BabyDiagnoseModel diagnoseModel); + + List queryBabyDiagnoses(Map param); + + void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel); +} 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 new file mode 100644 index 0000000..7d71cbc --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyDiagnoseImpl.java @@ -0,0 +1,35 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.BabyDiagnoseMapper; +import com.lyms.platform.permission.service.BabyDiagnoseService; +import com.lyms.platform.pojo.BabyDiagnoseModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2018-08-06. + */ +@Service +public class BabyDiagnoseImpl implements BabyDiagnoseService { + + @Autowired + private BabyDiagnoseMapper babyDiagnoseMapper; + + @Override + public void addBabyDiagnose(BabyDiagnoseModel diagnoseModel) { + babyDiagnoseMapper.addBabyDiagnose(diagnoseModel); + } + + @Override + public List queryBabyDiagnoses(Map param) { + return babyDiagnoseMapper.queryBabyDiagnoses(param); + } + + @Override + public void updateBabyDiagnose(BabyDiagnoseModel diagnoseModel) { + babyDiagnoseMapper.updateBabyDiagnose(diagnoseModel); + } +} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml new file mode 100644 index 0000000..f280871 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml @@ -0,0 +1,53 @@ + + + + + + SELECT LAST_INSERT_ID() + INSERT INTO lyms_baby_diagnose + (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}, + #{birthtime},#{sex},#{sfzh},#{lxdh},#{lxdz},#{lxr},#{lxrdh}, + #{curraddr},#{lrrq},#{ryrq},#{rqrq},#{cyrq},#{cqrq},#{cyzddm}, + #{cyzdmc},#{ksdm},#{bqdm},#{mblh},#{msyxh},#{isbuild}) + + + + + + + + UPDATE + lyms_baby_diagnose + + + isbuild = #{isbuild,jdbcType=INTEGER}, + + + where blh = #{blh,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 26bf1a3..b73c306 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -25,6 +25,8 @@ public class DateUtil { public static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm"}; + public static SimpleDateFormat yyyyMMddHHmmss = new SimpleDateFormat("yyyyMMddHH:mm:ss"); + public static SimpleDateFormat yyyy_mm = new SimpleDateFormat("yyyy-MM"); public static SimpleDateFormat y_m_d_h_m = new SimpleDateFormat("yyyyMMddHHmm"); @@ -616,6 +618,29 @@ public class DateUtil { } } + + public static String getYyyyMMddHHssmm(Date d) { + if (d == null) { + return null; + } + try { + return yyyyMMddHHmmss.format(d); + } catch (Exception e) { + return null; + } + } + + public static Date parseYyyyMMddHHssmm(String d) { + if (d == null) { + return null; + } + try { + return yyyyMMddHHmmss.parse(d); + } catch (Exception e) { + return null; + } + } + public static Date getDayStartTime(Date startTime) { if (startTime == null) { return null; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDiagnoseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDiagnoseModel.java new file mode 100644 index 0000000..ff3dcbc --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyDiagnoseModel.java @@ -0,0 +1,261 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +/** + * Created by Administrator on 2019-06-24. + */ +public class BabyDiagnoseModel { + + //病历号=住院号 + private String blh; + + private String syxh; + + + + //姓名 + private String hzxm; + + //性别 + private String sex; + + //出生日期 + private Date birth; + private String birthtime; + + //出院诊断代码 + private String cyzddm; + + //出院诊断 + private String cyzdmc; + + //身份证号 + private String sfzh; + + //联系电话 + private String lxdh; + + //联系地址 + private String lxdz; + + //联系人 + private String lxr; + + //联系人电话 + private String lxrdh; + + //当前地址 + private String curraddr; + + //出院日期 + private Date cyrq; + + //录入日期 + private Date lrrq; + private Date rqrq; + + //入院日期 + private Date ryrq; + private Date cqrq; + + private String ksdm; + private String bqdm; + private String mblh; + private String msyxh; + + //是否建档 1未建档 2已建档 + private Integer isbuild; + + public Integer getIsbuild() { + return isbuild; + } + + public void setIsbuild(Integer isbuild) { + this.isbuild = isbuild; + } + + public String getBlh() { + return blh; + } + + public void setBlh(String blh) { + this.blh = blh; + } + + public String getSyxh() { + return syxh; + } + + public void setSyxh(String syxh) { + this.syxh = syxh; + } + + public String getHzxm() { + return hzxm; + } + + public void setHzxm(String hzxm) { + this.hzxm = hzxm; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } + + public String getBirthtime() { + return birthtime; + } + + public void setBirthtime(String birthtime) { + this.birthtime = birthtime; + } + + public String getCyzddm() { + return cyzddm; + } + + public void setCyzddm(String cyzddm) { + this.cyzddm = cyzddm; + } + + public String getCyzdmc() { + return cyzdmc; + } + + public void setCyzdmc(String cyzdmc) { + this.cyzdmc = cyzdmc; + } + + public String getSfzh() { + return sfzh; + } + + public void setSfzh(String sfzh) { + this.sfzh = sfzh; + } + + public String getLxdh() { + return lxdh; + } + + public void setLxdh(String lxdh) { + this.lxdh = lxdh; + } + + public String getLxdz() { + return lxdz; + } + + public void setLxdz(String lxdz) { + this.lxdz = lxdz; + } + + public String getLxr() { + return lxr; + } + + public void setLxr(String lxr) { + this.lxr = lxr; + } + + public String getLxrdh() { + return lxrdh; + } + + public void setLxrdh(String lxrdh) { + this.lxrdh = lxrdh; + } + + public String getCurraddr() { + return curraddr; + } + + public void setCurraddr(String curraddr) { + this.curraddr = curraddr; + } + + public Date getCyrq() { + return cyrq; + } + + public void setCyrq(Date cyrq) { + this.cyrq = cyrq; + } + + public Date getLrrq() { + return lrrq; + } + + public void setLrrq(Date lrrq) { + this.lrrq = lrrq; + } + + public Date getRqrq() { + return rqrq; + } + + public void setRqrq(Date rqrq) { + this.rqrq = rqrq; + } + + public Date getRyrq() { + return ryrq; + } + + public void setRyrq(Date ryrq) { + this.ryrq = ryrq; + } + + public Date getCqrq() { + return cqrq; + } + + public void setCqrq(Date cqrq) { + this.cqrq = cqrq; + } + + public String getKsdm() { + return ksdm; + } + + public void setKsdm(String ksdm) { + this.ksdm = ksdm; + } + + public String getBqdm() { + return bqdm; + } + + public void setBqdm(String bqdm) { + this.bqdm = bqdm; + } + + public String getMblh() { + return mblh; + } + + public void setMblh(String mblh) { + this.mblh = mblh; + } + + public String getMsyxh() { + return msyxh; + } + + public void setMsyxh(String msyxh) { + this.msyxh = msyxh; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index f484c7e..0272bdf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -22,6 +22,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String id; + private Boolean hasBlno; /** * 关键字 */ @@ -837,6 +838,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.visitstatus = visitstatus; } + public Boolean getHasBlno() { + return hasBlno; + } + + public void setHasBlno(Boolean hasBlno) { + this.hasBlno = hasBlno; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -851,6 +860,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } + if (null != hasBlno) { + condition = condition.and("blNo", hasBlno, MongoOper.EXISTS); + } + if (-1 != visitstatus) { condition = condition.and("visitstatus", visitstatus, MongoOper.IS); } 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 89d150d..120378f 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 @@ -1,11 +1,16 @@ package com.lyms.hospitalapi.pojo; -import java.util.Date; -public class BabyDischargeDiagnosisModel { +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.BabyDiagnoseModel; + +public class BabyDischargeDiagnosisModel implements IBasicRequestConvert { //病历号=住院号 private String blh; + private String syxh; + //出院日期 private String cyrq; @@ -17,10 +22,182 @@ public class BabyDischargeDiagnosisModel { //出生日期 private String birth; + private String birthtime; + + //出院诊断代码 + private String cyzddm; //出院诊断 private String cyzdmc; + //身份证号 + private String sfzh; + + //联系电话 + private String lxdh; + + //联系地址 + private String lxdz; + + //联系人 + private String lxr; + + //联系人电话 + private String lxrdh; + + //当前地址 + private String curraddr; + + + //录入日期 + private String lrrq; + private String rqrq; + + //入院日期 + private String ryrq; + private String cqrq; + + private String ksdm; + private String bqdm; + private String mblh; + private String msyxh; + + public String getBirthtime() { + return birthtime; + } + + public void setBirthtime(String birthtime) { + this.birthtime = birthtime; + } + + public String getSyxh() { + return syxh; + } + + public void setSyxh(String syxh) { + this.syxh = syxh; + } + + public String getCyzddm() { + return cyzddm; + } + + public void setCyzddm(String cyzddm) { + this.cyzddm = cyzddm; + } + + public String getSfzh() { + return sfzh; + } + + public void setSfzh(String sfzh) { + this.sfzh = sfzh; + } + + public String getLxdh() { + return lxdh; + } + + public void setLxdh(String lxdh) { + this.lxdh = lxdh; + } + + public String getLxdz() { + return lxdz; + } + + public void setLxdz(String lxdz) { + this.lxdz = lxdz; + } + + public String getLxr() { + return lxr; + } + + public void setLxr(String lxr) { + this.lxr = lxr; + } + + public String getLxrdh() { + return lxrdh; + } + + public void setLxrdh(String lxrdh) { + this.lxrdh = lxrdh; + } + + public String getCurraddr() { + return curraddr; + } + + public void setCurraddr(String curraddr) { + this.curraddr = curraddr; + } + + public String getLrrq() { + return lrrq; + } + + public void setLrrq(String lrrq) { + this.lrrq = lrrq; + } + + public String getRqrq() { + return rqrq; + } + + public void setRqrq(String rqrq) { + this.rqrq = rqrq; + } + + public String getRyrq() { + return ryrq; + } + + public void setRyrq(String ryrq) { + this.ryrq = ryrq; + } + + public String getCqrq() { + return cqrq; + } + + public void setCqrq(String cqrq) { + this.cqrq = cqrq; + } + + public String getKsdm() { + return ksdm; + } + + public void setKsdm(String ksdm) { + this.ksdm = ksdm; + } + + public String getBqdm() { + return bqdm; + } + + public void setBqdm(String bqdm) { + this.bqdm = bqdm; + } + + public String getMblh() { + return mblh; + } + + public void setMblh(String mblh) { + this.mblh = mblh; + } + + public String getMsyxh() { + return msyxh; + } + + public void setMsyxh(String msyxh) { + this.msyxh = msyxh; + } + public String getBlh() { return blh; } @@ -71,5 +248,67 @@ public class BabyDischargeDiagnosisModel { } + @Override + public BabyDiagnoseModel convertToDataModel() { + + BabyDiagnoseModel model = new BabyDiagnoseModel(); + model.setBlh(blh); + model.setSyxh(syxh); + + //出院日期 + model.setCyrq(DateUtil.parseYyyyMMddHHssmm(cyrq)); + + //姓名 + model.setHzxm(hzxm); + + //性别 + model.setSex(sex); + + //出生日期 + model.setBirth(DateUtil.parseYYYYMMDD(birth)); + model.setBirthtime(birthtime); + + //出院诊断代码 + model.setCyzddm(cyzddm); + + //出院诊断 + model.setCyzdmc(cyzdmc); + + //身份证号 + model.setSfzh(sfzh); + + //联系电话 + model.setLxdh(lxdh); + + //联系地址 + model.setLxdz(lxdz); + + //联系人 + model.setLxr(lxr); + + //联系人电话 + model.setLxrdh(lxrdh); + + //当前地址 + model.setCurraddr(curraddr); + + //录入日期 + + model.setLrrq(DateUtil.parseYyyyMMddHHssmm(lrrq)); + model.setRqrq(DateUtil.parseYyyyMMddHHssmm(rqrq)); + + //入院日期 + model.setRyrq(DateUtil.parseYyyyMMddHHssmm(ryrq)); + model.setCqrq(DateUtil.parseYyyyMMddHHssmm(cqrq)); + + model.setKsdm(ksdm); + model.setBqdm(bqdm); + model.setMblh(mblh); + model.setMsyxh(msyxh); + + model.setIsbuild(1); + + return model; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/NewBabyDiagnoseModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/NewBabyDiagnoseModel.java new file mode 100644 index 0000000..732d466 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/NewBabyDiagnoseModel.java @@ -0,0 +1,8 @@ +package com.lyms.hospitalapi.pojo; + +/** + * Created by Administrator on 2019-06-24. + */ +public class NewBabyDiagnoseModel { + +} 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 766f534..9be6024 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 @@ -833,26 +833,27 @@ public class QhdfyHisService { Map map = new HashMap<>(); StringBuffer sb = new StringBuffer(); if (StringUtils.isNotBlank(blNo)) { - Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection(); +// Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeFmConnection(); + Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(); try { - // List list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler(DiagnosisInfo.class)); - List list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '" + blNo + "'", new BeanListHandler(DiagnosisInfo.class)); + //List list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '" + blNo + "'", new BeanListHandler(DiagnosisInfo.class)); + List list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from VW_LYMS_XSE_BRSYK where blh = '" + blNo + "'", new BeanListHandler(DiagnosisInfo.class)); if (CollectionUtils.isNotEmpty(list)) { -// for (DiagnosisInfo info:list) { -// map.put("diagnosisItem", info.getDiagnosisItem()); -// break; -// } - - for (int i = 0; i < list.size(); i++) { - if (i < list.size() - 1) { - sb.append(list.get(i).getDiagnosisItem()); - sb.append(", "); - } else { - sb.append(list.get(i).getDiagnosisItem()); - } + for (DiagnosisInfo info:list) { + map.put("diagnosisItem", info.getDiagnosisItem()); + break; } + +// for (int i = 0; i < list.size(); i++) { +// if (i < list.size() - 1) { +// sb.append(list.get(i).getDiagnosisItem()); +// sb.append(", "); +// } else { +// sb.append(list.get(i).getDiagnosisItem()); +// } +// } } DbUtils.closeQuietly(conn); } catch (SQLException e) { @@ -860,7 +861,7 @@ public class QhdfyHisService { e.printStackTrace(); } } - map.put("diagnosisItem", sb.toString()); + //map.put("diagnosisItem", sb.toString()); return map; } @@ -976,16 +977,30 @@ public class QhdfyHisService { return objectResponse; } - public static void main(String[] args) { - String str = "20160504121330"; - SimpleDateFormat sdfcyrq = new SimpleDateFormat("yyyyMMddHHmmss"); + + public List queryNewBabyDiagnose(String lrrqStart, String lrrqEnd) { + + 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 "; try { - Date date = sdfcyrq.parse(str); - System.out.println(date); - } catch (Exception e) { - } + 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 list = queryRunner.query(conn, sql, new BeanListHandler(BabyDischargeDiagnosisModel.class)); + return list; + } + catch (Exception e) + { + ExceptionUtils.catchException(e,"queryNewBabyDiagnose error. sql:"+sql); + } + finally { + DbUtils.closeQuietly(conn); + } + return null; + } } 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 c7c9ea0..9ad686a 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 @@ -568,6 +568,23 @@ public class BabyBuildController extends BaseController { /** + * 处理历史数据 按照时间返回获取保存，格式：lrrqStart=2019062414:41:00&lrrqEnd=2019062418:41:00 + * @param lrrqStart + * @param lrrqEnd + * @return + */ + @ResponseBody + @RequestMapping(value = "/queryNewBabyDiagnose", method = RequestMethod.GET) + public BaseResponse queryNewBabyDiagnose(HttpServletRequest request, HttpServletResponse response, + @RequestParam(value = "lrrqStart", required = true) String lrrqStart, + @RequestParam(value = "lrrqEnd", required = true) String lrrqEnd + ) { + return babyBookbuildingFacade.queryNewBabyDiagnose(lrrqStart,lrrqEnd); + } + + + + /** * 获取可以导出的医院列表 * * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index f8e59a9..41b8215 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -34,6 +34,7 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.worker.*; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.BabyDiagnoseService; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; @@ -1324,6 +1325,71 @@ public class TestController extends BaseController { // } + + + + + + + + @Autowired + private BabyDiagnoseService babyDiagnoseService; + + + @RequestMapping(value = "/updateBabyDiagnoseIsBuild", method = RequestMethod.GET) + @ResponseBody + public String updateBabyDiagnoseIsBuild(@RequestParam(required = true) String hid) { + + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setHospitalId(hid); + babyModelQuery.setHasBlno(true); + + List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(models)) { + int batchSize = 500; + int end = 0; + for (int i = 0; i < models.size(); i += batchSize) { + end = (end + batchSize); + if (end > models.size()) { + end = models.size(); + } + System.out.println("start:" + i + ",end:" + end); + final List tempList = models.subList(i, end); + new Thread(new Runnable() { + @Override + public void run() { + if (CollectionUtils.isNotEmpty(tempList)) { + BabyDiagnoseModel model = new BabyDiagnoseModel(); + model.setIsbuild(2); + + for (BabyModel babyModel : tempList) { + if (babyModel != null && StringUtils.isNotEmpty(babyModel.getBlNo())) { + model.setBlh(babyModel.getBlNo()); + babyDiagnoseService.updateBabyDiagnose(model); + System.out.println(babyModel.getBlNo()); + } + } + } + } + }).start(); + } + } + + + return "updateBabyDiagnoseIsBuild finish"; + } + + + + + + + + + + + /** * 修正儿童助产机构 * 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 6da4a3d..198d671 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.fnfy.FnfyHisService; import com.lyms.hospitalapi.lcdcf.LcdcfHisService; +import com.lyms.hospitalapi.pojo.BabyDischargeDiagnosisModel; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; @@ -27,10 +28,7 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.GrowthCountTask; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.*; -import com.lyms.platform.permission.service.CouponService; -import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.PatientServiceService; -import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; @@ -47,6 +45,7 @@ import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -78,6 +77,10 @@ public class BabyBookbuildingFacade { @Autowired private QhdfyHisService qhdfyHisService; + + @Autowired + private BabyDiagnoseService babyDiagnoseService; + @Autowired private DzfyHisService dzfyHisService; @@ -778,20 +781,8 @@ public class BabyBookbuildingFacade { } //创建建档短信 createBuildMsg(model); -// new Thread(new Runnable() { -// @Override -// public void run() { -// BabyModelQuery babyQuery = new BabyModelQuery(); -// babyQuery.setYn(YnEnums.YES.getId()); -// babyQuery.setId(bId); -// List list = babyBookbuildingService.queryBabyBuildByCond(babyQuery); -// if (CollectionUtils.isNotEmpty(list)) -// { -// createBuildMsg(list.get(0)); -//// createExtensionMsg(list.get(0)); -// } -// } -// },"babyBuildMsgThead").start(); + handleBabyDiangose(request.getBlNo(),hid); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(bId); @@ -803,6 +794,23 @@ public class BabyBookbuildingFacade { } /** + * 秦皇岛妇幼儿童建档后根据住院号 更新诊断记录为已经建档状态 + */ + private void handleBabyDiangose(String blh,String hospitalId) + { + if ("216".equals(hospitalId) && StringUtils.isNotEmpty(blh)) + { + BabyDiagnoseModel model = new BabyDiagnoseModel(); + model.setIsbuild(2); + model.setBlh(blh); + babyDiagnoseService.updateBabyDiagnose(model); + } + + } + + + + /** * 添加或更新追访信息 * * @param userId @@ -4042,4 +4050,72 @@ public class BabyBookbuildingFacade { } + /** + * 查询一段时间新生儿诊断记录 + * @param lrrqStart 录入日期开始 + * @param lrrqEnd 录入日期结束 + */ + public BaseObjectResponse queryNewBabyDiagnose(String lrrqStart, String lrrqEnd) { + + int size = handleBabyDiagnose(lrrqStart, lrrqEnd); + return new BaseObjectResponse() + .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(size); + } + + + /** + * 处理数据 + * @param lrrqStart + * @param lrrqEnd + * @return + */ + public int handleBabyDiagnose(String lrrqStart, String lrrqEnd) + { + List list = qhdfyHisService.queryNewBabyDiagnose(lrrqStart, lrrqEnd); + + 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)) + { + BabyDiagnoseModel babyDiagnoseModel = model.convertToDataModel(); + babyDiagnoseService.addBabyDiagnose(babyDiagnoseModel); + System.out.println("handleBabyDiagnose success "+ model.getBlh()); + } + } + catch (Exception e) + { + ExceptionUtils.catchException(e, "handleBabyDiagnose error."); + continue; + } + } + } + + return CollectionUtils.isNotEmpty(list) ? list.size() : 0; + } + + + /** + * 获取当前时间前一个小时的数据 + */ + public void autoGetBabyDiagnose() { + + Date end = new Date(); + Date start = new Date(end.getTime() - 3600000); + + String lrrqStart = DateUtil.getYyyyMMddHHssmm(start); + String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end); + + int size = handleBabyDiagnose(lrrqStart, lrrqEnd); + System.out.println("autoGetBabyDiagnose size " + size); + } + + + } \ No newline at end of file