Commit 9894f2748f0f58571d31bef54d5a7fc8cd6ca61c
1 parent
f8bc7bf924
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 23 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
9894f27
| ... | ... | @@ -651,14 +651,36 @@ |
| 651 | 651 | List <PremaritalCheckup> hjList = premaritalCheckupService.queryPremaritalCheckup(query); |
| 652 | 652 | if(CollectionUtils.isNotEmpty(hjList)){ |
| 653 | 653 | PremaritalCheckup premaritalCheckup = hjList.get(0); |
| 654 | - map.put("menarcheAge", premaritalCheckup.getMenarcheAge()); | |
| 654 | + map.put("menarcheAge", premaritalCheckup.getMenarcheAge());//初潮年龄 | |
| 655 | 655 | map.put("lastMenses", premaritalCheckup.getLastMenses()); |
| 656 | + map.put("menstrualAmount", premaritalCheckup.getMenstrualAmount());//月经量 | |
| 657 | + map.put("menorrhalgia", premaritalCheckup.getMenorrhalgia()); //痛经(1:有 2:无)（1:无 2:轻 3:中 4:重） | |
| 656 | 658 | }else { |
| 657 | 659 | //孕检 |
| 658 | 660 | Query yquery = new Query(); |
| 659 | 661 | yquery.addCriteria(Criteria.where("hospitalId").is(hospitalId)); |
| 660 | 662 | yquery.addCriteria(Criteria.where("wifeCardNo").is(cardNo)); |
| 661 | 663 | List <PreEugenicsBaseModel> yjList = mongoTemplate.find(yquery, PreEugenicsBaseModel.class); |
| 664 | + if(CollectionUtils.isNotEmpty(yjList)){ | |
| 665 | + PreEugenicsBaseModel preEugenicsBaseModel = yjList.get(0); | |
| 666 | + if(preEugenicsBaseModel.getWifeBaseInfo()!=null){ | |
| 667 | + Map <String, Object> wifeBaseInfo = preEugenicsBaseModel.getWifeBaseInfo(); | |
| 668 | + if(wifeBaseInfo.containsKey("firstMensesAge")){ | |
| 669 | + map.put("menarcheAge", wifeBaseInfo.get("firstMensesAge")); | |
| 670 | + } | |
| 671 | + if(wifeBaseInfo.containsKey("lastMenses")){ | |
| 672 | + map.put("lastMenses", wifeBaseInfo.get("lastMenses")); | |
| 673 | + } | |
| 674 | + if(wifeBaseInfo.containsKey("yjl")){ | |
| 675 | + map.put("menstrualAmount", wifeBaseInfo.get("yjl")); | |
| 676 | + } | |
| 677 | + if(wifeBaseInfo.containsKey("tj")){ | |
| 678 | + map.put("menorrhalgia", wifeBaseInfo.get("tj")); | |
| 679 | + } | |
| 680 | + } | |
| 681 | + | |
| 682 | + } | |
| 683 | + | |
| 662 | 684 | } |
| 663 | 685 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); |
| 664 | 686 | } |