jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 399534be5bb21889b6a74b83e8cfbe4d4f444c76

Authored by shiyang
1 parent 003df47ee5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 15 additions and 24 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 399534b
... ... @@ -978,10 +978,8 @@
978 978 for (int i = 1; i <= 2; i++) {//男女分别上传
979 979 if (i == 1) {
980 980 if(null!=preEugenicsBaseModel.getHusbandBaseInfo()) {
981   - //组装数据时区分男女
982   - preEugenicsBaseModel.setHusbandBaseInfo(new HashMap<String, Object>() {{
983   - put("sex", "01");
984   - }});
  981 + //组装数据时区分男
  982 + preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01");
985 983 }else {
986 984 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
987 985 Update update3 = new Update().set("isUploadingYn.general"+i,0);//男
... ... @@ -991,10 +989,8 @@
991 989 }
992 990 } else {
993 991 if(null!=preEugenicsBaseModel.getWifeBaseInfo()) {
994   - //组装数据时区分男女
995   - preEugenicsBaseModel.setWifeBaseInfo(new HashMap<String, Object>() {{
996   - put("sex", "02");
997   - }});
  992 + //组装数据时区分女
  993 + preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02");
998 994 }else {
999 995 Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1000 996 Update update3 = new Update().set("isUploadingYn.general"+i,0);//女
... ... @@ -1037,10 +1033,8 @@
1037 1033 for (int i = 1; i <= 2; i++) {//男女分别上传
1038 1034 if (i == 1) {
1039 1035 if(null!=preEugenicsBaseModel.getHusbandPhysiqueCheck()) {
1040   - //组装数据时区分男女
1041   - preEugenicsBaseModel.setHusbandPhysiqueCheck(new HashMap<String, Object>() {{
1042   - put("sex", "01");
1043   - }});
  1036 + //组装数据时区分男
  1037 + preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01");
1044 1038 }else {
1045 1039 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1046 1040 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男
... ... @@ -1050,10 +1044,8 @@
1050 1044 }
1051 1045 } else {
1052 1046 if(null!=preEugenicsBaseModel.getWifePhysiqueCheck()) {
1053   - //组装数据时区分男女
1054   - preEugenicsBaseModel.setWifePhysiqueCheck(new HashMap<String, Object>() {{
1055   - put("sex", "02");
1056   - }});
  1047 + //组装数据时区分女
  1048 + preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02");
1057 1049 }else {
1058 1050 Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1059 1051 Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女
... ... @@ -1096,10 +1088,8 @@
1096 1088 for (int i = 1; i <= 2; i++) {//男女分别上传
1097 1089 if (i == 1) {
1098 1090 if (null != preEugenicsBaseModel.getHusbandClinicalCheck()) {
1099   - //组装数据时区分男女
1100   - preEugenicsBaseModel.setHusbandClinicalCheck(new HashMap<String, Object>() {{
1101   - put("sex", "01");
1102   - }});
  1091 + //组装数据时区分男
  1092 + preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01");
1103 1093 } else {
1104 1094 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1105 1095 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男
... ... @@ -1109,10 +1099,8 @@
1109 1099 }
1110 1100 } else {
1111 1101 if (null != preEugenicsBaseModel.getWifeClinicalCheck()) {
1112   - //组装数据时区分男女
1113   - preEugenicsBaseModel.setWifeClinicalCheck(new HashMap<String, Object>() {{
1114   - put("sex", "02");
1115   - }});
  1102 + //组装数据时区分女
  1103 + preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02");
1116 1104 } else {
1117 1105 Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));
1118 1106 Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ 399534b
... ... @@ -184,6 +184,9 @@
184 184 //上传孕前一般情况4.3
185 185 public String uploadingProvinceGeneral(Map<String,Object> baseInfo,String key,String documentId){
186 186 General general = new General();
  187 + if("01".equals(baseInfo.get("sex"))){
  188 +
  189 + }
187 190 general.setKey(key); // 上传密钥
188 191 general.setAntenatalArchivesId(documentId); // 档案id（4.1接口上传成功后返回的档案id）
189 192 general.setSex(baseInfo.get("sex").toString()); // 性别 01：男 02： 女