diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 8701c81..830e14c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -2674,9 +2674,29 @@ public class SieveFacade { // data.put("Address", sive.getPlaceDomicile());//地址 data.put("Address", "");//地址 data.put("Phone", sive.getPhone());//电话 - data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数) + try { + if(sive.getNoOfFetuses() == null || sive.getNoOfFetuses()==0 ){ + data.put("NoOfFetuses", 1); + }else { + data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数) + } + } catch (Exception e) { + e.printStackTrace(); + data.put("NoOfFetuses",1); + } data.put("LMPDate", sive.getLastMenstrual());//末次月经必填 - data.put("Smoking", sive.getSmoking());//吸烟 + + try { + if(sive.getSmoking() == 0 || sive.getSmoking() == 1){ + data.put("Smoking", sive.getSmoking());//吸烟 + }else { + data.put("Smoking", 0);//吸烟 + } + } catch (Exception e) { + data.put("Smoking", 0); + } + + data.put("Weight", sive.getWeight());//体重 data.put("Insulin", sive.getInsulin());//I-型糖尿病 data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期) @@ -3022,7 +3042,7 @@ public class SieveFacade { SieveAddRequest sieveAddRequest = new SieveAddRequest(); sieveAddRequest.setPublishName(String.valueOf(id));//录入人员 - sieveAddRequest.setResultTime(importResult.get风险评估时间()); //结果录入时间 + sieveAddRequest.setResultTime(importResult.get风险计算时间()); //结果录入时间 if (StringUtils.isNotEmpty(importResult.getT21风险值())) {// 唐氏综合症 21-三体 Map map = new HashMap(); map.put("valueOne", "1");//郝总说固定值是1