Commit 7377de84665e482dfa6b5f44ec0ce1797323a2b1
1 parent
399534be5b
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
7377de8
| ... | ... | @@ -974,10 +974,10 @@ |
| 974 | 974 | mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); |
| 975 | 975 | LogUtil.taskInfo("孕前档案基本信息上传成功"); |
| 976 | 976 | //上传孕前一般情况4.3 |
| 977 | - if(null!=preEugenicsBaseModel.getHusbandBaseInfo()||null!=preEugenicsBaseModel.getWifeBaseInfo()) { | |
| 977 | + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
| 978 | 978 | for (int i = 1; i <= 2; i++) {//男女分别上传 |
| 979 | 979 | if (i == 1) { |
| 980 | - if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) { | |
| 980 | + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { | |
| 981 | 981 | //组装数据时区分男 |
| 982 | 982 | preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01"); |
| 983 | 983 | }else { |
| ... | ... | @@ -988,7 +988,7 @@ |
| 988 | 988 | break; |
| 989 | 989 | } |
| 990 | 990 | } else { |
| 991 | - if(null!=preEugenicsBaseModel.getWifeBaseInfo()) { | |
| 991 | + if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
| 992 | 992 | //组装数据时区分女 |
| 993 | 993 | preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02"); |
| 994 | 994 | }else { |
| 995 | 995 | |
| ... | ... | @@ -1029,10 +1029,10 @@ |
| 1029 | 1029 | LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); |
| 1030 | 1030 | } |
| 1031 | 1031 | //上传孕前体格检查4.4 |
| 1032 | - if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()||null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { | |
| 1032 | + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
| 1033 | 1033 | for (int i = 1; i <= 2; i++) {//男女分别上传 |
| 1034 | 1034 | if (i == 1) { |
| 1035 | - if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) { | |
| 1035 | + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { | |
| 1036 | 1036 | //组装数据时区分男 |
| 1037 | 1037 | preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01"); |
| 1038 | 1038 | }else { |
| ... | ... | @@ -1043,7 +1043,7 @@ |
| 1043 | 1043 | break; |
| 1044 | 1044 | } |
| 1045 | 1045 | } else { |
| 1046 | - if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) { | |
| 1046 | + if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
| 1047 | 1047 | //组装数据时区分女 |
| 1048 | 1048 | preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02"); |
| 1049 | 1049 | }else { |
| 1050 | 1050 | |
| ... | ... | @@ -1084,10 +1084,10 @@ |
| 1084 | 1084 | LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); |
| 1085 | 1085 | } |
| 1086 | 1086 | //上传孕前临床检验4.5 |
| 1087 | - if(null!=preEugenicsBaseModel.getHusbandClinicalCheck()||null!=preEugenicsBaseModel.getWifeClinicalCheck()) { | |
| 1087 | + if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
| 1088 | 1088 | for (int i = 1; i <= 2; i++) {//男女分别上传 |
| 1089 | 1089 | if (i == 1) { |
| 1090 | - if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) { | |
| 1090 | + if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { | |
| 1091 | 1091 | //组装数据时区分男 |
| 1092 | 1092 | preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); |
| 1093 | 1093 | } else { |
| ... | ... | @@ -1098,7 +1098,7 @@ |
| 1098 | 1098 | break; |
| 1099 | 1099 | } |
| 1100 | 1100 | } else { |
| 1101 | - if (null != preEugenicsBaseModel.getWifeClinicalCheck()) { | |
| 1101 | + if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
| 1102 | 1102 | //组装数据时区分女 |
| 1103 | 1103 | preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02"); |
| 1104 | 1104 | } else { |
| ... | ... | @@ -1139,7 +1139,7 @@ |
| 1139 | 1139 | LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); |
| 1140 | 1140 | } |
| 1141 | 1141 | //上传孕前妇科B超检查4.6 |
| 1142 | - if(null!=preEugenicsBaseModel.getWifeBCheck()) { | |
| 1142 | + if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { | |
| 1143 | 1143 | String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") |
| 1144 | 1144 | , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); |
| 1145 | 1145 | if (StringUtils.isNotEmpty(result6)) { |