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 44d8c9d..16f2926 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 @@ -211,46 +211,6 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen } list.add(one); } - //隆化 婚检同步信息(女) - if (StringUtils.isNotEmpty(cardNo)) { - //这里cardno传入是男性证件num,所以用配偶证件num - //女性档案同步 - PremaritalCheckup premaritalCheckup=mongoTemplate.findOne(Query.query(Criteria.where("spouseCertificateNum").is(cardNo)), PremaritalCheckup.class); - if(null!=premaritalCheckup){ - Map wifeBaseInfo =new HashMap<>(); - //末次月经 - wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses()); - Map wifePhysiqueCheck =new HashMap<>(); - //血压 - wifePhysiqueCheck.put("bp", premaritalCheckup.getBp()); - //心率 - wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate()); - //抽血编号 - list.get(0).setWifeCxNum(premaritalCheckup.getCxNum()); - //写入一般情况map - list.get(0).setWifeBaseInfo(wifeBaseInfo); - //写入体格检查map - list.get(0).setWifePhysiqueCheck(wifePhysiqueCheck); - } - //男性档案同步 - 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("heartRate", premaritalCheckup2.getHeartRate()); - //睾丸(单选,选择扪及/未们及) - husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan()); - //睾丸体积左右 - husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft()); - husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight()); - //抽血编号 - list.get(0).setHusbandCxNum(premaritalCheckup2.getCxNum()); - //写入体格检查map - list.get(0).setHusbandPhysiqueCheck(husbandPhysiqueCheck); - } - } BaseResponse baseResponse = new BaseResponse(); baseResponse.setObject(list); @@ -776,6 +736,48 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen } } + + //隆化 婚检同步信息(女) + if (StringUtils.isNotEmpty(cardNo)) { + //这里cardno传入是男性证件num,所以用配偶证件num + //女性档案同步 + PremaritalCheckup premaritalCheckup=mongoTemplate.findOne(Query.query(Criteria.where("spouseCertificateNum").is(cardNo)), PremaritalCheckup.class); + if(null!=premaritalCheckup){ + Map wifeBaseInfo =new HashMap<>(); + //末次月经 + wifeBaseInfo.put("lastMenses",premaritalCheckup.getLastMenses()); + Map wifePhysiqueCheck =new HashMap<>(); + //血压 + wifePhysiqueCheck.put("bp", premaritalCheckup.getBp()); + //心率 + wifePhysiqueCheck.put("heartRate", premaritalCheckup.getHeartRate()); + //抽血编号 + map.put("wifeCxNum",premaritalCheckup.getCxNum()); + //写入一般情况map + map.put("wifeBaseInfo",wifeBaseInfo); + //写入体格检查map + map.put("wifePhysiqueCheck",wifePhysiqueCheck); + } + //男性档案同步 + 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("heartRate", premaritalCheckup2.getHeartRate()); + //睾丸(单选,选择扪及/未们及) + husbandPhysiqueCheck.put("gaowan", premaritalCheckup2.getGaoWan()); + //睾丸体积左右 + husbandPhysiqueCheck.put("volumeLeft", premaritalCheckup2.getVolumeLeft()); + husbandPhysiqueCheck.put("volumeRight", premaritalCheckup2.getVolumeRight()); + //抽血编号 + map.put("husbandCxNum",premaritalCheckup2.getCxNum()); + //写入体格检查map + map.put("husbandPhysiqueCheck",husbandPhysiqueCheck); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); }