diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index c906e70..9ebb5b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -745,44 +745,44 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if(null!=premaritalCheckup){ Map wifeBaseInfo =new HashMap<>(); //末次月经 - wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses()); + wifeBaseInfo.put("lastMenses",StringUtils.isNotEmpty(premaritalCheckup.getLastMenses())?premaritalCheckup.getLastMenses():null); Map wifePhysiqueCheck =new HashMap<>(); //血压 - wifePhysiqueCheck.put("bp", premaritalCheckup.getBp()); + wifePhysiqueCheck.put("bp", StringUtils.isNotEmpty(premaritalCheckup.getBp())?premaritalCheckup.getBp():null); //心率 - wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate()); + wifePhysiqueCheck.put("heartRate", StringUtils.isNotEmpty(premaritalCheckup.getHeartRate())?premaritalCheckup.getHeartRate():null); //抽血编号 - map.put("wifeCxNum",premaritalCheckup.getCxNum()); + map.put("wifeCxNum",StringUtils.isNotEmpty(premaritalCheckup.getCxNum())?premaritalCheckup.getCxNum():null); //写入一般情况map - map.put("wifeBaseInfo",wifeBaseInfo); + map.put("wifeBaseInfo",null!=wifeBaseInfo?wifeBaseInfo:null); //写入体格检查map - map.put("wifePhysiqueCheck",wifePhysiqueCheck); + map.put("wifePhysiqueCheck",null!=wifePhysiqueCheck?wifePhysiqueCheck:null); //用户签名(女) - map.put("userSignWoman",premaritalCheckup.getUserSign()); + map.put("userSignWoman",StringUtils.isNotEmpty(premaritalCheckup.getUserSign())?premaritalCheckup.getUserSign():null); //婚检医生签名(女)-使用 婚前指导签名 数据 - map.put("guidSignWoman",premaritalCheckup.getGuidSign()); + map.put("guidSignWoman",StringUtils.isNotEmpty(premaritalCheckup.getGuidSign())?premaritalCheckup.getGuidSign():null); } //男性档案同步 PremaritalCheckup premaritalCheckup2=mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), PremaritalCheckup.class); if(null!=premaritalCheckup2){ Map husbandPhysiqueCheck =new HashMap<>(); //血压 - husbandPhysiqueCheck.put("bp", premaritalCheckup2.getBp()); + husbandPhysiqueCheck.put("bp", StringUtils.isNotEmpty(premaritalCheckup2.getBp())?premaritalCheckup2.getBp():null); //心率 - husbandPhysiqueCheck.put("heartRate", premaritalCheckup2.getHeartRate()); + husbandPhysiqueCheck.put("heartRate", StringUtils.isNotEmpty(premaritalCheckup2.getHeartRate())?premaritalCheckup2.getHeartRate():null); //睾丸(单选,选择扪及/未们及) - husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan()); + husbandPhysiqueCheck.put("gaowan", null!=premaritalCheckup2.getGaoWan()?premaritalCheckup2.getGaoWan():null); //睾丸体积左右 - husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft()); - husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight()); + husbandPhysiqueCheck.put("volumeLeft", StringUtils.isNotEmpty(premaritalCheckup2.getVolumeLeft())?premaritalCheckup2.getVolumeLeft():null); + husbandPhysiqueCheck.put("volumeRight", StringUtils.isNotEmpty(premaritalCheckup2.getVolumeRight())?premaritalCheckup2.getVolumeRight():null); //抽血编号 - map.put("husbandCxNum",premaritalCheckup2.getCxNum()); + map.put("husbandCxNum",StringUtils.isNotEmpty(premaritalCheckup2.getCxNum())?premaritalCheckup2.getCxNum():null); //写入体格检查map - map.put("husbandPhysiqueCheck",husbandPhysiqueCheck); + map.put("husbandPhysiqueCheck",null!=husbandPhysiqueCheck?husbandPhysiqueCheck:null); //用户签名(男) - map.put("userSignMan",premaritalCheckup2.getUserSign()); + map.put("userSignMan",StringUtils.isNotEmpty(premaritalCheckup2.getUserSign())?premaritalCheckup2.getUserSign():null); //婚检医生签名(男)-使用 婚前指导签名 数据 - map.put("guidSignMan",premaritalCheckup.getGuidSign()); + map.put("guidSignMan",StringUtils.isNotEmpty(premaritalCheckup.getGuidSign())?premaritalCheckup.getGuidSign():null); } }