From ebad864597845c74d919c6e9bec60d46f2c06f1b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 14 Aug 2016 17:27:06 +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 | 102 ++++++++++++--------- 1 file changed, 59 insertions(+), 43 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 308001b..ed3b8ed 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 @@ -48,15 +48,16 @@ public class MatDeliverFacade { @Autowired private PersonService personService; - private static Map ONE_ENUMS= new HashMap<>(); + private static Map 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,"五"); - ONE_ENUMS.put(5,"六"); - ONE_ENUMS.put(6,"七"); + ONE_ENUMS.put(0, "长"); + ONE_ENUMS.put(1, "次"); + ONE_ENUMS.put(2, "三"); + ONE_ENUMS.put(3, "四"); + ONE_ENUMS.put(4, "五"); + ONE_ENUMS.put(5, "六"); + ONE_ENUMS.put(6, "七"); } /** @@ -205,12 +206,11 @@ public class MatDeliverFacade { private static List buildBabyName(List list) { - /* Map babyMap = new HashMap<>(); + Map babyMap = new HashMap<>(); List b1 = new ArrayList<>(); b1.add("长女"); b1.add("次女"); - b1.add("三女"); - babyMap.put("000", b1); + babyMap.put("00", b1); List b2 = new ArrayList<>(); b2.add("长子"); @@ -225,29 +225,45 @@ public class MatDeliverFacade { b4.add("之女"); b4.add("之子"); babyMap.put("01", b4); - babyMap.put("10", b3);*/ - - - int boyCount =0; - int girlCount =0; - List 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++; + babyMap.put("10", b3); + List b5 = new ArrayList<>(); + b5.add("之子"); + List b6 = new ArrayList<>(); + b6.add("之女"); + + babyMap.put("1", b5); + babyMap.put("0", b6); + + + String id = ""; + if (list.size() > 2) { + int boyCount = 0; + int girlCount = 0; + List 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++; + } } } + return l; + } else { + for (int i = 0; i < list.size(); i++) { + MatDeliverAddRequest.Baby baby = list.get(i); + if (StringUtils.isNotEmpty(baby.getBabyGender())) { + id += baby.getBabyGender(); + } + } + return babyMap.get(id); } - System.out.print(l); - - return l; /* String id=""; for (int i = 0; i < list.size() && i < 2; i++) { @@ -259,25 +275,25 @@ public class MatDeliverFacade { return babyMap.get(id);*/ } - public static void main(String[] args){ - MatDeliverAddRequest.Baby baby=new MatDeliverAddRequest.Baby(); - baby.setBabyGender("0"); + public static void main(String[] args) { + MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); + baby.setBabyGender("1"); - MatDeliverAddRequest.Baby baby1=new MatDeliverAddRequest.Baby(); + MatDeliverAddRequest.Baby baby1 = new MatDeliverAddRequest.Baby(); baby1.setBabyGender("1"); - MatDeliverAddRequest.Baby baby2=new MatDeliverAddRequest.Baby(); + MatDeliverAddRequest.Baby baby2 = new MatDeliverAddRequest.Baby(); baby2.setBabyGender("0"); - MatDeliverAddRequest.Baby baby3=new MatDeliverAddRequest.Baby(); + MatDeliverAddRequest.Baby baby3 = new MatDeliverAddRequest.Baby(); baby3.setBabyGender("1"); - MatDeliverAddRequest.Baby baby4=new MatDeliverAddRequest.Baby(); + MatDeliverAddRequest.Baby baby4 = new MatDeliverAddRequest.Baby(); baby4.setBabyGender("0"); List list = new ArrayList(); list.add(baby); list.add(baby1); - list.add(baby2); + /*list.add(baby2); list.add(baby3); - list.add(baby4); - buildBabyName(list); + list.add(baby4); */ + System.out.print(buildBabyName(list));; } /** @@ -294,8 +310,8 @@ public class MatDeliverFacade { private void handBaby(MatDeliverAddRequest deliverAddRequest, List babyList, MaternalDeliverModel maternalDeliverModel, List list, List babyIds, String parentId, String userName, Patients patients) { - List babyName = buildBabyName(list); - int i =0; + List babyName = buildBabyName(list); + int i = 0; for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); babyList.add(baby1); @@ -324,7 +340,7 @@ public class MatDeliverFacade { babyModel.setEarlySuck(baby1.getEarlySuck()); babyModel.setParentId(parentId); babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); - if(CollectionUtils.isNotEmpty(babyName)){ + if (CollectionUtils.isNotEmpty(babyName)) { babyModel.setName(userName + babyName.get(i)); } babyModel.setYn(YnEnums.NO.getId()); @@ -393,7 +409,7 @@ public class MatDeliverFacade { //外院的孕妇在本院没有建档需要提醒建档 } else if (null != patients1 && null == patients) { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); - }else if( null == patients){ + } else if (null == patients) { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } -- 1.8.3.1