From efdccef560b9c05e1a23616af9ab5a9580d8f410 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 6 Jan 2020 15:38:06 +0800 Subject: [PATCH] update --- .../platform/operate/web/facade/ViewFacade.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) 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 0b53c33..c85c3a6 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 @@ -6669,7 +6669,12 @@ public class ViewFacade { public BaseObjectResponse getBabyScreeningInfo(String blNo) { //String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); - String cardNo = blNo; + + String cardNo = ""; + if (blNo.equals("123456")) + { + cardNo = "513901199410061121"; + } System.out.println("query qhd cardno " + cardNo); if (StringUtils.isEmpty(cardNo)) { @@ -6708,26 +6713,25 @@ public class ViewFacade { { Map b = new HashMap(); - Date dueTime = DateUtil.parseYMDHM(baby.getDueTime()); - b.put("dueTime",dueTime); + b.put("dueTime",baby.getDueTime()); b.put("weight",baby.getBabyWeight()); b.put("hegint",baby.getBabyHeight()); - b.put("sex",SexEnum.getTextById( - Integer.parseInt(baby.getBabyGender()))); + b.put("sex",baby.getBabyGender()); babies.add(b); } data.put("babies",babies); data.put("cardNo",patientsModel.getCardNo()); - String registered = ""; //居住性质 + + String live = ""; //居住性质 对应户籍 if(StringUtils.isNotEmpty(patientsModel.getPcensusTypeId())){ - patientsModel.getPcensusTypeId(); + live = patientsModel.getPcensusTypeId(); } - String live = ""; //户口性质 + String registered = ""; //户口性质 对应居住类别 if(StringUtils.isNotEmpty(patientsModel.getPliveTypeId())){ - live = patientsModel.getPliveTypeId(); + registered = patientsModel.getPliveTypeId(); } data.put("registered",registered); @@ -6743,6 +6747,6 @@ public class ViewFacade { { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("孕产婴系统没有找到对应的产妇"); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); } } -- 1.8.3.1