diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index 8ba1c38..c1900d5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -436,6 +436,17 @@ public class PreEugenicsBaseModel extends BaseModel { //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 private String subUnitsVillage; + //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0） + private Integer isUploadingProvince; + + public Integer getIsUploadingProvince() { + return isUploadingProvince; + } + + public void setIsUploadingProvince(Integer isUploadingProvince) { + this.isUploadingProvince = isUploadingProvince; + } + public String getSubUnitsVillage() { return subUnitsVillage; } 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 f425e30..08201d6 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 @@ -951,310 +951,335 @@ public class LhxfyService { */ private static final String URL = "http://39.101.222.193:8088";//测试 private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key - public void uploadingProvince(String id){ - try { - Query query = new Query(); - //documentId不存在的说明已经成功上传过。 - query.addCriteria(Criteria.where("id").is(id)); - List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); - for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { - //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 - preEugenicsBaseModel.setSubUnitsVillage("130825100227"); - //上传孕前档案基本信息4.1 - String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), - lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); - if(StringUtils.isNotEmpty(result1)){ - List list1=JsonUtil.jsonToList(result1, UploadResult.class); - //成功后返回的documentId后面上传都要用到 - String documentId=list1.get(0).getDocumentId(); - if("0000".equals(list1.get(0).getCode())){ - Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id - .set("isUploadingYn.archives", 0);//成功 - mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前档案基本信息上传成功"); - //上传孕前一般情况4.3 - if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { - for (int i = 1; i <= 2; i++) {//男女分别上传 - if (i == 1) { - if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { - //组装数据时区分男 - 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);//男 - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"); - break; - } - } else { - if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { - //组装数据时区分女 - 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);//女 - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"); - break; - } + public void uploadingProvince(List ids){ + Query query = new Query(); + //指定ID上传。 + query.addCriteria(Criteria.where("id").in(ids)); + List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); + for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { + //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 + preEugenicsBaseModel.setSubUnitsVillage("130825100227"); + //上传孕前档案基本信息4.1 + String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), + lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); + if(StringUtils.isNotEmpty(result1)){ + List list1=JsonUtil.jsonToList(result1, UploadResult.class); + //成功后返回的documentId后面上传都要用到 + String documentId=list1.get(0).getDocumentId(); + if("0000".equals(list1.get(0).getCode())){ + Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id + .set("isUploadingYn.archives", 0);//成功 + mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前档案基本信息上传成功"); + //上传孕前一般情况4.3 + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()||!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { + for (int i = 1; i <= 2; i++) {//男女分别上传 + if (i == 1) { + if(!preEugenicsBaseModel.getHusbandBaseInfo().isEmpty()) { + //组装数据时区分男 + 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);//男 + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前一般情况4.3,（男）没有录入数据略过。"); + break; } - String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") - , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId)); - if (StringUtils.isNotEmpty(result3)) { - List list3 = JsonUtil.jsonToList(result3, UploadResult.class); - if ("0000".equals(list3.get(0).getCode())) { - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update3 = new Update().set("isUploadingYn.general" + i, 1);//成功。general1：男，general2：女 - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前一般情况上传成功"); - } else { - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女 - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list3。code:" - + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null); - } + } else { + if(!preEugenicsBaseModel.getWifeBaseInfo().isEmpty()) { + //组装数据时区分女 + 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);//女 + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前一般情况4.3,（女）没有录入数据略过。"); + break; + } + } + String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") + , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId)); + if (StringUtils.isNotEmpty(result3)) { + List list3 = JsonUtil.jsonToList(result3, UploadResult.class); + if ("0000".equals(list3.get(0).getCode())) { + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update3 = new Update().set("isUploadingYn.general" + i, 1);//成功。general1：男，general2：女 + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前一般情况上传成功"); } else { Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女 mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result3=HttpClientUtil.doWebServicePost", null); + LogUtil.error("服务器返回：上传失败，list3。code:" + + list3.get(0).getCode() + ";msg:" + list3.get(0).getMsg() + ";type:" + list3.get(0).getType(), null); } + } else { + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update3 = new Update().set("isUploadingYn.general" + i, 0);//失败。general1：男，general2：女 + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result3=HttpClientUtil.doWebServicePost", null); } - }else{ - Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女 - mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); - LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); } - //上传孕前体格检查4.4 - if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { - for (int i = 1; i <= 2; i++) {//男女分别上传 - if (i == 1) { - if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { - //组装数据时区分男 - 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);//男 - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"); - break; - } - } else { - if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { - //组装数据时区分女 - 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);//女 - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"); - break; - } + }else{ + Query baseQuery3 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update3 = new Update().set("isUploadingYn.general1", 0).set("isUploadingYn.general2",0);//男和女 + mongoTemplate.updateFirst(baseQuery3, update3, PreEugenicsBaseModel.class); + LogUtil.taskError("孕前一般情况4.3,男女没有录入数据略过。",null); + } + //上传孕前体格检查4.4 + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()||!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { + for (int i = 1; i <= 2; i++) {//男女分别上传 + if (i == 1) { + if(!preEugenicsBaseModel.getHusbandPhysiqueCheck().isEmpty()) { + //组装数据时区分男 + 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);//男 + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前体格检查4.4,（男）没有录入数据略过。"); + break; } - String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") - , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); - if (StringUtils.isNotEmpty(result4)) { - List list4 = JsonUtil.jsonToList(result4, UploadResult.class); - if ("0000".equals(list4.get(0).getCode())) { - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功 - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前体格检查上传成功"); - } else { - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list4。code:" - + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null); - } + } else { + if(!preEugenicsBaseModel.getWifePhysiqueCheck().isEmpty()) { + //组装数据时区分女 + 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);//女 + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前体格检查4.4,（女）没有录入数据略过。"); + break; + } + } + String result4 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadPhysicalExamination") + , lhxfyUploadingProvince.uploadingProvincePhysiqueCheck((i == 1) ? preEugenicsBaseModel.getHusbandPhysiqueCheck() : preEugenicsBaseModel.getWifePhysiqueCheck(), KEY, documentId)); + if (StringUtils.isNotEmpty(result4)) { + List list4 = JsonUtil.jsonToList(result4, UploadResult.class); + if ("0000".equals(list4.get(0).getCode())) { + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 1);//成功 + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前体格检查上传成功"); } else { Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost", null); + LogUtil.error("服务器返回：上传失败，list4。code:" + + list4.get(0).getCode() + ";msg:" + list4.get(0).getMsg() + ";type:" + list4.get(0).getType(), null); } + } else { + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update4 = new Update().set("isUploadingYn.physiqueCheck"+i, 0);//失败 + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result4=HttpClientUtil.doWebServicePost", null); } - }else { - Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女 - mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); - LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); } - //上传孕前临床检验4.5 - if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { - for (int i = 1; i <= 2; i++) {//男女分别上传 - if (i == 1) { - if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { - //组装数据时区分男 - 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);//男 - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"); - break; - } + }else { + Query baseQuery4 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update4 = new Update().set("isUploadingYn.physiqueCheck1", 0).set("isUploadingYn.physiqueCheckl2",0);//男和女 + mongoTemplate.updateFirst(baseQuery4, update4, PreEugenicsBaseModel.class); + LogUtil.taskError("孕前体格检查4.4,男女没有录入数据略过。",null); + } + //上传孕前临床检验4.5 + if(!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()||!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { + for (int i = 1; i <= 2; i++) {//男女分别上传 + if (i == 1) { + if (!preEugenicsBaseModel.getHusbandClinicalCheck().isEmpty()) { + //组装数据时区分男 + preEugenicsBaseModel.getHusbandClinicalCheck().put("sex", "01"); } else { - if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { - //组装数据时区分女 - 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);//女 - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"); - break; - } + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//男 + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前临床检验4.5,（男）没有录入数据略过。"); + break; } - String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") - , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); - if (StringUtils.isNotEmpty(result5)) { - List list5 = JsonUtil.jsonToList(result5, UploadResult.class); - if ("0000".equals(list5.get(0).getCode())) { - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功 - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前临床检验上传成功"); - } else { - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list5。code:" - + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); - } + } else { + if (!preEugenicsBaseModel.getWifeClinicalCheck().isEmpty()) { + //组装数据时区分女 + 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);//失败 + Update update5 = new Update().set("isUploadingYn.clinicalCheck" + i, 0);//女 mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost", null); + LogUtil.taskInfo("孕前临床检验4.5,（女）没有录入数据略过。"); + break; } } - }else { - Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女 - mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); - LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); - } - //上传孕前妇科B超检查4.6 - if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { - String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") - , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); - if (StringUtils.isNotEmpty(result6)) { - List list6 = JsonUtil.jsonToList(result6, UploadResult.class); - if ("0000".equals(list6.get(0).getCode())) { - Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 - mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前妇科B超检查上传成功"); + String result5 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadAntenatalClinicalTest") + , lhxfyUploadingProvince.uploadingProvinceClinicalCheck((i == 1) ? preEugenicsBaseModel.getHusbandClinicalCheck() : preEugenicsBaseModel.getWifeClinicalCheck(), KEY, documentId)); + if (StringUtils.isNotEmpty(result5)) { + List list5 = JsonUtil.jsonToList(result5, UploadResult.class); + if ("0000".equals(list5.get(0).getCode())) { + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 1);//成功 + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前临床检验上传成功"); } else { - Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 - mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list6。code:" - + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); + LogUtil.error("服务器返回：上传失败，list5。code:" + + list5.get(0).getCode() + ";msg:" + list5.get(0).getMsg() + ";type:" + list5.get(0).getType(), null); } } else { + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update5 = new Update().set("isUploadingYn.clinicalCheck"+i, 0);//失败 + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result5=HttpClientUtil.doWebServicePost", null); + } + } + }else { + Query baseQuery5 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update5 = new Update().set("isUploadingYn.clinicalCheck1", 0).set("isUploadingYn.clinicalCheck2",0);//男和女 + mongoTemplate.updateFirst(baseQuery5, update5, PreEugenicsBaseModel.class); + LogUtil.taskError("孕前临床检验4.5,男女没有录入数据略过。",null); + } + //上传孕前妇科B超检查4.6 + if(!preEugenicsBaseModel.getWifeBCheck().isEmpty()) { + String result6 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGynecologicalBscan") + , lhxfyUploadingProvince.uploadingProvinceBCheck(preEugenicsBaseModel.getWifeBCheck(), KEY, documentId)); + if (StringUtils.isNotEmpty(result6)) { + List list6 = JsonUtil.jsonToList(result6, UploadResult.class); + if ("0000".equals(list6.get(0).getCode())) { + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update6 = new Update().set("isUploadingYn.bCheck", 1);//成功 + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前妇科B超检查上传成功"); + } else { Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null); + LogUtil.error("服务器返回：上传失败，list6。code:" + + list6.get(0).getCode() + ";msg:" + list6.get(0).getMsg() + ";type:" + list6.get(0).getType(), null); } - }else { + } else { Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入 + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//失败 mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); - LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null); + LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost", null); } - //上传孕前检查结果及评估建议4.7 - /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") - ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); - if(StringUtils.isNotEmpty(result7)){ - List list7=JsonUtil.jsonToList(result7, UploadResult.class); - if("0000".equals(list7.get(0).getCode())){ - Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update7 = new Update().set("isUploadingYn.resultAdvice", 1);//成功 - mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前检查结果及评估建议上传成功"); - }else { - Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 - mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list7。code:" - +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null); - } + }else { + Query baseQuery6 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update6 = new Update().set("isUploadingYn.bCheck", 0);//未录入 + mongoTemplate.updateFirst(baseQuery6, update6, PreEugenicsBaseModel.class); + LogUtil.taskError("孕前妇科B超检查4.6,没有录入数据略过。",null); + } + //上传孕前检查结果及评估建议4.7 + String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") + ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,KEY,documentId)); + if(StringUtils.isNotEmpty(result7)){ + List list7=JsonUtil.jsonToList(result7, UploadResult.class); + if("0000".equals(list7.get(0).getCode())){ + Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update7 = new Update().set("isUploadingYn.resultAdvice", 1);//成功 + mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前检查结果及评估建议上传成功"); }else { Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null); - }*/ - //上传孕前早孕随访4.8 - /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") - ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); - if(StringUtils.isNotEmpty(result8)){ - List list8=JsonUtil.jsonToList(result8, UploadResult.class); - if("0000".equals(list8.get(0).getCode())){ - Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 1);//成功 - mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前早孕随访上传成功"); - }else { - Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 - mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list8。code:" - +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null); - } + LogUtil.error("服务器返回：上传失败，list7。code:" + +list7.get(0).getCode()+";msg:"+list7.get(0).getMsg()+";type:"+list7.get(0).getType(),null); + } + }else { + Query baseQuery7 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 + mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null); + } + //上传孕前早孕随访4.8 + /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") + ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,KEY,documentId)); + if(StringUtils.isNotEmpty(result8)){ + List list8=JsonUtil.jsonToList(result8, UploadResult.class); + if("0000".equals(list8.get(0).getCode())){ + Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 1);//成功 + mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前早孕随访上传成功"); }else { Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null); - }*/ - //上传孕前妊娠结局4.9 - /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") - ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); - if(StringUtils.isNotEmpty(result9)){ - List list9=JsonUtil.jsonToList(result9, UploadResult.class); - if("0000".equals(list9.get(0).getCode())){ - Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 1);//成功 - mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); - LogUtil.taskInfo("孕前妊娠结局上传成功"); - }else { - Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 - mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); - LogUtil.error("服务器返回：上传失败，list8。code:" - +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null); - } + LogUtil.error("服务器返回：上传失败，list8。code:" + +list8.get(0).getCode()+";msg:"+list8.get(0).getMsg()+";type:"+list8.get(0).getType(),null); + } + }else { + Query baseQuery8 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 + mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null); + }*/ + //上传孕前妊娠结局4.9 + /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") + ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,KEY,documentId)); + if(StringUtils.isNotEmpty(result9)){ + List list9=JsonUtil.jsonToList(result9, UploadResult.class); + if("0000".equals(list9.get(0).getCode())){ + Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 1);//成功 + mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); + LogUtil.taskInfo("孕前妊娠结局上传成功"); }else { Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null); - }*/ - + LogUtil.error("服务器返回：上传失败，list8。code:" + +list9.get(0).getCode()+";msg:"+list9.get(0).getMsg()+";type:"+list9.get(0).getType(),null); + } }else { - Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); - Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 - mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); - LogUtil.taskError("服务器返回：上传失败，list1。code:" - +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); - } + Query baseQuery9 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 + mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null); + }*/ + }else { Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); - LogUtil.taskError("上传异常：result1=HttpClientUtil.doWebServicePost",null); + LogUtil.taskError("服务器返回：上传失败，list1。code:" + +list1.get(0).getCode()+";msg:"+list1.get(0).getMsg()+";type:"+list1.get(0).getType(),null); } + }else { + Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update1 = new Update().set("isUploadingYn.archives", 0);//上传孕前档案基本信息失败 + mongoTemplate.updateFirst(baseQuery1, update1, PreEugenicsBaseModel.class); + LogUtil.taskError("上传异常：result1=HttpClientUtil.doWebServicePost",null); } + //整个上传结果更新到结果字段 + PreEugenicsBaseModel model= mongoTemplate.findById(preEugenicsBaseModel.getId(), PreEugenicsBaseModel.class); + if(!model.getIsUploadingYn().isEmpty()){ + Map map=model.getIsUploadingYn(); + if(map.get("archives")!=null&&map.get("general1")!=null&&map.get("general2")!=null + &&map.get("physiqueCheck1")!=null&&map.get("physiqueCheck2")!=null&&map.get("clinicalCheck1")!=null + &&map.get("clinicalCheck2")!=null&&map.get("bCheck")!=null&&map.get("resultAdvice")!=null){ + //全部模块成功才会更新该字段0失败 1成功 + if(map.get("archives")==1&&map.get("general1")==1&&map.get("general2")==1 + &&map.get("physiqueCheck1")==1&&map.get("physiqueCheck2")==1&&map.get("clinicalCheck1")==1 + &&map.get("clinicalCheck2")==1&&map.get("bCheck")==1&&map.get("resultAdvice")==1){ + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update = new Update().set("isUploadingProvince", 1); + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); + }else{ + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update = new Update().set("isUploadingProvince", 0); + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); + } + }else { + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update = new Update().set("isUploadingProvince", 0); + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); + } - } catch (Exception e) { - e.printStackTrace(); + }else { + Query baseQuery = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); + Update update = new Update().set("isUploadingProvince", 0); + mongoTemplate.updateFirst(baseQuery, update, PreEugenicsBaseModel.class); + } } } 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 af1df71..d73d750 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 @@ -47,7 +47,8 @@ public class LhxfyUploadingProvince { public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){ Archives archives=new Archives(); archives.setKey(key);// 上传需要的密钥 - archives.setDocName(baseModel.getDoctor());// 医师签名 + Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor())); + archives.setDocName(users.getName());// 医师签名 archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期 archives.setIsCharge("01");// 收费类型 01 免费 02 收费 //医院名称 @@ -182,7 +183,7 @@ public class LhxfyUploadingProvince { general.setAntenatalArchivesId(documentId); // 档案id（4.1接口上传成功后返回的档案id） general.setSex(baseInfo.get("sex").toString()); // 性别 01：男 02： 女 //男性特有 - if("01".equals(baseInfo.get("sex"))){ + if("01".equals(baseInfo.get("sex").toString())){ //未患有以下男科疾病（男科疾病相关字段sex为02时不用传，为01时必须传）1：是（未患有） 2：否（患有） if(CollectionUtils.isNotEmpty((List)baseInfo.get("nkjb"))){ List nkjb=(List)baseInfo.get("nkjb"); @@ -813,12 +814,8 @@ public class LhxfyUploadingProvince { } } general.setVisitTime(null!=baseInfo.get("fillDate")?baseInfo.get("fillDate").toString():DateUtil.getyyyy_MM_dd(new Date())); // 访问时间 - if(null!=baseInfo.get("doctor")){ - Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); - general.setDocName(users.getName());// 医生签名 - }else { - general.setDocName("医生"); // 医生签名 - } + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + general.setDocName(users.getName());// 医生签名 general.setExamination(null); // 是否同步到婚检1：是 2：否(系统没有字段) general.setSurgeryHistoryType(null); // 手术史01：无 02：有(系统没有字段) general.setSurgeryHistory(null); // 手术史详情(系统没有字段) @@ -832,14 +829,101 @@ public class LhxfyUploadingProvince { } //上传孕前体格检查4.4 public String uploadingProvincePhysiqueCheck(Map baseInfo,String key,String documentId){ - Map data=new HashMap<>(); - String json=""; - if (StringUtils.isNotEmpty(json)) - { - List list =JsonUtil.jsonToList(json, UploadResult.class); - System.out.println(list); + PhysiqueCheck physiqueCheck =new PhysiqueCheck(); + physiqueCheck.setKey(key);// 上传密钥 + physiqueCheck.setAntenatalArchivesId(documentId);// 档案id（4.1接口上传成 + physiqueCheck.setSex(baseInfo.get("sex").toString());// 性别 01 ：男 02： 女 + //男性 + if("01".equals(baseInfo.get("sex").toString())){ + physiqueCheck.setAdamApple(((List)baseInfo.get("houjie")).get(1).toString());// 喉结异常详情 + physiqueCheck.setAdamAppleType(((List)baseInfo.get("houjie")).get(0).toString().equals("1")?"01":"02");//喉结01：有 02：无 + physiqueCheck.setEpididymisType(((List)baseInfo.get("fugao")).get(0).toString().equals("0")?"01":"02");//附睾01：正常 02：异常 + physiqueCheck.setEpididymis(((List)baseInfo.get("fugao")).get(1).toString());// 附睾异常 + physiqueCheck.setForeskinType(baseInfo.get("baopi").toString().equals("0")?"01":baseInfo.get("baopi").toString().equals("1")?"02":"03");//包皮01：正常 02：过长03：包茎 + physiqueCheck.setPenis(((List)baseInfo.get("yinjin")).get(1).toString());// 阴茎异常详情 + physiqueCheck.setPenisType(((List)baseInfo.get("yinjin")).get(0).toString().equals("0")?"01":"02");//阴茎01：正常 02：异常 + physiqueCheck.setSpermaduct(((List)baseInfo.get("sjg")).get(1).toString());// 输精管异常详情 + physiqueCheck.setSpermaductType(((List)baseInfo.get("sjg")).get(0).toString().equals("0")?"01":"02");//输精管01：未见异常 02：异常 + String testesType=((List)baseInfo.get("gaowan")).get(0).toString(); + physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01：扪及 02：左侧未扪及03：右侧未扪及04：双侧未扪及(04系统没有选项) + physiqueCheck.setLeftVolume(((List)baseInfo.get("gaowan")).get(3).toString());// 睾丸左体积 + physiqueCheck.setRightVolume(((List)baseInfo.get("gaowan")).get(4).toString());// 睾丸右体积 + physiqueCheck.setVaricoceleDegree(((List)baseInfo.get("jsjmqz")).get(2).toString());// 精索静脉曲张程度 + physiqueCheck.setVaricocelePart(((List)baseInfo.get("jsjmqz")).get(1).toString());// 精索静脉曲张部位 + physiqueCheck.setVaricoceleType(((List)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");// 精索静脉曲张 01无 02有 + physiqueCheck.setRightNodules(null);// 右结节(系统没有字段) + physiqueCheck.setLeftNodules(null);// 左结节(系统没有字段) + }else {//女性 + physiqueCheck.setAttachment(((List)baseInfo.get("zgscfj")).get(1).toString());// 双侧附件异常详情 + physiqueCheck.setAttachmentCheck(null);// 附件(系统没有字段) + physiqueCheck.setAttachmentType(((List)baseInfo.get("zgscfj")).get(0).toString().equals("0")?"01":"02");//双侧附件01：未见异常 02：异常 + physiqueCheck.setBreast(((List)baseInfo.get("rufang")).get(1).toString());// 乳房异常详情 + physiqueCheck.setBreastType(((List)baseInfo.get("rufang")).get(0).toString().equals("0")?"01":"02");//乳房01：正常 02：异常 + + physiqueCheck.setCervicalCheck(null);// 宫颈(系统没有字段) + physiqueCheck.setCervical(((List)baseInfo.get("gongjing")).get(1).toString());// 宫颈异常详情 + physiqueCheck.setCervicalType(((List)baseInfo.get("gongjing")).get(0).toString().equals("0")?"01":"02");//宫颈 01正常02异常 + physiqueCheck.setSecretion(((List)baseInfo.get("fmw")).get(1).toString());// 分泌物异常详情 + physiqueCheck.setSecretionType(((List)baseInfo.get("fmw")).get(0).toString().equals("0")?"01":"02");//分泌物01：未见异常 02：异常 + physiqueCheck.setUterineActivityType(baseInfo.get("zghd").toString().equals("0")?"01":"02");//子宫活动01：好 02：差 + physiqueCheck.setUterinePieceType(((List)baseInfo.get("zgbk")).get(0).toString().equals("0")?"01":"02");//子宫包块01：无 02：有 + physiqueCheck.setUterineSizeType(baseInfo.get("zgdx").toString().equals("0")?"01":baseInfo.get("zgdx").toString().equals("1")?"02":"03");//子宫大小01：正常 02：大03：小 + physiqueCheck.setUterusCheck(null);// 子宫(系统没有字段) + physiqueCheck.setVaginaCheck(((List)baseInfo.get("yindao")).get(1).toString());// 阴道异常详情 + physiqueCheck.setVaginaCheckType(((List)baseInfo.get("yindao")).get(0).toString().equals("0")?"01":"02");//阴道01未见异常02异常 + physiqueCheck.setVulva(((List)baseInfo.get("waiyin")).get(1).toString());// 外阴异常 + physiqueCheck.setVulvaType(((List)baseInfo.get("waiyin")).get(0).toString().equals("0")?"01":"02");//外阴01：未见异常 02：异常 + physiqueCheck.setVulvaCheck(null);// 外阴(系统没有字段) + physiqueCheck.setNecessaryVaginaCheck(null);// 阴道(系统没有字段) } - return JsonUtil.obj2Str(data); + + physiqueCheck.setHeight(baseInfo.get("height").toString());// 身高cm + physiqueCheck.setWeight(baseInfo.get("weight").toString());// 体重kg + physiqueCheck.setBmi(baseInfo.get("bmi").toString());// 体重指数kg/m² + physiqueCheck.setHeartRate(baseInfo.get("heartRate").toString());// 心率 + physiqueCheck.setHighBloodPressure(baseInfo.get("szy").toString());// 血压（高） + physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低） + physiqueCheck.setMentalStateType(((List)baseInfo.get("jszt")).get(0).toString().equals("0")?"01":"02");// 精神状态类型01：正常 02：异 + physiqueCheck.setMentalState(((List)baseInfo.get("jszt")).get(1).toString());// 精神状态异常详情 + physiqueCheck.setIntelligenceType(((List)baseInfo.get("zl")).get(0).toString().equals("false")?"01":"02");// 智力类型 01：正常 02：异常 + physiqueCheck.setIntelligenceType1(((List)baseInfo.get("zlyc")).get(0).toString().equals("true")?"01":null);// 智力异常--常识 1：选中 + physiqueCheck.setIntelligenceType2(((List)baseInfo.get("zlyc")).get(1).toString().equals("true")?"01":null);// 智力异常--判断 1：选中 + physiqueCheck.setIntelligenceType3(((List)baseInfo.get("zlyc")).get(2).toString().equals("true")?"01":null);// 智力异常--记忆 1：选中 + physiqueCheck.setIntelligenceType4(((List)baseInfo.get("zlyc")).get(3).toString().equals("true")?"01":null);// 智力异常--计算 1：选中 + physiqueCheck.setFacialFeatureType(((List)baseInfo.get("wuguan")).get(0).toString().equals("0")?"01":"02");// 五官 01：正常 02：异常 + physiqueCheck.setFacialFeature(((List)baseInfo.get("wuguan")).get(1).toString());// 五官异常详情 + physiqueCheck.setSpecialPostureType(((List)baseInfo.get("tstt")).get(0).toString().equals("0")?"01":"02");// 特殊体态类型 01：无 0 + physiqueCheck.setSpecialPosture(((List)baseInfo.get("tstt")).get(1).toString());// 特殊体态异常详情 + physiqueCheck.setSpecialFaceType(((List)baseInfo.get("tsmr")).get(0).toString().equals("0")?"01":"02");// 特殊面容 01：无 02：有 + physiqueCheck.setSpecialFace(((List)baseInfo.get("tsmr")).get(1).toString());// 特殊面容异常详情 + physiqueCheck.setSkinHairType(((List)baseInfo.get("pfmf")).get(0).toString().equals("0")?"01":"02");// 皮肤毛发 01：正常 02：异常 + physiqueCheck.setSkinHair(((List)baseInfo.get("pfmf")).get(1).toString());// 皮肤毛发异常详情 + physiqueCheck.setThyroidGlandType(((List)baseInfo.get("jzx")).get(0).toString().equals("0")?"01":"02");// 甲状腺 01：正常02：异常 + physiqueCheck.setThyroidGland(((List)baseInfo.get("jzx")).get(1).toString());// 甲状腺异常详情 + physiqueCheck.setLungType(((List)baseInfo.get("feibu")).get(0).toString().equals("0")?"01":"02");// 肺 01：正常 02：异常 + physiqueCheck.setLung(((List)baseInfo.get("feibu")).get(1).toString());// 肺异常详情 + physiqueCheck.setHeartRhythmType(((List)baseInfo.get("xinlv")).get(0).toString().equals("0")?"01":"02");// 心脏节律是否整齐 01：是 02： + physiqueCheck.setHeartRhythm(((List)baseInfo.get("xinlv")).get(1).toString());// 心脏节律异常详情 + physiqueCheck.setHeartMurmurType(((List)baseInfo.get("xzzy")).get(0).toString().equals("0")?"01":"02");// 心脏杂音 01：无 02：有 + physiqueCheck.setHeartMurmur(((List)baseInfo.get("xzzy")).get(1).toString());// 心脏杂音异常详情 + physiqueCheck.setLiverSpleenType(((List)baseInfo.get("ganpi")).get(0).toString().equals("0")?"01":"02");// 肝脾 01：未触及 02：触及 + physiqueCheck.setLiverSpleen(((List)baseInfo.get("ganpi")).get(1).toString());// 肝脾触及详情 + physiqueCheck.setLimbSpinalType(((List)baseInfo.get("szjz")).get(0).toString().equals("0")?"01":"02");// 四肢脊柱 01：正常 02：异常 + physiqueCheck.setLimbSpinal(((List)baseInfo.get("szjz")).get(1).toString());// 四肢脊柱异常详情 + physiqueCheck.setPhysicalCheckOther(null!=baseInfo.get("othermsg")?baseInfo.get("othermsg").toString():null);// 体格检查其他 + physiqueCheck.setPhysicalCheckDate(baseInfo.get("checkDate").toString());// 体格检查日期 + Users users = usersService.getUsers(Integer.parseInt(baseInfo.get("checkDoctor").toString())); + physiqueCheck.setPhysicalCheckDoctor(users.getName());// 医生签名 + physiqueCheck.setGynaecology("02");// 是否参加妇科检查/男科检查 01：否 0 + physiqueCheck.setExistContent(null);// 不参加妇科/男科检查的原因(系统没有字段) + physiqueCheck.setPubicHairType(((List)baseInfo.get("yinmao")).get(0).toString().equals("0")?"01":"02");//阴毛 01：正常 02：异常 + physiqueCheck.setPubicHair(((List)baseInfo.get("yinmao")).get(1).toString());// 阴毛异常详情 + physiqueCheck.setIsPection(null);// 数据是否同步到婚检1：是 2：否(系统没有字段) + physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他 + physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期 + Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); + physiqueCheck.setSexCheckDoctor(users1.getName());// 医生签名 + return JsonUtil.obj2Str(physiqueCheck); } //上传孕前临床检验4.5 public String uploadingProvinceClinicalCheck(Map baseInfo,String key,String documentId){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index d9e5c23..dca6d5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -27,6 +27,7 @@ import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; import com.lyms.platform.operate.web.service.IPreEugenicsService; import java.util.Date; +import java.util.List; /** * @author: shuai-Bo @@ -297,13 +298,13 @@ public class PreEugenicsBaseController extends BaseController { } /** * 河北省孕前上传数据 - * @param id + * @param ids */ @ResponseBody @TokenRequired - @RequestMapping(value = "/uploadingProvince/{id}", method = RequestMethod.POST) - public BaseResponse uploadingProvince(@PathVariable("id")String id) { - lhxfyService.uploadingProvince(id); + @RequestMapping(value = "/uploadingProvince/{ids}", method = RequestMethod.POST) + public BaseResponse uploadingProvince(@PathVariable("ids") List ids) { + lhxfyService.uploadingProvince(ids); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }