jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9e4fb50ce3dbb2402932f154f1ae22ff8daa4378

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

省平台上传孕前优生-身份证、男性睾丸、子女健康情况bug

Showing 1 changed file with 38 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java View file @ 9e4fb50
... ... @@ -22,6 +22,7 @@
22 22 import com.lyms.platform.pojo.PreEugenicsBaseModel;
23 23 import com.mchange.v2.lang.ObjectUtils;
24 24 import com.qiniu.util.Json;
  25 +import org.apache.tools.ant.taskdefs.Get;
25 26 import org.springframework.beans.factory.annotation.Autowired;
26 27 import org.springframework.stereotype.Component;
27 28  
28 29  
29 30  
... ... @@ -66,14 +67,16 @@
66 67 archives.setWifeAge(baseModel.getWifeAge());// 妻子年龄
67 68 archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));// 妻子出生时间
68 69 //民族
69   - String wifeNationCode="";
70   - List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
71   - for (BasicConfigResult nationResult : nationResults) {
72   - if(baseModel.getWifeNation().equals(nationResult.getId())){
73   - wifeNationCode=nationResult.getName();
  70 + if(StringUtils.isNotEmpty(baseModel.getWifeNation())){
  71 + String wifeNationCode="";
  72 + List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
  73 + for (BasicConfigResult nationResult : nationResults) {
  74 + if(baseModel.getWifeNation().equals(nationResult.getId())){
  75 + wifeNationCode=nationResult.getName();
  76 + }
74 77 }
  78 + archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体
75 79 }
76   - archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体
77 80 // 妻子文化程度
78 81 String wifeEducational="";
79 82 List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
80 83  
81 84  
... ... @@ -129,14 +132,17 @@
129 132 archives.setHusband_idCard(baseModel.getHusbandCardNo());// 丈夫身份证号
130 133 archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));// 丈夫出生时间
131 134 //民族
132   - String husbandNation="";
133   - List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
134   - for (BasicConfigResult nationResult : nationResults2) {
135   - if(StringUtils.isNotEmpty(baseModel.getHusbandNation())&&baseModel.getHusbandNation().equals(nationResult.getId())){
136   - husbandNation=nationResult.getName();
  135 + if(StringUtils.isNotEmpty(baseModel.getHusbandNation())){
  136 + String husbandNation="";
  137 + List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
  138 + for (BasicConfigResult nationResult : nationResults2) {
  139 + if(baseModel.getHusbandNation().equals(nationResult.getId())){
  140 + husbandNation=nationResult.getName();
  141 + }
137 142 }
  143 + archives.setHusbandNationCode(NationEnums.getId(husbandNation));// 丈夫民族编码
138 144 }
139   - archives.setHusbandNationCode(NationEnums.getId(husbandNation));// 丈夫民族编码
  145 +
140 146 // 丈夫文化程度
141 147 String husbandEducational="";
142 148 List<BasicConfigResult> levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
... ... @@ -437,9 +443,9 @@
437 443 final List<Object> znjk = (List<Object>) baseInfo.get("znjk");
438 444 List<Map<String,Object>> listMap=new ArrayList<Map<String,Object>>(){{
439 445 Map<String,Object> map=new HashMap<String,Object>(){{
440   - put("childrenHealthy", znjk.get(0).toString().equals("true")?"2":"1");//是否健康 1：健康 2：不健康
441   - put("childrenDisease", znjk.get(0).toString().equals("true")?"2":"1");//是否有疾病1：有疾病 2：没有
442   - put("childrenContent", znjk.get(1).toString());
  446 + put("childrenHealthy", null!=znjk.get(0)?znjk.get(0).toString().equals("true")?"2":"1":"");//是否健康 1：健康 2：不健康
  447 + put("childrenDisease", null!=znjk.get(0)?znjk.get(0).toString().equals("true")?"2":"1":"");//是否有疾病1：有疾病 2：没有
  448 + put("childrenContent", null!=znjk.get(1)?znjk.get(1).toString():"");
443 449 put("index_puc", 1);
444 450 }};
445 451 for (int i=0;i<ChildrenNumber;i++){
... ... @@ -905,13 +911,23 @@
905 911 physiqueCheck.setPenisType(((List<Object>)baseInfo.get("yinjin")).get(0).toString().equals("0")?"01":"02");//阴茎01：正常 02：异常
906 912 physiqueCheck.setSpermaduct(((List<Object>)baseInfo.get("sjg")).get(1).toString());// 输精管异常详情
907 913 physiqueCheck.setSpermaductType(((List<Object>)baseInfo.get("sjg")).get(0).toString().equals("0")?"01":"02");//输精管01：未见异常 02：异常
908   - String testesType=((List<Object>)baseInfo.get("gaowan")).get(0).toString();
909   - physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01：扪及 02：左侧未扪及03：右侧未扪及04：双侧未扪及(04系统没有选项)
910   - physiqueCheck.setLeftVolume(((List<Object>)baseInfo.get("gaowan")).get(3)!=null?((List<Object>)baseInfo.get("gaowan")).get(3).toString():"");// 睾丸左体积
911   - physiqueCheck.setRightVolume(((List<Object>)baseInfo.get("gaowan")).get(4)!=null?((List<Object>)baseInfo.get("gaowan")).get(4).toString():"");// 睾丸右体积
912   - physiqueCheck.setVaricoceleDegree(((List<Object>)baseInfo.get("jsjmqz")).get(2)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(2).toString():"");// 精索静脉曲张程度
913   - physiqueCheck.setVaricocelePart(((List<Object>)baseInfo.get("jsjmqz")).get(1)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(1).toString():"");// 精索静脉曲张部位
914   - physiqueCheck.setVaricoceleType(((List<Object>)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");// 精索静脉曲张 01无 02有
  914 +
  915 + if(null!=((List<Object>)baseInfo.get("gaowan")).get(0)){
  916 + String testesType=((List<Object>)baseInfo.get("gaowan")).get(0).toString();
  917 + physiqueCheck.setTestesType(testesType.equals("0")?"01":testesType.equals("1")?"02":"03");//睾丸01：扪及 02：左侧未扪及03：右侧未扪及04：双侧未扪及(04系统没有选项)
  918 + physiqueCheck.setLeftVolume(((List<Object>)baseInfo.get("gaowan")).get(3)!=null?((List<Object>)baseInfo.get("gaowan")).get(3).toString():"");// 睾丸左体积
  919 + physiqueCheck.setRightVolume(((List<Object>)baseInfo.get("gaowan")).get(4)!=null?((List<Object>)baseInfo.get("gaowan")).get(4).toString():"");//睾丸右体积
  920 + }else {
  921 + physiqueCheck.setTestesType("01");
  922 + }
  923 +
  924 + if(null!=((List<Object>)baseInfo.get("jsjmqz")).get(0)){
  925 + physiqueCheck.setVaricoceleType(((List<Object>)baseInfo.get("jsjmqz")).get(0).toString().equals("0")?"01":"02");// 精索静脉曲张 01无 02有
  926 + physiqueCheck.setVaricoceleDegree(((List<Object>)baseInfo.get("jsjmqz")).get(2)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(2).toString():"");// 精索静脉曲张程度
  927 + physiqueCheck.setVaricocelePart(((List<Object>)baseInfo.get("jsjmqz")).get(1)!=null?((List<Object>)baseInfo.get("jsjmqz")).get(1).toString():"");// 精索静脉曲张部位
  928 + }else {
  929 + physiqueCheck.setVaricoceleType("01");
  930 + }
915 931 physiqueCheck.setRightNodules(null);// 右结节(系统没有字段)
916 932 physiqueCheck.setLeftNodules(null);// 左结节(系统没有字段)
917 933 }else {//女性