Commit 9cf012bd446c8c19a95190435565b33dc1305465

Authored by wtt
1 parent 7241f41898

update

Showing 1 changed file with 23 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 9cf012b
... ... @@ -2674,9 +2674,29 @@
2674 2674 // data.put("Address", sive.getPlaceDomicile());//地址
2675 2675 data.put("Address", "");//地址
2676 2676 data.put("Phone", sive.getPhone());//电话
2677   - data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数)
  2677 + try {
  2678 + if(sive.getNoOfFetuses() == null || sive.getNoOfFetuses()==0 ){
  2679 + data.put("NoOfFetuses", 1);
  2680 + }else {
  2681 + data.put("NoOfFetuses", sive.getNoOfFetuses());//胎儿数(胎数)
  2682 + }
  2683 + } catch (Exception e) {
  2684 + e.printStackTrace();
  2685 + data.put("NoOfFetuses",1);
  2686 + }
2678 2687 data.put("LMPDate", sive.getLastMenstrual());//末次月经必填
2679   - data.put("Smoking", sive.getSmoking());//吸烟
  2688 +
  2689 + try {
  2690 + if(sive.getSmoking() == 0 || sive.getSmoking() == 1){
  2691 + data.put("Smoking", sive.getSmoking());//吸烟
  2692 + }else {
  2693 + data.put("Smoking", 0);//吸烟
  2694 + }
  2695 + } catch (Exception e) {
  2696 + data.put("Smoking", 0);
  2697 + }
  2698 +
  2699 +
2680 2700 data.put("Weight", sive.getWeight());//体重
2681 2701 data.put("Insulin", sive.getInsulin());//I-型糖尿病
2682 2702 data.put("CollectionDate", sive.getCollectionDate());//采样日期(采血日期)
... ... @@ -3022,7 +3042,7 @@
3022 3042  
3023 3043 SieveAddRequest sieveAddRequest = new SieveAddRequest();
3024 3044 sieveAddRequest.setPublishName(String.valueOf(id));//录入人员
3025   - sieveAddRequest.setResultTime(importResult.get风险评估时间()); //结果录入时间
  3045 + sieveAddRequest.setResultTime(importResult.get风险计算时间()); //结果录入时间
3026 3046 if (StringUtils.isNotEmpty(importResult.getT21风险值())) {// 唐氏综合症 21-三体
3027 3047 Map map = new HashMap();
3028 3048 map.put("valueOne", "1");//郝总说固定值是1