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 5bf5ed9..5c38741 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,6 +440,16 @@ 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 007a2ef..96bf70c 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 @@ -950,7 +950,7 @@ public class LhxfyService { * 孕前优生-上传省平台 */ private static final String URL = "http://39.101.222.193:8088";//测试 - private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key + private static final String KEY = "87efab891326498abdfdfca6f9490ded";//沧州测试key public void uploadingProvince(List ids){ Query query = new Query(); //指定ID上传。 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 a8b4eae..ddc18e1 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 @@ -1,5 +1,6 @@ package com.lyms.hospitalapi.lhxfy; +import com.alibaba.fastjson.JSON; import com.lyms.hospitalapi.lhxfy.model.Archives; import com.lyms.hospitalapi.lhxfy.model.General; import com.lyms.hospitalapi.lhxfy.model.UploadResult; @@ -20,6 +21,7 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.PreEugenicsBaseModel; import com.mchange.v2.lang.ObjectUtils; +import com.qiniu.util.Json; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -64,7 +66,7 @@ public class LhxfyUploadingProvince { archives.setWifeAge(baseModel.getWifeAge());// 妻子年龄 archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));// 妻子出生时间 //民族 - String wifeNationCode=null; + String wifeNationCode=""; List nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); for (BasicConfigResult nationResult : nationResults) { if(baseModel.getWifeNation().equals(nationResult.getId())){ @@ -73,10 +75,10 @@ public class LhxfyUploadingProvince { } archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体 // 妻子文化程度 - String wifeEducational=null; + String wifeEducational=""; List levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); for (BasicConfigResult educational : levelType) { - if(baseModel.getWifeEducational().equals(educational.getId())){ + if(StringUtils.isNotEmpty(baseModel.getWifeEducational())&&baseModel.getWifeEducational().equals(educational.getId())){ wifeEducational=educational.getName(); } } @@ -84,10 +86,10 @@ public class LhxfyUploadingProvince { archives.setWifeRegisteredCode(baseModel.getWifeAccountNature().equals("1")?"01":"02");// 妻子户口性质 01 农业户口 02 非农业户口 //职业 - String wifeCareer=null; + String wifeCareer=""; List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); for (BasicConfigResult professionTypeResult : professionTypeResults) { - if(baseModel.getWifeCareer().equals(professionTypeResult.getId())){ + if(StringUtils.isNotEmpty(baseModel.getWifeCareer())&&baseModel.getWifeCareer().equals(professionTypeResult.getId())){ wifeCareer=professionTypeResult.getName(); } } @@ -99,10 +101,10 @@ public class LhxfyUploadingProvince { archives.setWifeOccupationCodeContent(null);//妻子职业07的其他的时候存入的信息(系统没有具体选项) archives.setWifeTelephone(baseModel.getWifePhone());// 妻子联系电话 //妻子证件类型 - String wifeCardType=null; + String wifeCardType=""; List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); for (BasicConfigResult basicConfigResult : pcerteTypeResult) { - if(baseModel.getWifeCardType().equals(basicConfigResult.getId())){ + if(StringUtils.isNotEmpty(baseModel.getWifeCardType())&&baseModel.getWifeCardType().equals(basicConfigResult.getId())){ wifeCardType=basicConfigResult.getName(); } } @@ -121,29 +123,29 @@ public class LhxfyUploadingProvince { archives.setHusband_idCard(baseModel.getHusbandCardNo());// 丈夫身份证号 archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));// 丈夫出生时间 //民族 - String husbandNation=null; + String husbandNation=""; List nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); for (BasicConfigResult nationResult : nationResults2) { - if(baseModel.getHusbandNation().equals(nationResult.getId())){ + if(StringUtils.isNotEmpty(baseModel.getHusbandNation())&&baseModel.getHusbandNation().equals(nationResult.getId())){ husbandNation=nationResult.getName(); } } - archives.setHusbandNationCode(NationEnums.getId(wifeNationCode));// 丈夫民族编码 + archives.setHusbandNationCode(NationEnums.getId(husbandNation));// 丈夫民族编码 // 丈夫文化程度 - String husbandEducational=null; + String husbandEducational=""; List levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); for (BasicConfigResult educational : levelType2) { - if(baseModel.getHusbandEducational().equals(educational.getId())){ + if(StringUtils.isNotEmpty(baseModel.getHusbandEducational())&&baseModel.getHusbandEducational().equals(educational.getId())){ husbandEducational=educational.getName(); } } archives.setHusbandCultureCode(EducationalEnums.getId(husbandEducational));// 丈夫文化程 archives.setHusbandRegisteredCode(baseModel.getHusbandAccountNature().equals("1")?"01":"02");// 丈夫户口性质01 农业户口 02 非农业户口 //丈夫职业 - String husbandCareer=null; + String husbandCareer=""; List professionTypeResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); for (BasicConfigResult professionTypeResult : professionTypeResults2) { - if(baseModel.getHusbandCareer().equals(professionTypeResult.getId())){ + if(StringUtils.isNotEmpty(baseModel.getHusbandCareer())&&baseModel.getHusbandCareer().equals(professionTypeResult.getId())){ husbandCareer=professionTypeResult.getName(); } } @@ -178,7 +180,8 @@ public class LhxfyUploadingProvince { break; } archives.setInformedConsent(baseModel.getHasSignBook());// 知情同意书签署情况 01男方签署 02 女方签署 03 双方签署 - return JsonUtil.obj2Str(archives); + Map mapjson=JSON.parseObject(JSON.toJSONString(archives),Map.class);//转换map去掉NULL同时也去掉id对象。新增不能有id对象 + return JsonUtil.obj2Str(mapjson); } //上传孕前一般情况4.3 public String uploadingProvinceGeneral(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 f0fdf6e..c199082 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 ids + * @param baseModel */ @ResponseBody @TokenRequired @RequestMapping(value = "/uploadingProvince", method = RequestMethod.POST) - public BaseResponse uploadingProvince(@RequestBody List ids) { - lhxfyService.uploadingProvince(ids); + public BaseResponse uploadingProvince(@RequestBody PreEugenicsBaseModel baseModel) { + lhxfyService.uploadingProvince(baseModel.getIds()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }