diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index d48e7dc..2020158 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -978,10 +978,8 @@ public class LhxfyService { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) { - //组装数据时区分男女 - preEugenicsBaseModel.setHusbandBaseInfo(new HashMap() {{ - put("sex", "01"); - }}); + //组装数据时区分男 + preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01"); }else { Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update3 = new Update().set("isUploadingYn.general"+i,0);//男 @@ -991,10 +989,8 @@ public class LhxfyService { } } else { if(null!=preEugenicsBaseModel.getWifeBaseInfo()) { - //组装数据时区分男女 - preEugenicsBaseModel.setWifeBaseInfo(new HashMap() {{ - put("sex", "02"); - }}); + //组装数据时区分女 + preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02"); }else { Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update3 = new Update().set("isUploadingYn.general"+i,0);//女 @@ -1037,10 +1033,8 @@ public class LhxfyService { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) { - //组装数据时区分男女 - preEugenicsBaseModel.setHusbandPhysiqueCheck(new HashMap() {{ - put("sex", "01"); - }}); + //组装数据时区分男 + preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01"); }else { Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男 @@ -1050,10 +1044,8 @@ public class LhxfyService { } } else { if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { - //组装数据时区分男女 - preEugenicsBaseModel.setWifePhysiqueCheck(new HashMap() {{ - put("sex", "02"); - }}); + //组装数据时区分女 + preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02"); }else { Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女 @@ -1096,10 +1088,8 @@ public class LhxfyService { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) { - //组装数据时区分男女 - preEugenicsBaseModel.setHusbandClinicalCheck(new HashMap() {{ - put("sex", "01"); - }}); + //组装数据时区分男 + preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); } else { Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男 @@ -1109,10 +1099,8 @@ public class LhxfyService { } } else { if (null != preEugenicsBaseModel.getWifeClinicalCheck()) { - //组装数据时区分男女 - preEugenicsBaseModel.setWifeClinicalCheck(new HashMap() {{ - put("sex", "02"); - }}); + //组装数据时区分女 + preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02"); } else { Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女 diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java index 8bfc1fd..534a0a1 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java @@ -184,6 +184,9 @@ public class LhxfyUploadingProvince { //上传孕前一般情况4.3 public String uploadingProvinceGeneral(Map baseInfo,String key,String documentId){ General general = new General(); + if("01".equals(baseInfo.get("sex"))){ + + } general.setKey(key); // 上传密钥 general.setAntenatalArchivesId(documentId); // 档案id(4.1接口上传成功后返回的档案id) general.setSex(baseInfo.get("sex").toString()); // 性别 01:男 02: 女