From 44701538af5d1b446a62e3db72dca1ddd4ece2f0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 8 May 2018 10:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/hospitalapi/lcdcf/LcdcfFmService.java | 4 +-- .../com/lyms/hospitalapi/qhdfy/QhdfyFmService.java | 4 +++ .../operate/web/controller/TestController.java | 4 +-- .../operate/web/facade/MatDeliverFacade.java | 31 ++++++++++++++++------ .../platform/operate/web/facade/ViewFacade.java | 18 ++++++++++--- .../operate/web/result/MatDeliverListResult.java | 10 +++++++ 6 files changed, 55 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java index 9e8b491..0c11621 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfFmService.java @@ -21,10 +21,10 @@ import java.util.Map; * Created by Administrator on 2018/4/20. * 通过住院号获取孕妇分娩信息 */ -@Service("LcdcfFmService") +@Service("lcdcfFmService") public class LcdcfFmService { - public static MaternalDeliverResult queryFmPatient(String bhnum){ + public MaternalDeliverResult queryFmPatient(String bhnum){ String cloumns = " ID as ID,\n" + " BHNUM as BHNUM,\n" + diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index 42214a0..dc1707f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -173,6 +173,10 @@ public class QhdfyFmService { } + public void syncByCardNo(String startStr,String endStr,String syxh) { + queryFmPatient(startStr, endStr, syxh); + } + public void syncByPhone(String startStr,String endStr,String syxh) { queryFmPatient(startStr, endStr,syxh); } 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 4749d65..15a7b12 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 @@ -139,7 +139,7 @@ public class TestController extends BaseController { private CdfyHisService cdfyHisService; @Autowired - private com.lyms.hospitalapi.lcdcf.LcdcfFmService LcdcfFmService; + private com.lyms.hospitalapi.lcdcf.LcdcfFmService lcdcfFmService; static Map highRisks = new HashMap<>(); @@ -1696,7 +1696,7 @@ public class TestController extends BaseController { @ResponseBody public MaternalDeliverResult testLc(String bhnum){ - return LcdcfFmService.queryFmPatient(bhnum); + return lcdcfFmService.queryFmPatient(bhnum); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 06852a2..79bbb5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.lcdcf.LcdcfFmService; import com.lyms.hospitalapi.lcdcf.LcdcfHisModel; import com.lyms.hospitalapi.lcdcf.LcdcfHisService; import com.lyms.platform.biz.service.*; @@ -65,6 +66,9 @@ public class MatDeliverFacade { private LcdcfHisService lcdcfHisService; @Autowired + private LcdcfFmService lcdcfFmService; + + @Autowired private AutoMatchFacade autoMatchFacade; @Autowired private PersonService personService; @@ -854,16 +858,21 @@ public class MatDeliverFacade { String hospital = autoMatchFacade.getHospitalId(userId); + LcdcfHisModel lcdcfHisModel = null; + //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码，然后用身份证号码作为院内系统的查询条件查询孕妇信息 - if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) { - LcdcfHisModel lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo()); - if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) { - deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard()); - } else { - return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); - } + if ("1000000116".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) { + //if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) { +// lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo()); +// if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) { +// //deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard()); +// +// +// } else { +// return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); +// } } - + deliverQueryRequest.setCardNo("63010419900906852X"); //获取 /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1); if (null == patients) { @@ -1013,6 +1022,12 @@ public class MatDeliverFacade { matDeliverListResult.setRiskScore(highScoreResult.getScoreStr()); matDeliverListResult.setTireNumber1(tTireNumber); + //聊城东昌府医院通过住院号查询分娩信息 然后回填到分娩界面 + if (lcdcfHisModel != null && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) + { + matDeliverListResult.setDeliverData(lcdcfFmService.queryFmPatient(deliverQueryRequest.getZhuYuanNo())); + } + matDeliverListResult.setDeliverData(lcdcfFmService.queryFmPatient(deliverQueryRequest.getZhuYuanNo())); } catch (Exception e) { } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 2f553fc..fbc36ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4448,10 +4448,20 @@ public class ViewFacade { map.put("babysex", baby.getBabyGender() == null ? "" : SexEnum.getTextById( Integer.parseInt(baby.getBabyGender()))); - - Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); - Integer week = betweenDay / 7; - Integer day = betweenDay % 7; + Integer week = 0; + Integer day = 0; + Map dueMap = data.getHandDueWeek(); + if (dueMap != null && dueMap.size() > 0) + { + week = dueMap.get("week") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("week"))); + day = dueMap.get("day") == null ? 0 : Integer.parseInt(String.valueOf(dueMap.get("day"))); + } + else + { + Integer betweenDay = DateUtil.getDays(pat.getLastMenses(), data.getDueDate1()); + week = betweenDay / 7; + day = betweenDay % 7; + } Date fmDate = DateUtil.parseYMDHM(baby.getDueTime()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index ae779bc..b732666 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -64,6 +64,16 @@ public class MatDeliverListResult { private String cardNo; private String vcCardNo; + private MaternalDeliverResult deliverData; + + public MaternalDeliverResult getDeliverData() { + return deliverData; + } + + public void setDeliverData(MaternalDeliverResult deliverData) { + this.deliverData = deliverData; + } + public Integer getDueCount() { return dueCount; } -- 1.8.3.1