shiyang / regional-platform

Download as
Browse Code »

Commit 5f152653df13639fd78795491a25f21d3c584aa7

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

增加设置parentid

Showing 1 changed file with 58 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 5f15265
... ... @@ -48,6 +48,15 @@
48 48 @Autowired
49 49 private PersonService personService;
50 50  
  51 + private static Map<Integer,String> ONE_ENUMS= new HashMap<>();
  52 + static {
  53 + ONE_ENUMS.put(3,"三");
  54 + ONE_ENUMS.put(4,"四");
  55 + ONE_ENUMS.put(5,"五");
  56 + ONE_ENUMS.put(6,"六");
  57 + ONE_ENUMS.put(7,"七");
  58 + }
  59 +
51 60 /**
52 61 * 增加或者修改分娩记录
53 62 *
... ... @@ -192,6 +201,39 @@
192 201 return babyModel;
193 202 }
194 203  
  204 +
  205 + private List buildBabyName(List<MatDeliverAddRequest.Baby> list) {
  206 + Map<String, List> babyMap = new HashMap<>();
  207 + List<String> b1 = new ArrayList<>();
  208 + b1.add("长女");
  209 + b1.add("次女");
  210 + babyMap.put("00", b1);
  211 +
  212 + List<String> b2 = new ArrayList<>();
  213 + b2.add("长子");
  214 + b2.add("次子");
  215 + babyMap.put("11", b2);
  216 +
  217 + List<String> b3 = new ArrayList<>();
  218 + b3.add("之子");
  219 + b3.add("之女");
  220 +
  221 + List<String> b4 = new ArrayList<>();
  222 + b4.add("之女");
  223 + b4.add("之子");
  224 + babyMap.put("01", b4);
  225 + babyMap.put("10", b3);
  226 +
  227 + String id="";
  228 + for (int i = 0; i < list.size() && i <= 2; i++) {
  229 + MatDeliverAddRequest.Baby baby = list.get(i);
  230 + if(StringUtils.isNotEmpty(baby.getBabyGender())){
  231 + id+=baby.getBabyGender();
  232 + }
  233 + }
  234 + return babyMap.get(id);
  235 + }
  236 +
195 237 /**
196 238 * 处理儿童
197 239 *
... ... @@ -204,6 +246,10 @@
204 246 * @param userName
205 247 */
206 248 private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients) {
  249 +
  250 +
  251 + List babyName = buildBabyName(list);
  252 + int i =0;
207 253 for (MatDeliverAddRequest.Baby baby : list) {
208 254 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
209 255 babyList.add(baby1);
... ... @@ -232,6 +278,11 @@
232 278 babyModel.setEarlySuck(baby1.getEarlySuck());
233 279 babyModel.setParentId(parentId);
234 280 babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
  281 + if(CollectionUtils.isNotEmpty(babyName)&&i<babyName.size()){
  282 + babyModel.setName(userName + babyName.get(i));
  283 + }else if(i>2){
  284 + babyModel.setName(userName + ONE_ENUMS.get(i) + (babyModel.getSex() == 1 ? "子" : "女"));
  285 + }
235 286 babyModel.setYn(YnEnums.NO.getId());
236 287  
237 288 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMcertNo())) {
... ... @@ -259,6 +310,7 @@
259 310 babyModel.setPid(personService.addPerson(personModel).getId());
260 311 }
261 312 babyIds.add(babyService.addOneBaby(babyModel).getId());
  313 + i++;
262 314 }
263 315 maternalDeliverModel.setBaby(babyList);
264 316 }
265 317  
266 318  
267 319  
268 320  
269 321  
... ... @@ -282,23 +334,22 @@
282 334 return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
283 335 }*/
284 336 //外院的孕妇
285   - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1,false);
  337 + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false);
286 338 //外院的产妇
287 339 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3);
288 340  
289 341 //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug
290 342 //本院的孕妇
291   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1,false);
  343 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false);
292 344 //本院产妇
293   - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3,false);
  345 + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false);
294 346 //本院产妇，并且本院没建档需要提醒补录记录
295   - if(null!=patients3 && null==patients){
296   - patients=patients3;
  347 + if (null != patients3 && null == patients) {
  348 + patients = patients3;
297 349 //外院的孕妇在本院没有建档需要提醒建档
298   - }else if (null != patients1 && null == patients) {
  350 + } else if (null != patients1 && null == patients) {
299 351 return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
300 352 }
301   -
302 353  
303 354  
304 355 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();