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 2020158..f425e30 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 @@ -974,10 +974,10 @@ public class LhxfyService { mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); LogUtil.taskInfo("孕前档案基本信息上传成功"); //上传孕前一般情况4.3 - if(null!=preEugenicsBaseModel.getHusbandBaseInfo()||null!=preEugenicsBaseModel.getWifeBaseInfo()) { + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { - if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) { + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { //组装数据时区分男 preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01"); }else { @@ -988,7 +988,7 @@ public class LhxfyService { break; } } else { - if(null!=preEugenicsBaseModel.getWifeBaseInfo()) { + if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { //组装数据时区分女 preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02"); }else { @@ -1029,10 +1029,10 @@ public class LhxfyService { LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); } //上传孕前体格检查4.4 - if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()||null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { - if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) { + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { //组装数据时区分男 preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01"); }else { @@ -1043,7 +1043,7 @@ public class LhxfyService { break; } } else { - if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { + if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { //组装数据时区分女 preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02"); }else { @@ -1084,10 +1084,10 @@ public class LhxfyService { LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); } //上传孕前临床检验4.5 - if(null!=preEugenicsBaseModel.getHusbandClinicalCheck()||null!=preEugenicsBaseModel.getWifeClinicalCheck()) { + if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { for (int i = 1; i <= 2; i++) {//男女分别上传 if (i == 1) { - if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) { + if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { //组装数据时区分男 preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); } else { @@ -1098,7 +1098,7 @@ public class LhxfyService { break; } } else { - if (null != preEugenicsBaseModel.getWifeClinicalCheck()) { + if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { //组装数据时区分女 preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02"); } else { @@ -1139,7 +1139,7 @@ public class LhxfyService { LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); } //上传孕前妇科B超检查4.6 - if(null!=preEugenicsBaseModel.getWifeBCheck()) { + if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); if (StringUtils.isNotEmpty(result6)) {