diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index e1a0bfe..74e7933 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -61,10 +61,11 @@ public class QhdfyFmService { Connection conn = ConnTools.makeFmConnection(); QueryRunner queryRunner = new QueryRunner(); SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHH:mm:ss"); + SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); try {//select count(*) from JHMK_FMJL where CONVERT(varchar(16),SSRQ, 20) > CONVERT(varchar(16),'20170110', 20) List list = queryRunner.query(conn, "select * from JHMK_FMJL where " + " CONVERT(varchar(50),SSRQ, 20) > CONVERT(varchar(50),'"+start+"', 20) and CONVERT(varchar(50),SSRQ, 20) <= CONVERT(varchar(50),'"+end+"', 20)" + - "and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 '))", new BeanListHandler(FmItem.class)); + " and SYXH not in (select SYXH from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 '))", new BeanListHandler(FmItem.class)); if (CollectionUtils.isNotEmpty(list)) { for(FmItem item : list) { @@ -175,8 +176,8 @@ public class QhdfyFmService { List babies = new ArrayList<>(); MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); Map as = new HashMap<>(); - as.put("pf1",item.getYfz()); - as.put("pf5",item.getWfz()); + as.put("pf1", item.getYfz()); + as.put("pf5", item.getWfz()); as.put("pf10", item.getSfz()); baby.setApgarScore(JsonUtil.obj2JsonString(as)); baby.setBabyGender("男".equals(item.getYexb()) ? "1" : "0"); @@ -186,7 +187,7 @@ public class QhdfyFmService { baby.setAsphyxiaM(item.getZx()); //窒息分钟 baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局 baby.setBabyHealthy(item.getYeqk()); //新生儿疾病 - baby.setDueTime(item.getSsrq());//分娩时间 + baby.setDueTime(fmt1.format(dueDate));//分娩时间 babies.add(baby); matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); } @@ -316,14 +317,22 @@ public class QhdfyFmService { for (FmItem item1 : items) { + + String dueDateStr1 = item1.getSsrq(); + if (!StringUtils.isNotEmpty(dueDateStr1)) + { + continue; + } + Date dueDate1 = fmt.parse(dueDateStr1); + MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); - extPlacenta.setMcType(FmTypeEnums.getIdByName(item.getFmfs())); //分娩方式 + extPlacenta.setMcType(FmTypeEnums.getIdByName(item1.getFmfs())); //分娩方式 String tpmcType = ""; - if ("手术产".equals(item.getTpmcfs())) + if ("手术产".equals(item1.getTpmcfs())) { tpmcType = TpmcTypeEnums.O2.getId(); } - else if ("自然产出".equals(item.getTpmcfs())) + else if ("自然产出".equals(item1.getTpmcfs())) { tpmcType = TpmcTypeEnums.O.getId(); } @@ -332,18 +341,18 @@ public class QhdfyFmService { MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); Map as = new HashMap<>(); - as.put("pf1",item.getYfz()); - as.put("pf5",item.getWfz()); - as.put("pf10", item.getSfz()); + as.put("pf1",item1.getYfz()); + as.put("pf5",item1.getWfz()); + as.put("pf10", item1.getSfz()); baby.setApgarScore(JsonUtil.obj2JsonString(as)); - baby.setBabyGender("男".equals(item.getYexb()) ? "1" : "0"); - baby.setBabyHeight(item.getSc());//新生儿生长 - baby.setBabyWeight(item.getTz());//新生儿重量 - baby.setDeformity("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 - baby.setAsphyxiaM(item.getZx()); //窒息分钟 - baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局 - baby.setBabyHealthy(item.getYeqk()); //新生儿疾病 - baby.setDueTime(item.getSsrq());//分娩时间 + baby.setBabyGender("男".equals(item1.getYexb()) ? "1" : "0"); + baby.setBabyHeight(item1.getSc());//新生儿生长 + baby.setBabyWeight(item1.getTz());//新生儿重量 + baby.setDeformity("无".equals(item1.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 + baby.setAsphyxiaM(item1.getZx()); //窒息分钟 + baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item1.getCcqk())); // 妊娠结局 + baby.setBabyHealthy(item1.getYeqk()); //新生儿疾病 + baby.setDueTime(fmt1.format(dueDate1));//分娩时间 babies.add(baby); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6d0c6c8..291761f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -800,7 +800,7 @@ public class BabyBookbuildingFacade { bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); bm.setDueType(b.getDueType()); bm.setMalformation(b.getMalformation()); - bm.setOrg(b.getDeliverOrg()); + bm.setDeliverOrg(b.getDeliverOrg()); bm.setBuildDoctor(b.getBuildDoctor()); bm.setBuildDate(DateUtil.parseYMD(b.getBuildDate())); bm.setServiceType(b.getServiceType()); @@ -931,7 +931,7 @@ public class BabyBookbuildingFacade { result.setBabyHeight(model.getBabyHeight()); result.setBabyWeight(model.getBabyWeight()); result.setBabyHead(model.getBabyHead()); - result.setDeliverOrg(model.getOrg()); + result.setDeliverOrg(model.getDeliverOrg()); result.setMalformation(model.getMalformation()); result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class));