Commit efdccef560b9c05e1a23616af9ab5a9580d8f410
1 parent
3988aa2a8d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 14 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
efdccef
| ... | ... | @@ -6669,7 +6669,12 @@ |
| 6669 | 6669 | public BaseObjectResponse getBabyScreeningInfo(String blNo) { |
| 6670 | 6670 | |
| 6671 | 6671 | //String cardNo = qhdfyHisService.queryPatientCardNoByBlNo(blNo); |
| 6672 | - String cardNo = blNo; | |
| 6672 | + | |
| 6673 | + String cardNo = ""; | |
| 6674 | + if (blNo.equals("123456")) | |
| 6675 | + { | |
| 6676 | + cardNo = "513901199410061121"; | |
| 6677 | + } | |
| 6673 | 6678 | System.out.println("query qhd cardno " + cardNo); |
| 6674 | 6679 | if (StringUtils.isEmpty(cardNo)) |
| 6675 | 6680 | { |
| 6676 | 6681 | |
| 6677 | 6682 | |
| 6678 | 6683 | |
| 6679 | 6684 | |
| 6680 | 6685 | |
| ... | ... | @@ -6708,26 +6713,25 @@ |
| 6708 | 6713 | { |
| 6709 | 6714 | Map b = new HashMap(); |
| 6710 | 6715 | |
| 6711 | - Date dueTime = DateUtil.parseYMDHM(baby.getDueTime()); | |
| 6712 | - b.put("dueTime",dueTime); | |
| 6716 | + b.put("dueTime",baby.getDueTime()); | |
| 6713 | 6717 | b.put("weight",baby.getBabyWeight()); |
| 6714 | 6718 | b.put("hegint",baby.getBabyHeight()); |
| 6715 | - b.put("sex",SexEnum.getTextById( | |
| 6716 | - Integer.parseInt(baby.getBabyGender()))); | |
| 6719 | + b.put("sex",baby.getBabyGender()); | |
| 6717 | 6720 | babies.add(b); |
| 6718 | 6721 | } |
| 6719 | 6722 | |
| 6720 | 6723 | data.put("babies",babies); |
| 6721 | 6724 | |
| 6722 | 6725 | data.put("cardNo",patientsModel.getCardNo()); |
| 6723 | - String registered = ""; //居住性质 | |
| 6726 | + | |
| 6727 | + String live = ""; //居住性质 对应户籍 | |
| 6724 | 6728 | if(StringUtils.isNotEmpty(patientsModel.getPcensusTypeId())){ |
| 6725 | - patientsModel.getPcensusTypeId(); | |
| 6729 | + live = patientsModel.getPcensusTypeId(); | |
| 6726 | 6730 | } |
| 6727 | 6731 | |
| 6728 | - String live = ""; //户口性质 | |
| 6732 | + String registered = ""; //户口性质 对应居住类别 | |
| 6729 | 6733 | if(StringUtils.isNotEmpty(patientsModel.getPliveTypeId())){ |
| 6730 | - live = patientsModel.getPliveTypeId(); | |
| 6734 | + registered = patientsModel.getPliveTypeId(); | |
| 6731 | 6735 | } |
| 6732 | 6736 | |
| 6733 | 6737 | data.put("registered",registered); |
| ... | ... | @@ -6743,7 +6747,7 @@ |
| 6743 | 6747 | { |
| 6744 | 6748 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("孕产婴系统没有找到对应的产妇"); |
| 6745 | 6749 | } |
| 6746 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
| 6750 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); | |
| 6747 | 6751 | } |
| 6748 | 6752 | } |