Commit cd5d492e0c55d5eeda57e1e5f95488498b7c04e8
1 parent
2631252d33
Exists in
master
and in
6 other branches
省平台孕前优生4.4完
Showing 4 changed files with 391 additions and 270 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
View file @
cd5d492
... | ... | @@ -436,6 +436,17 @@ |
436 | 436 | //隆化- 村级区划接口文档需要,隶属单位 村级区划(应是隶属单位下的区划)如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 |
437 | 437 | private String subUnitsVillage; |
438 | 438 | |
439 | + //隆化- 是否全部模块上传省平台成功。0:失败。1:成功(有一个模块上传失败也是0) | |
440 | + private Integer isUploadingProvince; | |
441 | + | |
442 | + public Integer getIsUploadingProvince() { | |
443 | + return isUploadingProvince; | |
444 | + } | |
445 | + | |
446 | + public void setIsUploadingProvince(Integer isUploadingProvince) { | |
447 | + this.isUploadingProvince = isUploadingProvince; | |
448 | + } | |
449 | + | |
439 | 450 | public String getSubUnitsVillage() { |
440 | 451 | return subUnitsVillage; |
441 | 452 | } |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
cd5d492
... | ... | @@ -951,310 +951,335 @@ |
951 | 951 | */ |
952 | 952 | private static final String URL = "http://39.101.222.193:8088";//测试 |
953 | 953 | private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key |
954 | - public void uploadingProvince(String id){ | |
955 | - try { | |
956 | - Query query = new Query(); | |
957 | - //documentId不存在的说明已经成功上传过。 | |
958 | - query.addCriteria(Criteria.where("id").is(id)); | |
959 | - List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); | |
960 | - for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { | |
961 | - //隆化- 村级区划接口文档需要,隶属单位 村级区划(应是隶属单位下的区划)如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 | |
962 | - preEugenicsBaseModel.setSubUnitsVillage("130825100227"); | |
963 | - //上传孕前档案基本信息4.1 | |
964 | - String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), | |
965 | - lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); | |
966 | - if(StringUtils.isNotEmpty(result1)){ | |
967 | - List<UploadResult> list1=JsonUtil.jsonToList(result1, UploadResult.class); | |
968 | - //成功后返回的documentId后面上传都要用到 | |
969 | - String documentId=list1.get(0).getDocumentId(); | |
970 | - if("0000".equals(list1.get(0).getCode())){ | |
971 | - Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
972 | - Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id | |
973 | - .set("isUploadingYn.archives", 0);//成功 | |
974 | - mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); | |
975 | - LogUtil.taskInfo("孕前档案基本信息上传成功"); | |
976 | - //上传孕前一般情况4.3 | |
977 | - if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
978 | - for (int i = 1; i <= 2; i++) {//男女分别上传 | |
979 | - if (i == 1) { | |
980 | - if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { | |
981 | - //组装数据时区分男 | |
982 | - preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01"); | |
983 | - }else { | |
984 | - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
985 | - Update update3 = new Update().set("isUploadingYn.general"+i,0);//男 | |
986 | - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
987 | - LogUtil.taskInfo("孕前一般情况4.3,(男)没有录入数据略过。"); | |
988 | - break; | |
989 | - } | |
990 | - } else { | |
991 | - if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
992 | - //组装数据时区分女 | |
993 | - preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02"); | |
994 | - }else { | |
995 | - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
996 | - Update update3 = new Update().set("isUploadingYn.general"+i,0);//女 | |
997 | - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
998 | - LogUtil.taskInfo("孕前一般情况4.3,(女)没有录入数据略过。"); | |
999 | - break; | |
1000 | - } | |
954 | + public void uploadingProvince(List<String> ids){ | |
955 | + Query query = new Query(); | |
956 | + //指定ID上传。 | |
957 | + query.addCriteria(Criteria.where("id").in(ids)); | |
958 | + List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); | |
959 | + for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { | |
960 | + //隆化- 村级区划接口文档需要,隶属单位 村级区划(应是隶属单位下的区划)如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 | |
961 | + preEugenicsBaseModel.setSubUnitsVillage("130825100227"); | |
962 | + //上传孕前档案基本信息4.1 | |
963 | + String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), | |
964 | + lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); | |
965 | + if(StringUtils.isNotEmpty(result1)){ | |
966 | + List<UploadResult> list1=JsonUtil.jsonToList(result1, UploadResult.class); | |
967 | + //成功后返回的documentId后面上传都要用到 | |
968 | + String documentId=list1.get(0).getDocumentId(); | |
969 | + if("0000".equals(list1.get(0).getCode())){ | |
970 | + Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
971 | + Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id | |
972 | + .set("isUploadingYn.archives", 0);//成功 | |
973 | + mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); | |
974 | + LogUtil.taskInfo("孕前档案基本信息上传成功"); | |
975 | + //上传孕前一般情况4.3 | |
976 | + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
977 | + for (int i = 1; i <= 2; i++) {//男女分别上传 | |
978 | + if (i == 1) { | |
979 | + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { | |
980 | + //组装数据时区分男 | |
981 | + preEugenicsBaseModel.getHusbandBaseInfo().put("sex", "01"); | |
982 | + }else { | |
983 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
984 | + Update update3 = new Update().set("isUploadingYn.general"+i,0);//男 | |
985 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
986 | + LogUtil.taskInfo("孕前一般情况4.3,(男)没有录入数据略过。"); | |
987 | + break; | |
1001 | 988 | } |
1002 | - String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") | |
1003 | - , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId)); | |
1004 | - if (StringUtils.isNotEmpty(result3)) { | |
1005 | - List<UploadResult> list3 = JsonUtil.jsonToList(result3, UploadResult.class); | |
1006 | - if ("0000".equals(list3.get(0).getCode())) { | |
1007 | - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1008 | - Update update3 = new Update().set("isUploadingYn.general" + i, 1);//成功。general1:男,general2:女 | |
1009 | - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1010 | - LogUtil.taskInfo("孕前一般情况上传成功"); | |
1011 | - } else { | |
1012 | - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1013 | - Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1:男,general2:女 | |
1014 | - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1015 | - LogUtil.error("服务器返回:上传失败,list3。code:" | |
1016 | - + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null); | |
1017 | - } | |
989 | + } else { | |
990 | + if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { | |
991 | + //组装数据时区分女 | |
992 | + preEugenicsBaseModel.getWifeBaseInfo().put("sex", "02"); | |
993 | + }else { | |
994 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
995 | + Update update3 = new Update().set("isUploadingYn.general"+i,0);//女 | |
996 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
997 | + LogUtil.taskInfo("孕前一般情况4.3,(女)没有录入数据略过。"); | |
998 | + break; | |
999 | + } | |
1000 | + } | |
1001 | + String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") | |
1002 | + , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId)); | |
1003 | + if (StringUtils.isNotEmpty(result3)) { | |
1004 | + List<UploadResult> list3 = JsonUtil.jsonToList(result3, UploadResult.class); | |
1005 | + if ("0000".equals(list3.get(0).getCode())) { | |
1006 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1007 | + Update update3 = new Update().set("isUploadingYn.general" + i, 1);//成功。general1:男,general2:女 | |
1008 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1009 | + LogUtil.taskInfo("孕前一般情况上传成功"); | |
1018 | 1010 | } else { |
1019 | 1011 | Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1020 | 1012 | Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1:男,general2:女 |
1021 | 1013 | mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); |
1022 | - LogUtil.taskError("上传异常:result3=HttpClientUtil.doWebServicePost", null); | |
1014 | + LogUtil.error("服务器返回:上传失败,list3。code:" | |
1015 | + + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null); | |
1023 | 1016 | } |
1017 | + } else { | |
1018 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1019 | + Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1:男,general2:女 | |
1020 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1021 | + LogUtil.taskError("上传异常:result3=HttpClientUtil.doWebServicePost", null); | |
1024 | 1022 | } |
1025 | - }else{ | |
1026 | - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1027 | - Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女 | |
1028 | - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1029 | - LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); | |
1030 | 1023 | } |
1031 | - //上传孕前体格检查4.4 | |
1032 | - if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
1033 | - for (int i = 1; i <= 2; i++) {//男女分别上传 | |
1034 | - if (i == 1) { | |
1035 | - if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { | |
1036 | - //组装数据时区分男 | |
1037 | - preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01"); | |
1038 | - }else { | |
1039 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1040 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男 | |
1041 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1042 | - LogUtil.taskInfo("孕前体格检查4.4,(男)没有录入数据略过。"); | |
1043 | - break; | |
1044 | - } | |
1045 | - } else { | |
1046 | - if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
1047 | - //组装数据时区分女 | |
1048 | - preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02"); | |
1049 | - }else { | |
1050 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1051 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女 | |
1052 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1053 | - LogUtil.taskInfo("孕前体格检查4.4,(女)没有录入数据略过。"); | |
1054 | - break; | |
1055 | - } | |
1024 | + }else{ | |
1025 | + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1026 | + Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女 | |
1027 | + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); | |
1028 | + LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); | |
1029 | + } | |
1030 | + //上传孕前体格检查4.4 | |
1031 | + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
1032 | + for (int i = 1; i <= 2; i++) {//男女分别上传 | |
1033 | + if (i == 1) { | |
1034 | + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { | |
1035 | + //组装数据时区分男 | |
1036 | + preEugenicsBaseModel.getHusbandPhysiqueCheck().put("sex", "01"); | |
1037 | + }else { | |
1038 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1039 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//男 | |
1040 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1041 | + LogUtil.taskInfo("孕前体格检查4.4,(男)没有录入数据略过。"); | |
1042 | + break; | |
1056 | 1043 | } |
1057 | - String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") | |
1058 | - , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); | |
1059 | - if (StringUtils.isNotEmpty(result4)) { | |
1060 | - List<UploadResult> list4 = JsonUtil.jsonToList(result4, UploadResult.class); | |
1061 | - if ("0000".equals(list4.get(0).getCode())) { | |
1062 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1063 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功 | |
1064 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1065 | - LogUtil.taskInfo("孕前体格检查上传成功"); | |
1066 | - } else { | |
1067 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1068 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 | |
1069 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1070 | - LogUtil.error("服务器返回:上传失败,list4。code:" | |
1071 | - + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null); | |
1072 | - } | |
1044 | + } else { | |
1045 | + if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { | |
1046 | + //组装数据时区分女 | |
1047 | + preEugenicsBaseModel.getWifePhysiqueCheck().put("sex", "02"); | |
1048 | + }else { | |
1049 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1050 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i,0);//女 | |
1051 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1052 | + LogUtil.taskInfo("孕前体格检查4.4,(女)没有录入数据略过。"); | |
1053 | + break; | |
1054 | + } | |
1055 | + } | |
1056 | + String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") | |
1057 | + , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); | |
1058 | + if (StringUtils.isNotEmpty(result4)) { | |
1059 | + List<UploadResult> list4 = JsonUtil.jsonToList(result4, UploadResult.class); | |
1060 | + if ("0000".equals(list4.get(0).getCode())) { | |
1061 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1062 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功 | |
1063 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1064 | + LogUtil.taskInfo("孕前体格检查上传成功"); | |
1073 | 1065 | } else { |
1074 | 1066 | Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1075 | 1067 | Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 |
1076 | 1068 | mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); |
1077 | - LogUtil.taskError("上传异常:result4=HttpClientUtil.doWebServicePost", null); | |
1069 | + LogUtil.error("服务器返回:上传失败,list4。code:" | |
1070 | + + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null); | |
1078 | 1071 | } |
1072 | + } else { | |
1073 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1074 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 | |
1075 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1076 | + LogUtil.taskError("上传异常:result4=HttpClientUtil.doWebServicePost", null); | |
1079 | 1077 | } |
1080 | - }else { | |
1081 | - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1082 | - Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女 | |
1083 | - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1084 | - LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); | |
1085 | 1078 | } |
1086 | - //上传孕前临床检验4.5 | |
1087 | - if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
1088 | - for (int i = 1; i <= 2; i++) {//男女分别上传 | |
1089 | - if (i == 1) { | |
1090 | - if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { | |
1091 | - //组装数据时区分男 | |
1092 | - preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); | |
1093 | - } else { | |
1094 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1095 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男 | |
1096 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1097 | - LogUtil.taskInfo("孕前临床检验4.5,(男)没有录入数据略过。"); | |
1098 | - break; | |
1099 | - } | |
1079 | + }else { | |
1080 | + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1081 | + Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女 | |
1082 | + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); | |
1083 | + LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); | |
1084 | + } | |
1085 | + //上传孕前临床检验4.5 | |
1086 | + if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
1087 | + for (int i = 1; i <= 2; i++) {//男女分别上传 | |
1088 | + if (i == 1) { | |
1089 | + if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { | |
1090 | + //组装数据时区分男 | |
1091 | + preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); | |
1100 | 1092 | } else { |
1101 | - if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
1102 | - //组装数据时区分女 | |
1103 | - preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02"); | |
1104 | - } else { | |
1105 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1106 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女 | |
1107 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1108 | - LogUtil.taskInfo("孕前临床检验4.5,(女)没有录入数据略过。"); | |
1109 | - break; | |
1110 | - } | |
1093 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1094 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男 | |
1095 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1096 | + LogUtil.taskInfo("孕前临床检验4.5,(男)没有录入数据略过。"); | |
1097 | + break; | |
1111 | 1098 | } |
1112 | - String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") | |
1113 | - , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); | |
1114 | - if (StringUtils.isNotEmpty(result5)) { | |
1115 | - List<UploadResult> list5 = JsonUtil.jsonToList(result5, UploadResult.class); | |
1116 | - if ("0000".equals(list5.get(0).getCode())) { | |
1117 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1118 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功 | |
1119 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1120 | - LogUtil.taskInfo("孕前临床检验上传成功"); | |
1121 | - } else { | |
1122 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1123 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
1124 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1125 | - LogUtil.error("服务器返回:上传失败,list5。code:" | |
1126 | - + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); | |
1127 | - } | |
1099 | + } else { | |
1100 | + if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { | |
1101 | + //组装数据时区分女 | |
1102 | + preEugenicsBaseModel.getWifeClinicalCheck().put("sex", "02"); | |
1128 | 1103 | } else { |
1129 | 1104 | Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1130 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
1105 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女 | |
1131 | 1106 | mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); |
1132 | - LogUtil.taskError("上传异常:result5=HttpClientUtil.doWebServicePost", null); | |
1107 | + LogUtil.taskInfo("孕前临床检验4.5,(女)没有录入数据略过。"); | |
1108 | + break; | |
1133 | 1109 | } |
1134 | 1110 | } |
1135 | - }else { | |
1136 | - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1137 | - Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女 | |
1138 | - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1139 | - LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); | |
1140 | - } | |
1141 | - //上传孕前妇科B超检查4.6 | |
1142 | - if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { | |
1143 | - String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") | |
1144 | - , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); | |
1145 | - if (StringUtils.isNotEmpty(result6)) { | |
1146 | - List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class); | |
1147 | - if ("0000".equals(list6.get(0).getCode())) { | |
1148 | - Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1149 | - Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 | |
1150 | - mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
1151 | - LogUtil.taskInfo("孕前妇科B超检查上传成功"); | |
1111 | + String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") | |
1112 | + , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); | |
1113 | + if (StringUtils.isNotEmpty(result5)) { | |
1114 | + List<UploadResult> list5 = JsonUtil.jsonToList(result5, UploadResult.class); | |
1115 | + if ("0000".equals(list5.get(0).getCode())) { | |
1116 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1117 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功 | |
1118 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1119 | + LogUtil.taskInfo("孕前临床检验上传成功"); | |
1152 | 1120 | } else { |
1153 | - Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1154 | - Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 | |
1155 | - mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
1156 | - LogUtil.error("服务器返回:上传失败,list6。code:" | |
1157 | - + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); | |
1121 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1122 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
1123 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1124 | + LogUtil.error("服务器返回:上传失败,list5。code:" | |
1125 | + + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); | |
1158 | 1126 | } |
1159 | 1127 | } else { |
1128 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1129 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 | |
1130 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1131 | + LogUtil.taskError("上传异常:result5=HttpClientUtil.doWebServicePost", null); | |
1132 | + } | |
1133 | + } | |
1134 | + }else { | |
1135 | + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1136 | + Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女 | |
1137 | + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); | |
1138 | + LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); | |
1139 | + } | |
1140 | + //上传孕前妇科B超检查4.6 | |
1141 | + if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { | |
1142 | + String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") | |
1143 | + , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); | |
1144 | + if (StringUtils.isNotEmpty(result6)) { | |
1145 | + List<UploadResult> list6 = JsonUtil.jsonToList(result6, UploadResult.class); | |
1146 | + if ("0000".equals(list6.get(0).getCode())) { | |
1160 | 1147 | Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1148 | + Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 | |
1149 | + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
1150 | + LogUtil.taskInfo("孕前妇科B超检查上传成功"); | |
1151 | + } else { | |
1152 | + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1161 | 1153 | Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 |
1162 | 1154 | mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); |
1163 | - LogUtil.taskError("上传异常:result6=HttpClientUtil.doWebServicePost", null); | |
1155 | + LogUtil.error("服务器返回:上传失败,list6。code:" | |
1156 | + + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); | |
1164 | 1157 | } |
1165 | - }else { | |
1158 | + } else { | |
1166 | 1159 | Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1167 | - Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入 | |
1160 | + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 | |
1168 | 1161 | mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); |
1169 | - LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null); | |
1162 | + LogUtil.taskError("上传异常:result6=HttpClientUtil.doWebServicePost", null); | |
1170 | 1163 | } |
1171 | - //上传孕前检查结果及评估建议4.7 | |
1172 | - /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") | |
1173 | - ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); | |
1174 | - if(StringUtils.isNotEmpty(result7)){ | |
1175 | - List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class); | |
1176 | - if("0000".equals(list7.get(0).getCode())){ | |
1177 | - Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1178 | - Update update7 = new Update().set("isUploadingYn.resultAdvice", 1);//成功 | |
1179 | - mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); | |
1180 | - LogUtil.taskInfo("孕前检查结果及评估建议上传成功"); | |
1181 | - }else { | |
1182 | - Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1183 | - Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 | |
1184 | - mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); | |
1185 | - LogUtil.error("服务器返回:上传失败,list7。code:" | |
1186 | - +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null); | |
1187 | - } | |
1164 | + }else { | |
1165 | + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1166 | + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入 | |
1167 | + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); | |
1168 | + LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null); | |
1169 | + } | |
1170 | + //上传孕前检查结果及评估建议4.7 | |
1171 | + String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") | |
1172 | + ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); | |
1173 | + if(StringUtils.isNotEmpty(result7)){ | |
1174 | + List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class); | |
1175 | + if("0000".equals(list7.get(0).getCode())){ | |
1176 | + Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1177 | + Update update7 = new Update().set("isUploadingYn.resultAdvice", 1);//成功 | |
1178 | + mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); | |
1179 | + LogUtil.taskInfo("孕前检查结果及评估建议上传成功"); | |
1188 | 1180 | }else { |
1189 | 1181 | Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1190 | 1182 | Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 |
1191 | 1183 | mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); |
1192 | - LogUtil.taskError("上传异常:result7=HttpClientUtil.doWebServicePost",null); | |
1193 | - }*/ | |
1194 | - //上传孕前早孕随访4.8 | |
1195 | - /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") | |
1196 | - ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); | |
1197 | - if(StringUtils.isNotEmpty(result8)){ | |
1198 | - List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class); | |
1199 | - if("0000".equals(list8.get(0).getCode())){ | |
1200 | - Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1201 | - Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 1);//成功 | |
1202 | - mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); | |
1203 | - LogUtil.taskInfo("孕前早孕随访上传成功"); | |
1204 | - }else { | |
1205 | - Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1206 | - Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 | |
1207 | - mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); | |
1208 | - LogUtil.error("服务器返回:上传失败,list8。code:" | |
1209 | - +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null); | |
1210 | - } | |
1184 | + LogUtil.error("服务器返回:上传失败,list7。code:" | |
1185 | + +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null); | |
1186 | + } | |
1187 | + }else { | |
1188 | + Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1189 | + Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 | |
1190 | + mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); | |
1191 | + LogUtil.taskError("上传异常:result7=HttpClientUtil.doWebServicePost",null); | |
1192 | + } | |
1193 | + //上传孕前早孕随访4.8 | |
1194 | + /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") | |
1195 | + ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); | |
1196 | + if(StringUtils.isNotEmpty(result8)){ | |
1197 | + List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class); | |
1198 | + if("0000".equals(list8.get(0).getCode())){ | |
1199 | + Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1200 | + Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 1);//成功 | |
1201 | + mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); | |
1202 | + LogUtil.taskInfo("孕前早孕随访上传成功"); | |
1211 | 1203 | }else { |
1212 | 1204 | Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1213 | 1205 | Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 |
1214 | 1206 | mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); |
1215 | - LogUtil.taskError("上传异常:result8=HttpClientUtil.doWebServicePost",null); | |
1216 | - }*/ | |
1217 | - //上传孕前妊娠结局4.9 | |
1218 | - /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") | |
1219 | - ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); | |
1220 | - if(StringUtils.isNotEmpty(result9)){ | |
1221 | - List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class); | |
1222 | - if("0000".equals(list9.get(0).getCode())){ | |
1223 | - Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1224 | - Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 1);//成功 | |
1225 | - mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); | |
1226 | - LogUtil.taskInfo("孕前妊娠结局上传成功"); | |
1227 | - }else { | |
1228 | - Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1229 | - Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 | |
1230 | - mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); | |
1231 | - LogUtil.error("服务器返回:上传失败,list8。code:" | |
1232 | - +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null); | |
1233 | - } | |
1207 | + LogUtil.error("服务器返回:上传失败,list8。code:" | |
1208 | + +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null); | |
1209 | + } | |
1210 | + }else { | |
1211 | + Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1212 | + Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 | |
1213 | + mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); | |
1214 | + LogUtil.taskError("上传异常:result8=HttpClientUtil.doWebServicePost",null); | |
1215 | + }*/ | |
1216 | + //上传孕前妊娠结局4.9 | |
1217 | + /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") | |
1218 | + ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); | |
1219 | + if(StringUtils.isNotEmpty(result9)){ | |
1220 | + List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class); | |
1221 | + if("0000".equals(list9.get(0).getCode())){ | |
1222 | + Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1223 | + Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 1);//成功 | |
1224 | + mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); | |
1225 | + LogUtil.taskInfo("孕前妊娠结局上传成功"); | |
1234 | 1226 | }else { |
1235 | 1227 | Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1236 | 1228 | Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 |
1237 | 1229 | mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); |
1238 | - LogUtil.taskError("上传异常:result9=HttpClientUtil.doWebServicePost",null); | |
1239 | - }*/ | |
1240 | - | |
1230 | + LogUtil.error("服务器返回:上传失败,list8。code:" | |
1231 | + +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null); | |
1232 | + } | |
1241 | 1233 | }else { |
1242 | - Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1243 | - Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 | |
1244 | - mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); | |
1245 | - LogUtil.taskError("服务器返回:上传失败,list1。code:" | |
1246 | - +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); | |
1247 | - } | |
1234 | + Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1235 | + Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 | |
1236 | + mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); | |
1237 | + LogUtil.taskError("上传异常:result9=HttpClientUtil.doWebServicePost",null); | |
1238 | + }*/ | |
1239 | + | |
1248 | 1240 | }else { |
1249 | 1241 | Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); |
1250 | 1242 | Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 |
1251 | 1243 | mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); |
1252 | - LogUtil.taskError("上传异常:result1=HttpClientUtil.doWebServicePost",null); | |
1244 | + LogUtil.taskError("服务器返回:上传失败,list1。code:" | |
1245 | + +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); | |
1253 | 1246 | } |
1247 | + }else { | |
1248 | + Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1249 | + Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 | |
1250 | + mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); | |
1251 | + LogUtil.taskError("上传异常:result1=HttpClientUtil.doWebServicePost",null); | |
1254 | 1252 | } |
1253 | + //整个上传结果更新到结果字段 | |
1254 | + PreEugenicsBaseModel model= mongoTemplate.findById(preEugenicsBaseModel.getId(), PreEugenicsBaseModel.class); | |
1255 | + if(!model.getIsUploadingYn().isEmpty()){ | |
1256 | + Map<String,Integer> map=model.getIsUploadingYn(); | |
1257 | + if(map.get("archives")!=null&&map.get("general1")!=null&&map.get("general2")!=null | |
1258 | + &&map.get("physiqueCheck1")!=null&&map.get("physiqueCheck2")!=null&&map.get("clinicalCheck1")!=null | |
1259 | + &&map.get("clinicalCheck2")!=null&&map.get("bCheck")!=null&&map.get("resultAdvice")!=null){ | |
1260 | + //全部模块成功才会更新该字段0失败 1成功 | |
1261 | + if(map.get("archives")==1&&map.get("general1")==1&&map.get("general2")==1 | |
1262 | + &&map.get("physiqueCheck1")==1&&map.get("physiqueCheck2")==1&&map.get("clinicalCheck1")==1 | |
1263 | + &&map.get("clinicalCheck2")==1&&map.get("bCheck")==1&&map.get("resultAdvice")==1){ | |
1264 | + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1265 | + Update update = new Update().set("isUploadingProvince", 1); | |
1266 | + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); | |
1267 | + }else{ | |
1268 | + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1269 | + Update update = new Update().set("isUploadingProvince", 0); | |
1270 | + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); | |
1271 | + } | |
1272 | + }else { | |
1273 | + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1274 | + Update update = new Update().set("isUploadingProvince", 0); | |
1275 | + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); | |
1276 | + } | |
1255 | 1277 | |
1256 | - } catch (Exception e) { | |
1257 | - e.printStackTrace(); | |
1278 | + }else { | |
1279 | + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); | |
1280 | + Update update = new Update().set("isUploadingProvince", 0); | |
1281 | + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); | |
1282 | + } | |
1258 | 1283 | } |
1259 | 1284 | } |
1260 | 1285 |
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
View file @
cd5d492
... | ... | @@ -47,7 +47,8 @@ |
47 | 47 | public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){ |
48 | 48 | Archives archives=new Archives(); |
49 | 49 | archives.setKey(key);// 上传需要的密钥 |
50 | - archives.setDocName(baseModel.getDoctor());// 医师签名 | |
50 | + Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor())); | |
51 | + archives.setDocName(users.getName());// 医师签名 | |
51 | 52 | archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期 |
52 | 53 | archives.setIsCharge("01");// 收费类型 01 免费 02 收费 |
53 | 54 | //医院名称 |
... | ... | @@ -182,7 +183,7 @@ |
182 | 183 | general.setAntenatalArchivesId(documentId); // 档案id(4.1接口上传成功后返回的档案id) |
183 | 184 | general.setSex(baseInfo.get("sex").toString()); // 性别 01:男 02: 女 |
184 | 185 | //男性特有 |
185 | - if("01".equals(baseInfo.get("sex"))){ | |
186 | + if("01".equals(baseInfo.get("sex").toString())){ | |
186 | 187 | //未患有以下男科疾病(男科疾病相关字段sex为02时不用传,为01时必须传)1:是(未患有) 2:否(患有) |
187 | 188 | if(CollectionUtils.isNotEmpty((List<String>)baseInfo.get("nkjb"))){ |
188 | 189 | List<String> nkjb=(List<String>)baseInfo.get("nkjb"); |
... | ... | @@ -813,12 +814,8 @@ |
813 | 814 | } |
814 | 815 | } |
815 | 816 | general.setVisitTime(null!=baseInfo.get("fillDate")?baseInfo.get("fillDate").toString():DateUtil.getyyyy_MM_dd(new Date())); // 访问时间 |
816 | - if(null!=baseInfo.get("doctor")){ | |
817 | - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); | |
818 | - general.setDocName(users.getName());// 医生签名 | |
819 | - }else { | |
820 | - general.setDocName("医生"); // 医生签名 | |
821 | - } | |
817 | + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); | |
818 | + general.setDocName(users.getName());// 医生签名 | |
822 | 819 | general.setExamination(null); // 是否同步到婚检1:是 2:否(系统没有字段) |
823 | 820 | general.setSurgeryHistoryType(null); // 手术史01:无 02:有(系统没有字段) |
824 | 821 | general.setSurgeryHistory(null); // 手术史详情(系统没有字段) |
825 | 822 | |
... | ... | @@ -832,14 +829,101 @@ |
832 | 829 | } |
833 | 830 | //上传孕前体格检查4.4 |
834 | 831 | public String uploadingProvincePhysiqueCheck(Map<String,Object> baseInfo,String key,String documentId){ |
835 | - Map<String,Object> data=new HashMap<>(); | |
836 | - String json=""; | |
837 | - if (StringUtils.isNotEmpty(json)) | |
838 | - { | |
839 | - List<UploadResult> list =JsonUtil.jsonToList(json, UploadResult.class); | |
840 | - System.out.println(list); | |
832 | + PhysiqueCheck physiqueCheck =new PhysiqueCheck(); | |
833 | + physiqueCheck.setKey(key);// 上传密钥 | |
834 | + physiqueCheck.setAntenatalArchivesId(documentId);// 档案id(4.1接口上传成 | |
835 | + physiqueCheck.setSex(baseInfo.get("sex").toString());// 性别 01 :男 02: 女 | |
836 | + //男性 | |
837 | + if("01".equals(baseInfo.get("sex").toString())){ | |
838 | + physiqueCheck.setAdamApple(((List<Object>)baseInfo.get("houjie")).get(1).toString());// 喉结异常详情 | |
839 | + physiqueCheck.setAdamAppleType(((List<Object>)baseInfo.get("houjie")).get(0).toString().equals("1")?"01":"02");//喉结01:有 02:无 | |
840 | + physiqueCheck.setEpididymisType(((List<Object>)baseInfo.get("fugao")).get(0).toString().equals("0")?"01":"02");//附睾01:正常 02:异常 | |
841 | + physiqueCheck.setEpididymis(((List<Object>)baseInfo.get("fugao")).get(1).toString());// 附睾异常 | |
842 | + physiqueCheck.setForeskinType(baseInfo.get("baopi").toString().equals("0")?"01":baseInfo.get("baopi").toString().equals("1")?"02":"03");//包皮01:正常 02:过长03:包茎 | |
843 | + physiqueCheck.setPenis(((List<Object>)baseInfo.get("yinjin")).get(1).toString());// 阴茎异常详情 | |
844 | + physiqueCheck.setPenisType(((List<Object>)baseInfo.get("yinjin")).get(0).toString().equals("0")?"01":"02");//阴茎01:正常 02:异常 | |
845 | + physiqueCheck.setSpermaduct(((List<Object>)baseInfo.get("sjg")).get(1).toString());// 输精管异常详情 | |
846 | + physiqueCheck.setSpermaductType(((List<Object>)baseInfo.get("sjg")).get(0).toString().equals("0")?"01":"02");//输精管01:未见异常 02:异常 | |
847 | + String testesType=((List<Object>)baseInfo.get("gaowan")).get(0).toString(); | |
848 | + physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01:扪及 02:左侧未扪及03:右侧未扪及04:双侧未扪及(04系统没有选项) | |
849 | + physiqueCheck.setLeftVolume(((List<Object>)baseInfo.get("gaowan")).get(3).toString());// 睾丸左体积 | |
850 | + physiqueCheck.setRightVolume(((List<Object>)baseInfo.get("gaowan")).get(4).toString());// 睾丸右体积 | |
851 | + physiqueCheck.setVaricoceleDegree(((List<Object>)baseInfo.get("jsjmqz")).get(2).toString());// 精索静脉曲张程度 | |
852 | + physiqueCheck.setVaricocelePart(((List<Object>)baseInfo.get("jsjmqz")).get(1).toString());// 精索静脉曲张部位 | |
853 | + physiqueCheck.setVaricoceleType(((List<Object>)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");// 精索静脉曲张 01无 02有 | |
854 | + physiqueCheck.setRightNodules(null);// 右结节(系统没有字段) | |
855 | + physiqueCheck.setLeftNodules(null);// 左结节(系统没有字段) | |
856 | + }else {//女性 | |
857 | + physiqueCheck.setAttachment(((List<Object>)baseInfo.get("zgscfj")).get(1).toString());// 双侧附件异常详情 | |
858 | + physiqueCheck.setAttachmentCheck(null);// 附件(系统没有字段) | |
859 | + physiqueCheck.setAttachmentType(((List<Object>)baseInfo.get("zgscfj")).get(0).toString().equals("0")?"01":"02");//双侧附件01:未见异常 02:异常 | |
860 | + physiqueCheck.setBreast(((List<Object>)baseInfo.get("rufang")).get(1).toString());// 乳房异常详情 | |
861 | + physiqueCheck.setBreastType(((List<Object>)baseInfo.get("rufang")).get(0).toString().equals("0")?"01":"02");//乳房01:正常 02:异常 | |
862 | + | |
863 | + physiqueCheck.setCervicalCheck(null);// 宫颈(系统没有字段) | |
864 | + physiqueCheck.setCervical(((List<Object>)baseInfo.get("gongjing")).get(1).toString());// 宫颈异常详情 | |
865 | + physiqueCheck.setCervicalType(((List<Object>)baseInfo.get("gongjing")).get(0).toString().equals("0")?"01":"02");//宫颈 01正常02异常 | |
866 | + physiqueCheck.setSecretion(((List<Object>)baseInfo.get("fmw")).get(1).toString());// 分泌物异常详情 | |
867 | + physiqueCheck.setSecretionType(((List<Object>)baseInfo.get("fmw")).get(0).toString().equals("0")?"01":"02");//分泌物01:未见异常 02:异常 | |
868 | + physiqueCheck.setUterineActivityType(baseInfo.get("zghd").toString().equals("0")?"01":"02");//子宫活动01:好 02:差 | |
869 | + physiqueCheck.setUterinePieceType(((List<Object>)baseInfo.get("zgbk")).get(0).toString().equals("0")?"01":"02");//子宫包块01:无 02:有 | |
870 | + physiqueCheck.setUterineSizeType(baseInfo.get("zgdx").toString().equals("0")?"01":baseInfo.get("zgdx").toString().equals("1")?"02":"03");//子宫大小01:正常 02:大03:小 | |
871 | + physiqueCheck.setUterusCheck(null);// 子宫(系统没有字段) | |
872 | + physiqueCheck.setVaginaCheck(((List<Object>)baseInfo.get("yindao")).get(1).toString());// 阴道异常详情 | |
873 | + physiqueCheck.setVaginaCheckType(((List<Object>)baseInfo.get("yindao")).get(0).toString().equals("0")?"01":"02");//阴道01未见异常02异常 | |
874 | + physiqueCheck.setVulva(((List<Object>)baseInfo.get("waiyin")).get(1).toString());// 外阴异常 | |
875 | + physiqueCheck.setVulvaType(((List<Object>)baseInfo.get("waiyin")).get(0).toString().equals("0")?"01":"02");//外阴01:未见异常 02:异常 | |
876 | + physiqueCheck.setVulvaCheck(null);// 外阴(系统没有字段) | |
877 | + physiqueCheck.setNecessaryVaginaCheck(null);// 阴道(系统没有字段) | |
841 | 878 | } |
842 | - return JsonUtil.obj2Str(data); | |
879 | + | |
880 | + physiqueCheck.setHeight(baseInfo.get("height").toString());// 身高cm | |
881 | + physiqueCheck.setWeight(baseInfo.get("weight").toString());// 体重kg | |
882 | + physiqueCheck.setBmi(baseInfo.get("bmi").toString());// 体重指数kg/m² | |
883 | + physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率 | |
884 | + physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压(高) | |
885 | + physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压(低) | |
886 | + physiqueCheck.setMentalStateType(((List<Object>)baseInfo.get("jszt")).get(0).toString().equals("0")?"01":"02");// 精神状态类型01:正常 02:异 | |
887 | + physiqueCheck.setMentalState(((List<Object>)baseInfo.get("jszt")).get(1).toString());// 精神状态异常详情 | |
888 | + physiqueCheck.setIntelligenceType(((List<Object>)baseInfo.get("zl")).get(0).toString().equals("false")?"01":"02");// 智力类型 01:正常 02:异常 | |
889 | + physiqueCheck.setIntelligenceType1(((List<Object>)baseInfo.get("zlyc")).get(0).toString().equals("true")?"01":null);// 智力异常--常识 1:选中 | |
890 | + physiqueCheck.setIntelligenceType2(((List<Object>)baseInfo.get("zlyc")).get(1).toString().equals("true")?"01":null);// 智力异常--判断 1:选中 | |
891 | + physiqueCheck.setIntelligenceType3(((List<Object>)baseInfo.get("zlyc")).get(2).toString().equals("true")?"01":null);// 智力异常--记忆 1:选中 | |
892 | + physiqueCheck.setIntelligenceType4(((List<Object>)baseInfo.get("zlyc")).get(3).toString().equals("true")?"01":null);// 智力异常--计算 1:选中 | |
893 | + physiqueCheck.setFacialFeatureType(((List<Object>)baseInfo.get("wuguan")).get(0).toString().equals("0")?"01":"02");// 五官 01:正常 02:异常 | |
894 | + physiqueCheck.setFacialFeature(((List<Object>)baseInfo.get("wuguan")).get(1).toString());// 五官异常详情 | |
895 | + physiqueCheck.setSpecialPostureType(((List<Object>)baseInfo.get("tstt")).get(0).toString().equals("0")?"01":"02");// 特殊体态类型 01:无 0 | |
896 | + physiqueCheck.setSpecialPosture(((List<Object>)baseInfo.get("tstt")).get(1).toString());// 特殊体态异常详情 | |
897 | + physiqueCheck.setSpecialFaceType(((List<Object>)baseInfo.get("tsmr")).get(0).toString().equals("0")?"01":"02");// 特殊面容 01:无 02:有 | |
898 | + physiqueCheck.setSpecialFace(((List<Object>)baseInfo.get("tsmr")).get(1).toString());// 特殊面容异常详情 | |
899 | + physiqueCheck.setSkinHairType(((List<Object>)baseInfo.get("pfmf")).get(0).toString().equals("0")?"01":"02");// 皮肤毛发 01:正常 02:异常 | |
900 | + physiqueCheck.setSkinHair(((List<Object>)baseInfo.get("pfmf")).get(1).toString());// 皮肤毛发异常详情 | |
901 | + physiqueCheck.setThyroidGlandType(((List<Object>)baseInfo.get("jzx")).get(0).toString().equals("0")?"01":"02");// 甲状腺 01:正常02:异常 | |
902 | + physiqueCheck.setThyroidGland(((List<Object>)baseInfo.get("jzx")).get(1).toString());// 甲状腺异常详情 | |
903 | + physiqueCheck.setLungType(((List<Object>)baseInfo.get("feibu")).get(0).toString().equals("0")?"01":"02");// 肺 01:正常 02:异常 | |
904 | + physiqueCheck.setLung(((List<Object>)baseInfo.get("feibu")).get(1).toString());// 肺异常详情 | |
905 | + physiqueCheck.setHeartRhythmType(((List<Object>)baseInfo.get("xinlv")).get(0).toString().equals("0")?"01":"02");// 心脏节律是否整齐 01:是 02: | |
906 | + physiqueCheck.setHeartRhythm(((List<Object>)baseInfo.get("xinlv")).get(1).toString());// 心脏节律异常详情 | |
907 | + physiqueCheck.setHeartMurmurType(((List<Object>)baseInfo.get("xzzy")).get(0).toString().equals("0")?"01":"02");// 心脏杂音 01:无 02:有 | |
908 | + physiqueCheck.setHeartMurmur(((List<Object>)baseInfo.get("xzzy")).get(1).toString());// 心脏杂音异常详情 | |
909 | + physiqueCheck.setLiverSpleenType(((List<Object>)baseInfo.get("ganpi")).get(0).toString().equals("0")?"01":"02");// 肝脾 01:未触及 02:触及 | |
910 | + physiqueCheck.setLiverSpleen(((List<Object>)baseInfo.get("ganpi")).get(1).toString());// 肝脾触及详情 | |
911 | + physiqueCheck.setLimbSpinalType(((List<Object>)baseInfo.get("szjz")).get(0).toString().equals("0")?"01":"02");// 四肢脊柱 01:正常 02:异常 | |
912 | + physiqueCheck.setLimbSpinal(((List<Object>)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情 | |
913 | + physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他 | |
914 | + physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期 | |
915 | + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("checkDoctor").toString())); | |
916 | + physiqueCheck.setPhysicalCheckDoctor(users.getName());// 医生签名 | |
917 | + physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01:否 0 | |
918 | + physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段) | |
919 | + physiqueCheck.setPubicHairType(((List<Object>)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01:正常 02:异常 | |
920 | + physiqueCheck.setPubicHair(((List<Object>)baseInfo.get("yinmao")).get(1).toString());// 阴毛异常详情 | |
921 | + physiqueCheck.setIsPection(null);// 数据是否同步到婚检1:是 2:否(系统没有字段) | |
922 | + physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他 | |
923 | + physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期 | |
924 | + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); | |
925 | + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 | |
926 | + return JsonUtil.obj2Str(physiqueCheck); | |
843 | 927 | } |
844 | 928 | //上传孕前临床检验4.5 |
845 | 929 | public String uploadingProvinceClinicalCheck(Map<String,Object> baseInfo,String key,String documentId){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
View file @
cd5d492
... | ... | @@ -27,6 +27,7 @@ |
27 | 27 | import com.lyms.platform.operate.web.service.IPreEugenicsService; |
28 | 28 | |
29 | 29 | import java.util.Date; |
30 | +import java.util.List; | |
30 | 31 | |
31 | 32 | /** |
32 | 33 | * @author: shuai-Bo |
33 | 34 | |
... | ... | @@ -297,13 +298,13 @@ |
297 | 298 | } |
298 | 299 | /** |
299 | 300 | * 河北省孕前上传数据 |
300 | - * @param id | |
301 | + * @param ids | |
301 | 302 | */ |
302 | 303 | @ResponseBody |
303 | 304 | @TokenRequired |
304 | - @RequestMapping(value = "/uploadingProvince/{id}", method = RequestMethod.POST) | |
305 | - public BaseResponse uploadingProvince(@PathVariable("id")String id) { | |
306 | - lhxfyService.uploadingProvince(id); | |
305 | + @RequestMapping(value = "/uploadingProvince/{ids}", method = RequestMethod.POST) | |
306 | + public BaseResponse uploadingProvince(@PathVariable("ids") List<String> ids) { | |
307 | + lhxfyService.uploadingProvince(ids); | |
307 | 308 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
308 | 309 | } |
309 | 310 |