From ea68330832b44cd3e652623c7566cedfeecda132 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 20 Dec 2017 11:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=A6=87=E5=B9=BC=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=A5=97=E6=89=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ViewController.java | 15 ++++- .../platform/operate/web/facade/ViewFacade.java | 66 ++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index f910415..454bcad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -590,8 +590,21 @@ public class ViewController extends BaseController { @ResponseBody @TokenRequired public BaseObjectResponse findMatDeliverPrint(@RequestParam(required = true) String id,@RequestParam(required = true) String babyId) { - return viewFacade.findMatDeliverPrint(id,babyId); + return viewFacade.findMatDeliverPrint(id, babyId); } + /** + * 威海妇幼孕妇建档套打接口 + * + * @param id 孕妇ID + * @return + */ + @RequestMapping(value = "/getWhfyPatientPrint", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse getWhfyPatientPrint(@RequestParam("id") String id) { + return viewFacade.getWhfyPatientPrint(id); + } + } 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 707760c..41ab281 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 @@ -3955,4 +3955,70 @@ public class ViewFacade { br.setData(map); return br; } + + public BaseObjectResponse getWhfyPatientPrint(String id) { + BaseObjectResponse br = new BaseObjectResponse(); + if (org.apache.commons.lang.StringUtils.isEmpty(id)) { + br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + br.setErrormsg("id为空"); + return br; + } + + Patients data = patientsService.findOnePatientById(id); + if (data == null || data.getYn() == YnEnums.NO.getId()) { + br.setErrorcode(ErrorCodeConstants.NO_DATA); + br.setErrormsg("没有查询到数据"); + return br; + } + + Map map = new HashMap<>(); + + map.put("id", data.getId()); + /* 孕妇基础数据 */ + map.put("username", data.getUsername()); + map.put("age", DateUtil.getAge(data.getBirth())); + map.put("nation", getBasicConfig(data.getPnationId())); + + map.put("professionType", getBasicConfig(data.getPprofessionTypeId())); + map.put("workUnit", data.getPworkUnit()); + map.put("phone", data.getPhone()); + map.put("cardNo", data.getCardNo()); + + + /* 孕妇联系方式 */ + map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(), + data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService)); + map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(), + data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService)); + map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(), + data.getAreaPostRestId(), data.getStreetPostRestId(), data.getAddressPostRest(), basicConfigService)); + + /* 丈夫信息 */ + map.put("husbandName", data.getHusbandName()); + String fage = ""; + if (StringUtils.isNotEmpty(data.getHcertificateTypeId()) && StringUtils.isNotEmpty(data.getHcertificateNum()) && + data.getHcertificateNum().length() == 18 && + "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(data.getHcertificateTypeId())) + { + String cardNo = data.getHcertificateNum().substring(6, 14); + Date date = DateUtil.parseYYYYMMDD(cardNo); + Integer age = DateUtil.getAge(date); + fage = String.valueOf(age); + } + + //丈夫年龄 + map.put("husbandAge",fage); + map.put("husbandNation", getBasicConfig(data.getHnationId())); + map.put("husbandProfessionType", getBasicConfig(data.getHprofessionTypeId())); + map.put("husbandRegister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(), + data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(), + basicConfigService)); + map.put("husbandCardNo", data.getHcertificateNum()); + map.put("husbandPhone", data.getHusbandPhone()); + + br.setData(map); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } } -- 1.8.3.1