jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e7805910570efc37525d65e0a56cd1cc899fa202

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

update

Showing 4 changed files with 32 additions and 19 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java View file @ e780591
... ... @@ -440,6 +440,16 @@
440 440 //隆化- 是否全部模块上传省平台成功。0：失败。1：成功（有一个模块上传失败也是0）
441 441 private Integer isUploadingProvince;
442 442  
  443 + //接收List<String> ids
  444 + private List<String> ids;
  445 +
  446 + public List<String> getIds() {
  447 + return ids;
  448 + }
  449 +
  450 + public void setIds(List<String> ids) {
  451 + this.ids = ids;
  452 + }
443 453  
444 454 public Integer getIsUploadingProvince() {
445 455 return isUploadingProvince;
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ e780591
... ... @@ -950,7 +950,7 @@
950 950 * 孕前优生-上传省平台
951 951 */
952 952 private static final String URL = "http://39.101.222.193:8088";//测试
953   - private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key
  953 + private static final String KEY = "87efab891326498abdfdfca6f9490ded";//沧州测试key
954 954 public void uploadingProvince(List<String> ids){
955 955 Query query = new Query();
956 956 //指定ID上传。
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ e780591
1 1 package com.lyms.hospitalapi.lhxfy;
2 2  
  3 +import com.alibaba.fastjson.JSON;
3 4 import com.lyms.hospitalapi.lhxfy.model.Archives;
4 5 import com.lyms.hospitalapi.lhxfy.model.General;
5 6 import com.lyms.hospitalapi.lhxfy.model.UploadResult;
... ... @@ -20,6 +21,7 @@
20 21 import com.lyms.platform.permission.service.OrganizationService;
21 22 import com.lyms.platform.pojo.PreEugenicsBaseModel;
22 23 import com.mchange.v2.lang.ObjectUtils;
  24 +import com.qiniu.util.Json;
23 25 import org.springframework.beans.factory.annotation.Autowired;
24 26 import org.springframework.stereotype.Component;
25 27  
... ... @@ -64,7 +66,7 @@
64 66 archives.setWifeAge(baseModel.getWifeAge());// 妻子年龄
65 67 archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));// 妻子出生时间
66 68 //民族
67   - String wifeNationCode=null;
  69 + String wifeNationCode="";
68 70 List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
69 71 for (BasicConfigResult nationResult : nationResults) {
70 72 if(baseModel.getWifeNation().equals(nationResult.getId())){
71 73  
... ... @@ -73,10 +75,10 @@
73 75 }
74 76 archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体
75 77 // 妻子文化程度
76   - String wifeEducational=null;
  78 + String wifeEducational="";
77 79 List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
78 80 for (BasicConfigResult educational : levelType) {
79   - if(baseModel.getWifeEducational().equals(educational.getId())){
  81 + if(StringUtils.isNotEmpty(baseModel.getWifeEducational())&&baseModel.getWifeEducational().equals(educational.getId())){
80 82 wifeEducational=educational.getName();
81 83 }
82 84 }
83 85  
... ... @@ -84,10 +86,10 @@
84 86  
85 87 archives.setWifeRegisteredCode(baseModel.getWifeAccountNature().equals("1")?"01":"02");// 妻子户口性质 01 农业户口 02 非农业户口
86 88 //职业
87   - String wifeCareer=null;
  89 + String wifeCareer="";
88 90 List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
89 91 for (BasicConfigResult professionTypeResult : professionTypeResults) {
90   - if(baseModel.getWifeCareer().equals(professionTypeResult.getId())){
  92 + if(StringUtils.isNotEmpty(baseModel.getWifeCareer())&&baseModel.getWifeCareer().equals(professionTypeResult.getId())){
91 93 wifeCareer=professionTypeResult.getName();
92 94 }
93 95 }
94 96  
... ... @@ -99,10 +101,10 @@
99 101 archives.setWifeOccupationCodeContent(null);//妻子职业07的其他的时候存入的信息(系统没有具体选项)
100 102 archives.setWifeTelephone(baseModel.getWifePhone());// 妻子联系电话
101 103 //妻子证件类型
102   - String wifeCardType=null;
  104 + String wifeCardType="";
103 105 List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
104 106 for (BasicConfigResult basicConfigResult : pcerteTypeResult) {
105   - if(baseModel.getWifeCardType().equals(basicConfigResult.getId())){
  107 + if(StringUtils.isNotEmpty(baseModel.getWifeCardType())&&baseModel.getWifeCardType().equals(basicConfigResult.getId())){
106 108 wifeCardType=basicConfigResult.getName();
107 109 }
108 110 }
109 111  
110 112  
111 113  
112 114  
113 115  
114 116  
... ... @@ -121,29 +123,29 @@
121 123 archives.setHusband_idCard(baseModel.getHusbandCardNo());// 丈夫身份证号
122 124 archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));// 丈夫出生时间
123 125 //民族
124   - String husbandNation=null;
  126 + String husbandNation="";
125 127 List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
126 128 for (BasicConfigResult nationResult : nationResults2) {
127   - if(baseModel.getHusbandNation().equals(nationResult.getId())){
  129 + if(StringUtils.isNotEmpty(baseModel.getHusbandNation())&&baseModel.getHusbandNation().equals(nationResult.getId())){
128 130 husbandNation=nationResult.getName();
129 131 }
130 132 }
131   - archives.setHusbandNationCode(NationEnums.getId(wifeNationCode));// 丈夫民族编码
  133 + archives.setHusbandNationCode(NationEnums.getId(husbandNation));// 丈夫民族编码
132 134 // 丈夫文化程度
133   - String husbandEducational=null;
  135 + String husbandEducational="";
134 136 List<BasicConfigResult> levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
135 137 for (BasicConfigResult educational : levelType2) {
136   - if(baseModel.getHusbandEducational().equals(educational.getId())){
  138 + if(StringUtils.isNotEmpty(baseModel.getHusbandEducational())&&baseModel.getHusbandEducational().equals(educational.getId())){
137 139 husbandEducational=educational.getName();
138 140 }
139 141 }
140 142 archives.setHusbandCultureCode(EducationalEnums.getId(husbandEducational));// 丈夫文化程
141 143 archives.setHusbandRegisteredCode(baseModel.getHusbandAccountNature().equals("1")?"01":"02");// 丈夫户口性质01 农业户口 02 非农业户口
142 144 //丈夫职业
143   - String husbandCareer=null;
  145 + String husbandCareer="";
144 146 List<BasicConfigResult> professionTypeResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
145 147 for (BasicConfigResult professionTypeResult : professionTypeResults2) {
146   - if(baseModel.getHusbandCareer().equals(professionTypeResult.getId())){
  148 + if(StringUtils.isNotEmpty(baseModel.getHusbandCareer())&&baseModel.getHusbandCareer().equals(professionTypeResult.getId())){
147 149 husbandCareer=professionTypeResult.getName();
148 150 }
149 151 }
... ... @@ -178,7 +180,8 @@
178 180 break;
179 181 }
180 182 archives.setInformedConsent(baseModel.getHasSignBook());// 知情同意书签署情况 01男方签署 02 女方签署 03 双方签署
181   - return JsonUtil.obj2Str(archives);
  183 + Map<String,String> mapjson=JSON.parseObject(JSON.toJSONString(archives),Map.class);//转换map去掉NULL同时也去掉id对象。新增不能有id对象
  184 + return JsonUtil.obj2Str(mapjson);
182 185 }
183 186 //上传孕前一般情况4.3
184 187 public String uploadingProvinceGeneral(Map<String,Object> baseInfo,String key,String documentId){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java View file @ e780591
... ... @@ -298,13 +298,13 @@
298 298 }
299 299 /**
300 300 * 河北省孕前上传数据
301   - * @param ids
  301 + * @param baseModel
302 302 */
303 303 @ResponseBody
304 304 @TokenRequired
305 305 @RequestMapping(value = "/uploadingProvince", method = RequestMethod.POST)
306   - public BaseResponse uploadingProvince(@RequestBody List<String> ids) {
307   - lhxfyService.uploadingProvince(ids);
  306 + public BaseResponse uploadingProvince(@RequestBody PreEugenicsBaseModel baseModel) {
  307 + lhxfyService.uploadingProvince(baseModel.getIds());
308 308 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
309 309 }
310 310