diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java index 2ad369d..00608ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java @@ -279,7 +279,6 @@ public class DzfyFmService { List babies = new ArrayList<>(); MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); - for (Fm item : list) { if(item.getID().equals(id)){ try{ @@ -289,20 +288,12 @@ public class DzfyFmService { continue; } ExceptionUtils.catchException("item===" + item); - // String dueDateStr = item.getBABY_DELIVERY_TIME().toString(); dueDate = item.getBABY_DELIVERY_TIME(); if (!StringUtils.isNotEmpty(dueDate.toString())) { continue; } - /*try{ - dueDate = fmt.parse(dueDateStr); - }catch (Exception e) - { - dueDate = fmt.parse(dueDateStr); - }*/ - - + //根据患者ID查询分娩记录的基本信息 FmPatInfo patInfo = getFmPatInfoById(item.getID()); /*FmPatInfo patInfo = new FmPatInfo(); patInfo.setSyxh("33299"); @@ -310,7 +301,6 @@ public class DzfyFmService { patInfo.setCardNo("123654"); patInfo.setPhone("18613211129");*/ - if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); @@ -319,6 +309,8 @@ public class DzfyFmService { ExceptionUtils.catchException("phone="+patInfo.getPhone()+" cardNo="+ patInfo.getCardNo()); String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()}; query.setPc(strs); + + //查询该孕妇是否在孕产婴系统中建档 List patientses = patientsService.queryPatient(query); if (CollectionUtils.isNotEmpty(patientses)) { @@ -336,11 +328,29 @@ public class DzfyFmService { if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) { - //MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(item.getBABY_DELIVERY_TIME().toString())) { continue; } - deliverAddRequest.setDeliverDoctor(users.get(0).getId()+""); + Map map = new HashMap<>(); + Map totalMap = new HashMap<>(); + + Integer prod_Process_One = item.getPROD_PROCESS_ONE(); + Integer prod_Process_Two = item.getPROD_PROCESS_TWO(); + Integer prod_Process_Three = item.getPROD_PROCESS_THREE(); + if(prod_Process_One!=null){ + map.put("cc1",item.getPROD_PROCESS_ONE().toString()); + } + if(prod_Process_Two!=null){ + map.put("cc2",item.getPROD_PROCESS_TWO().toString()); + } + if(prod_Process_Three!=null){ + map.put("cc2",item.getPROD_PROCESS_THREE().toString()); + } + totalMap.put("zcc",item.getTOTAL_PROCESS()); + deliverAddRequest.setTotalprocess(totalMap); + deliverAddRequest.setProdprocess(map); + deliverAddRequest.setDeliverDoctor(item.getDELIVER_DOCTOR()); deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); deliverAddRequest.setParentId(patient.getId()); deliverAddRequest.setPid(patient.getPid()); @@ -358,8 +368,10 @@ public class DzfyFmService { } deliverAddRequest.setTireNumber(item.getFETUS_NUM());// 胎数(之前赋值为死值1) - deliverAddRequest.setPlacenta(item.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) - + Integer placenta_Num = item.getPLACENTA_NUM(); + if(placenta_Num!=null){ + deliverAddRequest.setPlacenta(item.getPLACENTA_NUM().toString());// 胎盘(之前赋值为死值1) + } if ("完好".equals(item.getPERINEAL_CONDITION()) || "无".equals(item.getPERINEAL_CONDITION())) { deliverAddRequest.setPerinealCondition("full"); } else if ("会阴切开".equals(item.getPERINEAL_CONDITION()) || "侧切".equals(item.getPERINEAL_CONDITION())) { @@ -381,10 +393,6 @@ public class DzfyFmService { } } - - - - Map deliveryMode = new HashMap(); //分娩方式 String fmfs = ""; @@ -410,10 +418,9 @@ public class DzfyFmService { extPlacenta.setTpmcType(tpmcType); extPlacentas.add(extPlacenta); deliverAddRequest.setExtPlacentas(extPlacentas); - //a=1; + //儿童 - //List babies = new ArrayList<>(); MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); Map as = new HashMap<>(); Integer pf1 = item.getBABY_APGAR_SCORE_ONE(); @@ -445,7 +452,7 @@ public class DzfyFmService { baby.setAsphyxiaM(item.getBABY_ASPHYXIAM().toString()); //窒息分钟 } - baby.setDeformity("无".equals(item.getBABY_DEFORMITY()) ? 0 : 1); //畸形 0非畸形 1畸形 + baby.setDeformity("".equals(item.getBABY_DEFORMITY()) ? 0 : 1); //畸形 0非畸形 1畸形 String baby_Pregnancy_Out = item.getBABY_PREGNANCY_OUT(); if(baby_Pregnancy_Out!=null && StringUtils.isNotEmpty(baby_Pregnancy_Out)){ @@ -454,33 +461,50 @@ public class DzfyFmService { baby.setDueTime(fmt.format(dueDate));//分娩时间 babies.add(baby); - //deliverAddRequest.setBabies(babies); - //deliverAddRequest.setFmHospital("216"); //设置为秦皇岛分娩医院 - //ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest); - //matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); - //deleteFmHistoryRecord(item.getSyxh()); + } }else{ - //德州服务器有分娩记录，但是在这边系统没有对于孕妇 取分娩信息建档儿童数据 + //德州服务器有分娩记录，但是在这边系统没有对应孕妇 取分娩信息建档儿童数据 String babyName = patInfo.getName()+("男".equals(item.getBABY_SEX()) ? "之子" : "之女"); FmItem fmitem=new FmItem(); fmitem.setCcqk(item.getBABY_PREGNANCY_OUT()); fmitem.setYexb(item.getBABY_SEX()); fmitem.setRc(item.getDUE_WEEK()); fmitem.setFmfs(item.getDELIVERY_MODE()); - fmitem.setDjt(item.getFETUS_NUM().toString()); + Integer fetus_Num = item.getFETUS_NUM(); + if(fetus_Num!=null){ + fmitem.setDjt(item.getFETUS_NUM().toString()); + } fmitem.setCjc(""); - fmitem.setTz(item.getBABY_WEIGHT().toString()); - fmitem.setSc(item.getBABY_HEIGHT().toString()); - fmitem.setYfz(item.getBABY_APGAR_SCORE_ONE().toString()); - fmitem.setWfz(item.getBABY_APGAR_SCORE_FIVE().toString()); - fmitem.setSfz(item.getBABY_APGAR_SCORE_TEN().toString()); + Integer babyHeight = item.getBABY_HEIGHT(); + Integer babyWeight = item.getBABY_WEIGHT(); + if(babyHeight!=null){ + fmitem.setSc(item.getBABY_HEIGHT().toString()); + } + if(babyWeight!=null){ + fmitem.setTz(item.getBABY_WEIGHT().toString()); + } + Integer pf1 = item.getBABY_APGAR_SCORE_ONE(); + Integer pf5 = item.getBABY_APGAR_SCORE_FIVE(); + Integer pf10 = item.getBABY_APGAR_SCORE_TEN(); + if(pf1!=null){ + fmitem.setYfz(item.getBABY_APGAR_SCORE_ONE().toString()); + } + if(pf5!=null){ + fmitem.setWfz(item.getBABY_APGAR_SCORE_FIVE().toString()); + } + if(pf10!=null){ + fmitem.setSfz(item.getBABY_APGAR_SCORE_TEN().toString()); + } fmitem.setSfgw(""); - fmitem.setJx(item.getBABY_DEFORMITY().toString()); + Integer baby_Deformity = item.getBABY_DEFORMITY(); + if(baby_Deformity!=null){ + fmitem.setJx(item.getBABY_DEFORMITY().toString()); + } buildBaby(fmitem, patInfo, dueDate, babyName); } @@ -489,7 +513,13 @@ public class DzfyFmService { }else{ //没有找到孕妇建档的基本信息 记录下来 SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH:mm:ss"); - saveFmrecord(item.getID(), format.parse(item.getCREATED().toString())); + String nowDate = format.format(new Date()); + Date date = item.getCREATED(); + if(date==null){ + saveFmrecord(item.getID(), format.parse(nowDate)); + }else { + saveFmrecord(item.getID(), format.parse(item.getCREATED().toString())); + } } @@ -499,27 +529,7 @@ public class DzfyFmService { continue; } - }/*else if(item.getID().equals(id)){ - MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby(); - Map as = new HashMap<>(); - as.put("pf1", item.getBABY_APGAR_SCORE_ONE().toString()); - as.put("pf5", item.getBABY_APGAR_SCORE_FIVE().toString()); - as.put("pf10", item.getBABY_APGAR_SCORE_TEN().toString()); - baby.setApgarScore(as); - baby.setBabyGender("男".equals(item.getBABY_SEX()) ? "1" : "0"); - baby.setBabyHeight(item.getBABY_HEIGHT().toString());//新生儿生长 - baby.setBabyWeight(item.getBABY_WEIGHT().toString());//新生儿重量 - baby.setDeformity("无".equals(item.getBABY_DEFORMITY()) ? 0 : 1); //畸形 0非畸形 1畸形 - baby.setAsphyxiaM(item.getBABY_ASPHYXIAM().toString()); //窒息分钟 - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getBABY_PREGNANCY_OUT())); // 妊娠结局 - baby.setDueTime(fmt1.format(dueDate));//分娩时间 - babies.add(baby); - - - }*/ - - - + } }