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 0e5055e..d971f03 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 @@ -904,10 +904,10 @@ public class LhxfyUploadingProvince { 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.setLeftVolume(((List)baseInfo.get("gaowan")).get(3)!=null?((List)baseInfo.get("gaowan")).get(3).toString():"");// 睾丸左体积 + physiqueCheck.setRightVolume(((List)baseInfo.get("gaowan")).get(4)!=null?((List)baseInfo.get("gaowan")).get(4).toString():"");// 睾丸右体积 + physiqueCheck.setVaricoceleDegree(((List)baseInfo.get("jsjmqz")).get(2)!=null?((List)baseInfo.get("jsjmqz")).get(2).toString():"");// 精索静脉曲张程度 + physiqueCheck.setVaricocelePart(((List)baseInfo.get("jsjmqz")).get(1)!=null?((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);// 左结节(系统没有字段) @@ -1003,11 +1003,20 @@ public class LhxfyUploadingProvince { //尿常规 if (husbandMap.get("ncg") != null) { - Integer ncg = ((Map)husbandMap.get("ncg")).get("0"); - if (ncg != null ) { - Integer ncgStatus = ncg; - husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + if(husbandMap.get("ncg") instanceof Map){ + Integer ncg = ((Map)husbandMap.get("ncg")).get("0"); + if (ncg != null ) { + Integer ncgStatus = ncg; + husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + } + }else { + List ncg = (ArrayList) husbandMap.get("ncg"); + if (ncg != null && ncg.size() > 0) { + Integer ncgStatus = Integer.valueOf(ncg.get(0).toString()); + husbandCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + } } + } Object abo = husbandMap.get("abo");//ABO型 if (abo != null) { @@ -1152,12 +1161,21 @@ public class LhxfyUploadingProvince { wifeCheck.setBaso(xxbfxs.get(8));//B } //尿常规 - List ncg = (ArrayList) wifeMap.get("ncg"); - if (ncg != null && ncg.size() > 0) { - Integer ncgStatus = Integer.valueOf(ncg.get(0).toString()); - wifeCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + if(wifeMap.get("ncg") instanceof Map){ + Integer ncg = ((Map)wifeMap.get("ncg")).get("0"); + if (ncg != null ) { + Integer ncgStatus = ncg; + wifeCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + } + }else { + List ncg = (ArrayList) wifeMap.get("ncg"); + if (ncg != null && ncg.size() > 0) { + Integer ncgStatus = Integer.valueOf(ncg.get(0).toString()); + wifeCheck.setRoutineUrine(ncgStatus == 0 ? "01" : "02");//尿常规 + } } + Object abo = wifeMap.get("abo");//ABO if (abo != null) { Integer aboi = (Integer) abo;