shiyang / regional-platform

Download as
Browse Code »

Commit ebad864597845c74d919c6e9bec60d46f2c06f1b

Authored by jiangjiazhi
1 parent a154398f2c
Exists in master and in 1 other branch nobuildprocess

增加设置parentid

Showing 1 changed file with 59 additions and 43 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ ebad864
... ... @@ -48,15 +48,16 @@
48 48 @Autowired
49 49 private PersonService personService;
50 50  
51   - private static Map<Integer,String> ONE_ENUMS= new HashMap<>();
  51 + private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
  52 +
52 53 static {
53   - ONE_ENUMS.put(0,"长");
54   - ONE_ENUMS.put(1,"次");
55   - ONE_ENUMS.put(2,"三");
56   - ONE_ENUMS.put(3,"四");
57   - ONE_ENUMS.put(4,"五");
58   - ONE_ENUMS.put(5,"六");
59   - ONE_ENUMS.put(6,"七");
  54 + ONE_ENUMS.put(0, "长");
  55 + ONE_ENUMS.put(1, "次");
  56 + ONE_ENUMS.put(2, "三");
  57 + ONE_ENUMS.put(3, "四");
  58 + ONE_ENUMS.put(4, "五");
  59 + ONE_ENUMS.put(5, "六");
  60 + ONE_ENUMS.put(6, "七");
60 61 }
61 62  
62 63 /**
63 64  
... ... @@ -205,12 +206,11 @@
205 206  
206 207  
207 208 private static List buildBabyName(List<MatDeliverAddRequest.Baby> list) {
208   - /* Map<String, List> babyMap = new HashMap<>();
  209 + Map<String, List> babyMap = new HashMap<>();
209 210 List<String> b1 = new ArrayList<>();
210 211 b1.add("长女");
211 212 b1.add("次女");
212   - b1.add("三女");
213   - babyMap.put("000", b1);
  213 + babyMap.put("00", b1);
214 214  
215 215 List<String> b2 = new ArrayList<>();
216 216 b2.add("长子");
217 217  
218 218  
219 219  
220 220  
221 221  
... ... @@ -225,29 +225,45 @@
225 225 b4.add("之女");
226 226 b4.add("之子");
227 227 babyMap.put("01", b4);
228   - babyMap.put("10", b3);*/
  228 + babyMap.put("10", b3);
  229 + List<String> b5 = new ArrayList<>();
  230 + b5.add("之子");
  231 + List<String> b6 = new ArrayList<>();
  232 + b6.add("之女");
229 233  
  234 + babyMap.put("1", b5);
  235 + babyMap.put("0", b6);
230 236  
231   - int boyCount =0;
232   - int girlCount =0;
233   - List<String> l = new ArrayList<>();
234   - for (int i = 0; i < list.size(); i++) {
235   - MatDeliverAddRequest.Baby baby = list.get(i);
236   - if(StringUtils.isNotEmpty(baby.getBabyGender())){
237   - if("1".equals(baby.getBabyGender())){
238   - l.add(ONE_ENUMS.get(boyCount)+"子");
239   - boyCount++;
240   - }else if("0".equals(baby.getBabyGender())){
241   - l.add(ONE_ENUMS.get(girlCount)+"女");
242   - girlCount++;
  237 +
  238 + String id = "";
  239 + if (list.size() > 2) {
  240 + int boyCount = 0;
  241 + int girlCount = 0;
  242 + List<String> l = new ArrayList<>();
  243 + for (int i = 0; i < list.size(); i++) {
  244 + MatDeliverAddRequest.Baby baby = list.get(i);
  245 + if (StringUtils.isNotEmpty(baby.getBabyGender())) {
  246 + if ("1".equals(baby.getBabyGender())) {
  247 + l.add(ONE_ENUMS.get(boyCount) + "子");
  248 + boyCount++;
  249 + } else if ("0".equals(baby.getBabyGender())) {
  250 + l.add(ONE_ENUMS.get(girlCount) + "女");
  251 + girlCount++;
  252 + }
243 253 }
244 254 }
  255 + return l;
  256 + } else {
  257 + for (int i = 0; i < list.size(); i++) {
  258 + MatDeliverAddRequest.Baby baby = list.get(i);
  259 + if (StringUtils.isNotEmpty(baby.getBabyGender())) {
  260 + id += baby.getBabyGender();
  261 + }
  262 + }
  263 + return babyMap.get(id);
245 264 }
246   - System.out.print(l);
247 265  
248 266  
249   -
250   - return l;
251 267 /* String id="";
252 268  
253 269 for (int i = 0; i < list.size() && i < 2; i++) {
254 270  
255 271  
256 272  
257 273  
258 274  
259 275  
... ... @@ -259,25 +275,25 @@
259 275 return babyMap.get(id);*/
260 276 }
261 277  
262   - public static void main(String[] args){
263   - MatDeliverAddRequest.Baby baby=new MatDeliverAddRequest.Baby();
264   - baby.setBabyGender("0");
  278 + public static void main(String[] args) {
  279 + MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
  280 + baby.setBabyGender("1");
265 281  
266   - MatDeliverAddRequest.Baby baby1=new MatDeliverAddRequest.Baby();
  282 + MatDeliverAddRequest.Baby baby1 = new MatDeliverAddRequest.Baby();
267 283 baby1.setBabyGender("1");
268   - MatDeliverAddRequest.Baby baby2=new MatDeliverAddRequest.Baby();
  284 + MatDeliverAddRequest.Baby baby2 = new MatDeliverAddRequest.Baby();
269 285 baby2.setBabyGender("0");
270   - MatDeliverAddRequest.Baby baby3=new MatDeliverAddRequest.Baby();
  286 + MatDeliverAddRequest.Baby baby3 = new MatDeliverAddRequest.Baby();
271 287 baby3.setBabyGender("1");
272   - MatDeliverAddRequest.Baby baby4=new MatDeliverAddRequest.Baby();
  288 + MatDeliverAddRequest.Baby baby4 = new MatDeliverAddRequest.Baby();
273 289 baby4.setBabyGender("0");
274 290 List list = new ArrayList();
275 291 list.add(baby);
276 292 list.add(baby1);
277   - list.add(baby2);
  293 + /*list.add(baby2);
278 294 list.add(baby3);
279   - list.add(baby4);
280   - buildBabyName(list);
  295 + list.add(baby4); */
  296 + System.out.print(buildBabyName(list));;
281 297 }
282 298  
283 299 /**
... ... @@ -294,8 +310,8 @@
294 310 private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients) {
295 311  
296 312  
297   - List babyName = buildBabyName(list);
298   - int i =0;
  313 + List babyName = buildBabyName(list);
  314 + int i = 0;
299 315 for (MatDeliverAddRequest.Baby baby : list) {
300 316 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
301 317 babyList.add(baby1);
... ... @@ -324,7 +340,7 @@
324 340 babyModel.setEarlySuck(baby1.getEarlySuck());
325 341 babyModel.setParentId(parentId);
326 342 babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
327   - if(CollectionUtils.isNotEmpty(babyName)){
  343 + if (CollectionUtils.isNotEmpty(babyName)) {
328 344 babyModel.setName(userName + babyName.get(i));
329 345 }
330 346 babyModel.setYn(YnEnums.NO.getId());
... ... @@ -393,7 +409,7 @@
393 409 //外院的孕妇在本院没有建档需要提醒建档
394 410 } else if (null != patients1 && null == patients) {
395 411 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
396   - }else if( null == patients){
  412 + } else if (null == patients) {
397 413 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
398 414 }
399 415