Commit 9a4689c954b4610e8fb284f2878ca86d4a4a3f45
1 parent
b43d2d503d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 33 additions and 33 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
View file @
9a4689c
| ... | ... | @@ -200,7 +200,7 @@ |
| 200 | 200 | } |
| 201 | 201 | //上传孕前一般情况4.3 |
| 202 | 202 | public String uploadingProvinceGeneral(Map<String,Object> baseInfo,String key,String documentId){ |
| 203 | - General general = new General(); | |
| 203 | + final General general = new General(); | |
| 204 | 204 | general.setKey(key); // 上传密钥 |
| 205 | 205 | general.setAntenatalArchivesId(documentId); // 档案id（4.1接口上传成功后返回的档案id） |
| 206 | 206 | general.setSex(baseInfo.get("sex").toString()); // 性别 01：男 02： 女 |
| 207 | 207 | |
| 208 | 208 | |
| 209 | 209 | |
| ... | ... | @@ -425,38 +425,38 @@ |
| 425 | 425 | } |
| 426 | 426 | general.setChildrenNumber(null!=baseInfo.get("znrs")?baseInfo.get("znrs").toString():""); // 现在子女数 |
| 427 | 427 | //子女健康情况（具体参数如下：子女健康情况请求参数）系统只会填写1个儿童 |
| 428 | - List<Map<String,Object>> listMap=new ArrayList<Map<String,Object>>(){{ | |
| 429 | - Map<String,Object> map=new HashMap<String,Object>(){{ | |
| 430 | - put("childrenHealthy", "1"); | |
| 431 | - put("childrenDisease", "2"); | |
| 432 | - put("childrenContent", ""); | |
| 433 | - put("index_puc", 1); | |
| 428 | + if(StringUtils.isNotEmpty(general.getChildrenNumber())){ | |
| 429 | + final int ChildrenNumber=Integer.parseInt(general.getChildrenNumber()); | |
| 430 | + if(CollectionUtils.isNotEmpty((List<Object>)baseInfo.get("znjk"))){ | |
| 431 | + final List<Object> znjk = (List<Object>) baseInfo.get("znjk"); | |
| 432 | + List<Map<String,Object>> listMap=new ArrayList<Map<String,Object>>(){{ | |
| 433 | + Map<String,Object> map=new HashMap<String,Object>(){{ | |
| 434 | + put("childrenHealthy", znjk.get(0).toString().equals("true")?"2":"1");//是否健康 1：健康 2：不健康 | |
| 435 | + put("childrenDisease", znjk.get(0).toString().equals("true")?"2":"1");//是否有疾病1：有疾病 2：没有 | |
| 436 | + put("childrenContent", znjk.get(1).toString()); | |
| 437 | + put("index_puc", 1); | |
| 438 | + }}; | |
| 439 | + for (int i=0;i<ChildrenNumber;i++){ | |
| 440 | + add(map); | |
| 441 | + } | |
| 434 | 442 | }}; |
| 435 | - add(map); | |
| 436 | - }}; | |
| 437 | - if(CollectionUtils.isNotEmpty((List<Object>)baseInfo.get("znjk"))) { | |
| 438 | - List<Object> znjk = (List<Object>) baseInfo.get("znjk"); | |
| 439 | - for (int i=0;i<znjk.size();i++){ | |
| 440 | - switch (i){ | |
| 441 | - case 0: | |
| 442 | - //这里系统znjk(0)是1个字段代表2种状态 | |
| 443 | - if(znjk.get(i)==null){ | |
| 444 | - break; | |
| 445 | - } | |
| 446 | - listMap.get(0).put("childrenHealthy",znjk.get(i).toString().equals("true")?"1":"2");//是否健康 1：健康 2：不健康 | |
| 447 | - listMap.get(0).put("childrenDisease",znjk.get(i).toString().equals("true")?"2":"1");//是否有疾病1：有疾病 2：没有 | |
| 448 | - break; | |
| 449 | - case 1: | |
| 450 | - if(znjk.get(i)==null){ | |
| 451 | - break; | |
| 452 | - } | |
| 453 | - listMap.get(0).put("childrenContent",znjk.get(i).toString());//具体疾病名称 | |
| 454 | - break; | |
| 455 | - } | |
| 443 | + general.setChildData(listMap);//子女情况（系统只会有一条）大于1就传重复的listmap省平台会检验数量，导致上传失败 | |
| 444 | + }else { | |
| 445 | + List<Map<String,Object>> listMap=new ArrayList<Map<String,Object>>(){{ | |
| 446 | + Map<String,Object> map=new HashMap<String,Object>(){{ | |
| 447 | + put("childrenHealthy", "1");//是否健康 1：健康 2：不健康 | |
| 448 | + put("childrenDisease", "2");//是否有疾病1：有疾病 2：没有 | |
| 449 | + put("childrenContent", ""); | |
| 450 | + put("index_puc", 1); | |
| 451 | + }}; | |
| 452 | + for (int i=0;i<ChildrenNumber;i++){ | |
| 453 | + add(map); | |
| 454 | + } | |
| 455 | + }}; | |
| 456 | + general.setChildData(listMap);//子女情况（系统只会有一条）大于1就传重复的listmap省平台会检验数量，导致上传失败 | |
| 456 | 457 | } |
| 457 | - } | |
| 458 | - general.setChildData(listMap);//子女情况（系统只会有一条） | |
| 459 | 458 | |
| 459 | + } | |
| 460 | 460 | general.setCycle(null); // 月经周期范围开始天数 |
| 461 | 461 | general.setDiseaseSpecies(null); // 出生缺陷儿--病种（相同字段不处理） |
| 462 | 462 | general.setLastDate(null); // 末次妊娠结局日期 |
| ... | ... | @@ -1003,9 +1003,9 @@ |
| 1003 | 1003 | //尿常规 |
| 1004 | 1004 | if (husbandMap.get("ncg") != null) |
| 1005 | 1005 | { |
| 1006 | - List<Object> ncg = (ArrayList<Object>) husbandMap.get("ncg"); | |
| 1007 | - if (ncg != null && ncg.size() > 0) { | |
| 1008 | - Integer ncgStatus = Integer.valueOf(ncg.get(0).toString()); | |
| 1006 | + Integer ncg = ((Map<String,Integer>)husbandMap.get("ncg")).get("0"); | |
| 1007 | + if (ncg != null ) { | |
| 1008 | + Integer ncgStatus = ncg; | |
| 1009 | 1009 | husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 |
| 1010 | 1010 | } |
| 1011 | 1011 | } |