From 7f9f5ecae8d91a3ef55181c9f21948b8780444b3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 9 Dec 2021 10:00:35 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/PreEugenicsBaseModel.java | 10 ---------- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 23 ++++++++++++++++------ .../hospitalapi/lhxfy/LhxfyUploadingProvince.java | 10 +++++++--- .../com/lyms/hospitalapi/lhxfy/model/Archives.java | 9 +++++++++ .../web/controller/PreEugenicsBaseController.java | 6 +++--- 5 files changed, 36 insertions(+), 22 deletions(-) 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 5c38741..5bf5ed9 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 @@ -440,16 +440,6 @@ public class PreEugenicsBaseModel extends BaseModel { //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0） private Integer isUploadingProvince; - //接收List ids - private List ids; - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } public Integer getIsUploadingProvince() { return isUploadingProvince; 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 08201d6..007a2ef 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 @@ -957,16 +957,26 @@ public class LhxfyService { query.addCriteria(Criteria.where("id").in(ids)); List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { + //新增修改url + String urladd=URL+"/m/antenatalUpload/uploadArchives";//新增上传 + String urlupdate=URL+"/m/antenatalUpload/updateArchives";//修改上传 //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 preEugenicsBaseModel.setSubUnitsVillage("130825100227"); - //上传孕前档案基本信息4.1 - String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), - lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); + //上传孕前档案基本信息4.1(新上传和修改) + String result1=""; + if(StringUtils.isEmpty(preEugenicsBaseModel.getDocumentId())){ + result1=HttpClientUtil.doWebServicePost(urladd, + lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,null)); + }else { + result1=HttpClientUtil.doWebServicePost(urlupdate, + lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY,preEugenicsBaseModel.getDocumentId())); + } + 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())){ + //成功后返回的documentId后面上传都要用到 + String documentId=list1.get(0).getDocumentId(); Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); Update update1 = new Update().set("documentId", documentId)//上传成功后返回的id .set("isUploadingYn.archives", 0);//成功 @@ -999,7 +1009,8 @@ public class LhxfyService { } } String result3 = HttpClientUtil.doWebServicePost((URL + "/m/antenatalUpload/uploadGeneralSituation") - , lhxfyUploadingProvince.uploadingProvinceGeneral((i == 1) ? preEugenicsBaseModel.getHusbandBaseInfo() : preEugenicsBaseModel.getWifeBaseInfo(), KEY, documentId)); + , 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())) { 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 d73d750..a8b4eae 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 @@ -44,8 +44,12 @@ public class LhxfyUploadingProvince { private LhxfyService lhxfyService; //上传孕前档案基本信息4.1 - public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){ + public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key,String documentId){ Archives archives=new Archives(); + //修改时传入documentId + if(StringUtils.isNotEmpty(documentId)){ + archives.setId(documentId); + } archives.setKey(key);// 上传需要的密钥 Users users = usersService.getUsers(Integer.parseInt(baseModel.getDoctor())); archives.setDocName(users.getName());// 医师签名 @@ -156,7 +160,7 @@ public class LhxfyUploadingProvince { archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚(系统没有具体选项) archives.setFloatingCode(null);// 是否流动人口 1 是 2(系统没有具体选项) archives.setPeriMarriageEducation("01");// 优生健康教育 下拉选 01双方接受教育 02 男方接受教育 03 女方接受教育（系统没有字段必填默认01） - archives.setIsPection(null);// 是否同步到婚检 1是 0否(系统没有具体选项) + archives.setIsPection("0");// 是否同步到婚检 1是 0否(需求默认0) archives.setHusbandWorkUnit(null);// 丈夫工作单位(系统没有具体选项) archives.setHusbandResidentialCategory("01");//丈夫居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01） archives.setWifeWorkUnit(null);// 妻子工作单位(系统没有具体选项) @@ -918,7 +922,7 @@ public class LhxfyUploadingProvince { 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.setIsPection("0");// 数据是否同步到婚检1：是 2：否(需求默认0) physiqueCheck.setSexCheckOther(baseInfo.get("othermsg1").toString());// 其他 physiqueCheck.setSexCheckDate(baseInfo.get("fillDate").toString());// 检查日期 Users users1 = usersService.getUsers(Integer.parseInt(baseInfo.get("doctor").toString())); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/Archives.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/Archives.java index 0016a3b..40870b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/Archives.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/Archives.java @@ -5,6 +5,7 @@ package com.lyms.hospitalapi.lhxfy.model; */ public class Archives { + private String id;//修改时使用的documentId private String key; // 上传需要的密钥 private String docName; // 医师签名 private String fillTime; // 填写日期 @@ -70,6 +71,14 @@ public class Archives { return docName; } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public void setDocName(String docName) { this.docName = docName; } 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 4e3119a..f0fdf6e 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 @@ -298,13 +298,13 @@ public class PreEugenicsBaseController extends BaseController { } /** * 河北省孕前上传数据 - * @param baseModel + * @param ids */ @ResponseBody @TokenRequired @RequestMapping(value = "/uploadingProvince", method = RequestMethod.POST) - public BaseResponse uploadingProvince(PreEugenicsBaseModel baseModel) { - lhxfyService.uploadingProvince(baseModel.getIds()); + public BaseResponse uploadingProvince(@RequestBody List ids) { + lhxfyService.uploadingProvince(ids); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -- 1.8.3.1