From a154398f2c9cc78a643f08ce92951200b2e37647 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Sun, 14 Aug 2016 17:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 49 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 05d1b7a..308001b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -50,6 +50,8 @@ public class MatDeliverFacade {
 
     private static Map<Integer,String> ONE_ENUMS= new HashMap<>();
     static {
+        ONE_ENUMS.put(0,"长");
+        ONE_ENUMS.put(1,"次");
         ONE_ENUMS.put(2,"三");
         ONE_ENUMS.put(3,"四");
         ONE_ENUMS.put(4,"五");
@@ -203,11 +205,12 @@ public class MatDeliverFacade {
 
 
     private static List buildBabyName(List<MatDeliverAddRequest.Baby> list) {
-        Map<String, List> babyMap = new HashMap<>();
+     /*   Map<String, List> babyMap = new HashMap<>();
         List<String> b1 = new ArrayList<>();
         b1.add("长女");
         b1.add("次女");
-        babyMap.put("00", b1);
+        b1.add("三女");
+        babyMap.put("000", b1);
 
         List<String> b2 = new ArrayList<>();
         b2.add("长子");
@@ -222,31 +225,59 @@ public class MatDeliverFacade {
         b4.add("之女");
         b4.add("之子");
         babyMap.put("01", b4);
-        babyMap.put("10", b3);
+        babyMap.put("10", b3);*/
+
+
+        int boyCount =0;
+        int girlCount =0;
+        List<String> l = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            MatDeliverAddRequest.Baby baby = list.get(i);
+            if(StringUtils.isNotEmpty(baby.getBabyGender())){
+                if("1".equals(baby.getBabyGender())){
+                    l.add(ONE_ENUMS.get(boyCount)+"子");
+                    boyCount++;
+                }else if("0".equals(baby.getBabyGender())){
+                    l.add(ONE_ENUMS.get(girlCount)+"女");
+                    girlCount++;
+                }
+            }
+        }
+        System.out.print(l);
+
+
+
+    return  l;
+      /*  String id="";
 
-        String id="";
         for (int i = 0; i < list.size() && i < 2; i++) {
             MatDeliverAddRequest.Baby baby = list.get(i);
             if(StringUtils.isNotEmpty(baby.getBabyGender())){
                 id+=baby.getBabyGender();
             }
         }
-        return babyMap.get(id);
+        return babyMap.get(id);*/
     }
 
     public  static void main(String[] args){
         MatDeliverAddRequest.Baby baby=new MatDeliverAddRequest.Baby();
-        baby.setBabyGender("1");
+        baby.setBabyGender("0");
 
         MatDeliverAddRequest.Baby baby1=new MatDeliverAddRequest.Baby();
         baby1.setBabyGender("1");
         MatDeliverAddRequest.Baby baby2=new MatDeliverAddRequest.Baby();
         baby2.setBabyGender("0");
+        MatDeliverAddRequest.Baby baby3=new MatDeliverAddRequest.Baby();
+        baby3.setBabyGender("1");
+        MatDeliverAddRequest.Baby baby4=new MatDeliverAddRequest.Baby();
+        baby4.setBabyGender("0");
         List list = new ArrayList();
         list.add(baby);
         list.add(baby1);
         list.add(baby2);
-        System.out.print((buildBabyName(list)));
+        list.add(baby3);
+        list.add(baby4);
+        buildBabyName(list);
     }
 
     /**
@@ -293,10 +324,8 @@ public class MatDeliverFacade {
             babyModel.setEarlySuck(baby1.getEarlySuck());
             babyModel.setParentId(parentId);
             babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
-            if(CollectionUtils.isNotEmpty(babyName)&&i<babyName.size()){
+            if(CollectionUtils.isNotEmpty(babyName)){
                 babyModel.setName(userName + babyName.get(i));
-            }else if(i>=2){
-                babyModel.setName(userName + ONE_ENUMS.get(i) + (babyModel.getSex() == 1 ? "子" : "女"));
             }
             babyModel.setYn(YnEnums.NO.getId());
 
-- 
1.8.3.1