Commit 705e092d2ac358e9130c8dc74033b70758f64859
1 parent
f0094b9778
Exists in
master
and in
6 other branches
男、女性婚检检查页面的血压和心率同步到男、女孕前优生的体格检查update
Showing 1 changed file with 17 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
705e092
| ... | ... | @@ -745,44 +745,44 @@ |
| 745 | 745 | if(null!=premaritalCheckup){ |
| 746 | 746 | Map<String,Object> wifeBaseInfo =new HashMap<>(); |
| 747 | 747 | //末次月经 |
| 748 | - wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses()); | |
| 748 | + wifeBaseInfo.put("lastMenses",StringUtils.isNotEmpty(premaritalCheckup.getLastMenses())?premaritalCheckup.getLastMenses():null); | |
| 749 | 749 | Map<String,Object> wifePhysiqueCheck =new HashMap<>(); |
| 750 | 750 | //血压 |
| 751 | - wifePhysiqueCheck.put("bp", premaritalCheckup.getBp()); | |
| 751 | + wifePhysiqueCheck.put("bp", StringUtils.isNotEmpty(premaritalCheckup.getBp())?premaritalCheckup.getBp():null); | |
| 752 | 752 | //心率 |
| 753 | - wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate()); | |
| 753 | + wifePhysiqueCheck.put("heartRate", StringUtils.isNotEmpty(premaritalCheckup.getHeartRate())?premaritalCheckup.getHeartRate():null); | |
| 754 | 754 | //抽血编号 |
| 755 | - map.put("wifeCxNum",premaritalCheckup.getCxNum()); | |
| 755 | + map.put("wifeCxNum",StringUtils.isNotEmpty(premaritalCheckup.getCxNum())?premaritalCheckup.getCxNum():null); | |
| 756 | 756 | //写入一般情况map |
| 757 | - map.put("wifeBaseInfo",wifeBaseInfo); | |
| 757 | + map.put("wifeBaseInfo",null!=wifeBaseInfo?wifeBaseInfo:null); | |
| 758 | 758 | //写入体格检查map |
| 759 | - map.put("wifePhysiqueCheck",wifePhysiqueCheck); | |
| 759 | + map.put("wifePhysiqueCheck",null!=wifePhysiqueCheck?wifePhysiqueCheck:null); | |
| 760 | 760 | //用户签名（女） |
| 761 | - map.put("userSignWoman",premaritalCheckup.getUserSign()); | |
| 761 | + map.put("userSignWoman",StringUtils.isNotEmpty(premaritalCheckup.getUserSign())?premaritalCheckup.getUserSign():null); | |
| 762 | 762 | //婚检医生签名（女）-使用 婚前指导签名 数据 |
| 763 | - map.put("guidSignWoman",premaritalCheckup.getGuidSign()); | |
| 763 | + map.put("guidSignWoman",StringUtils.isNotEmpty(premaritalCheckup.getGuidSign())?premaritalCheckup.getGuidSign():null); | |
| 764 | 764 | } |
| 765 | 765 | //男性档案同步 |
| 766 | 766 | PremaritalCheckup premaritalCheckup2=mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), PremaritalCheckup.class); |
| 767 | 767 | if(null!=premaritalCheckup2){ |
| 768 | 768 | Map<String,Object> husbandPhysiqueCheck =new HashMap<>(); |
| 769 | 769 | //血压 |
| 770 | - husbandPhysiqueCheck.put("bp", premaritalCheckup2.getBp()); | |
| 770 | + husbandPhysiqueCheck.put("bp", StringUtils.isNotEmpty(premaritalCheckup2.getBp())?premaritalCheckup2.getBp():null); | |
| 771 | 771 | //心率 |
| 772 | - husbandPhysiqueCheck.put("heartRate", premaritalCheckup2.getHeartRate()); | |
| 772 | + husbandPhysiqueCheck.put("heartRate", StringUtils.isNotEmpty(premaritalCheckup2.getHeartRate())?premaritalCheckup2.getHeartRate():null); | |
| 773 | 773 | //睾丸(单选，选择扪及/未们及) |
| 774 | - husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan()); | |
| 774 | + husbandPhysiqueCheck.put("gaowan", null!=premaritalCheckup2.getGaoWan()?premaritalCheckup2.getGaoWan():null); | |
| 775 | 775 | //睾丸体积左右 |
| 776 | - husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft()); | |
| 777 | - husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight()); | |
| 776 | + husbandPhysiqueCheck.put("volumeLeft", StringUtils.isNotEmpty(premaritalCheckup2.getVolumeLeft())?premaritalCheckup2.getVolumeLeft():null); | |
| 777 | + husbandPhysiqueCheck.put("volumeRight", StringUtils.isNotEmpty(premaritalCheckup2.getVolumeRight())?premaritalCheckup2.getVolumeRight():null); | |
| 778 | 778 | //抽血编号 |
| 779 | - map.put("husbandCxNum",premaritalCheckup2.getCxNum()); | |
| 779 | + map.put("husbandCxNum",StringUtils.isNotEmpty(premaritalCheckup2.getCxNum())?premaritalCheckup2.getCxNum():null); | |
| 780 | 780 | //写入体格检查map |
| 781 | - map.put("husbandPhysiqueCheck",husbandPhysiqueCheck); | |
| 781 | + map.put("husbandPhysiqueCheck",null!=husbandPhysiqueCheck?husbandPhysiqueCheck:null); | |
| 782 | 782 | //用户签名（男） |
| 783 | - map.put("userSignMan",premaritalCheckup2.getUserSign()); | |
| 783 | + map.put("userSignMan",StringUtils.isNotEmpty(premaritalCheckup2.getUserSign())?premaritalCheckup2.getUserSign():null); | |
| 784 | 784 | //婚检医生签名（男）-使用 婚前指导签名 数据 |
| 785 | - map.put("guidSignMan",premaritalCheckup.getGuidSign()); | |
| 785 | + map.put("guidSignMan",StringUtils.isNotEmpty(premaritalCheckup.getGuidSign())?premaritalCheckup.getGuidSign():null); | |
| 786 | 786 | } |
| 787 | 787 | } |
| 788 | 788 |