diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java index 578112d..a45c631 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmItem.java @@ -321,4 +321,45 @@ public class FmItem { public void setJsz(String jsz) { this.jsz = jsz; } + + @Override + public String toString() { + return "FmItem{" + + "syxh='" + syxh + '\'' + + ", yexh='" + yexh + '\'' + + ", jlrq='" + jlrq + '\'' + + ", ssrq='" + ssrq + '\'' + + ", ssj='" + ssj + '\'' + + ", yexb='" + yexb + '\'' + + ", rc='" + rc + '\'' + + ", jts='" + jts + '\'' + + ", djt='" + djt + '\'' + + ", cjc='" + cjc + '\'' + + ", zx='" + zx + '\'' + + ", tz='" + tz + '\'' + + ", sc='" + sc + '\'' + + ", sh='" + sh + '\'' + + ", jx='" + jx + '\'' + + ", yfz='" + yfz + '\'' + + ", wfz='" + wfz + '\'' + + ", sfz='" + sfz + '\'' + + ", pfz='" + pfz + '\'' + + ", ccqk='" + ccqk + '\'' + + ", fmfs='" + fmfs + '\'' + + ", tpmcfs='" + tpmcfs + '\'' + + ", yeqk='" + yeqk + '\'' + + ", sw='" + sw + '\'' + + ", sffq='" + sffq + '\'' + + ", fqyy='" + fqyy + '\'' + + ", hyqk='" + hyqk + '\'' + + ", hyqk1='" + hyqk1 + '\'' + + ", yc='" + yc + '\'' + + ", sfgw='" + sfgw + '\'' + + ", mctpslxl='" + mctpslxl + '\'' + + ", chexxsxl='" + chexxsxl + '\'' + + ", qjqk='" + qjqk + '\'' + + ", srks='" + srks + '\'' + + ", jsz='" + jsz + '\'' + + '}'; + } } 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 74e7933..fe561f1 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 @@ -48,12 +48,12 @@ public class QhdfyFmService { { SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date end = new Date(); - Date start = new Date(end.getTime()-1000*60*60); + Date start = new Date(end.getTime()-1000*60*5); String startStr = fmt.format(start); String endStr = fmt.format(end); System.out.println("start="+startStr+"end="+endStr); ExceptionUtils.catchException("start="+startStr+"end="+endStr); -// queryFmPatient(startStr, endStr); + queryFmPatient(startStr, endStr); } @@ -66,313 +66,315 @@ public class QhdfyFmService { 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)); - if (CollectionUtils.isNotEmpty(list)) { - for(FmItem item : list) - { - String dueDateStr = item.getSsrq(); - if (!StringUtils.isNotEmpty(dueDateStr)) - { - continue; - } - Date dueDate = fmt.parse(dueDateStr); - FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); - if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) - { - PatientsQuery query = new PatientsQuery(); - query.setYn(YnEnums.YES.getId()); - query.setType(1); //孕妇 - query.setDueStatus(0); //未终止妊娠 - query.setPhone(patInfo.getLXDH()); - List patientses = patientsService.queryPatient(query); - if (CollectionUtils.isNotEmpty(patientses)) - { - Patients patient = patientses.get(0); - - UsersQuery usersQuery = new UsersQuery(); - usersQuery.setName(item.getJsz()); - usersQuery.setYn(YnEnums.YES.getId()); - List users = usersService.queryUsers(usersQuery); - if (!CollectionUtils.isNotEmpty(users)) - { - usersQuery.setName("产房"); - users = usersService.queryUsers(usersQuery); - } - - if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) - { - MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); - - if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(item.getSsrq())) - { - continue; - } - - deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); - deliverAddRequest.setParentId(patient.getId()); - deliverAddRequest.setPid(patient.getPid()); - if (StringUtils.isNotEmpty(item.getRc())) - { - String week = ""; - if (item.getRc().split("\\u002B").length > 1) - { - week = item.getRc().split("\\u002B")[0]+"周"; - week+= item.getRc().split("\\u002B")[1]+"天"; - } - else - { - week = item.getRc()+"周"; - week+=item.getJts()+"天"; - } - deliverAddRequest.setDueWeek(week); - } - - deliverAddRequest.setTireNumber(1);//TODO 胎数 - deliverAddRequest.setPlacenta("1");//TODO 胎盘 - - if ("完好".equals(item.getHyqk())) - { - deliverAddRequest.setPerinealCondition("full"); - } - else if ("会阴切开".equals(item.getHyqk())) - { - deliverAddRequest.setPerinealCondition("split"); - } - - if ("一度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(1); - } - else if ("二度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(2); - } - else if ("三度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(3); - } - - if (StringUtils.isNotEmpty(item.getChexxsxl())) - { - deliverAddRequest.settHloseBloodL(Double.parseDouble(item.getChexxsxl())); - } - - //胎盘信息 - List extPlacentas = new ArrayList<>(); - MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); - extPlacenta.setMcType(FmTypeEnums.getIdByName(item.getFmfs())); //分娩方式 - String tpmcType = ""; - if ("手术产".equals(item.getTpmcfs())) - { - tpmcType = TpmcTypeEnums.O2.getId(); - } - else if ("自然产出".equals(item.getTpmcfs())) - { - tpmcType = TpmcTypeEnums.O.getId(); - } - extPlacenta.setTpmcType(tpmcType); - extPlacentas.add(extPlacenta); - - //儿童 - 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("pf10", item.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(fmt1.format(dueDate));//分娩时间 - babies.add(baby); - matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); - } - - } - } - } - } + System.out.println(list); + ExceptionUtils.catchException("size="+list.size()); +// if (CollectionUtils.isNotEmpty(list)) { +// for(FmItem item : list) +// { +// String dueDateStr = item.getSsrq(); +// if (!StringUtils.isNotEmpty(dueDateStr)) +// { +// continue; +// } +// Date dueDate = fmt.parse(dueDateStr); +// FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); +// if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) +// { +// PatientsQuery query = new PatientsQuery(); +// query.setYn(YnEnums.YES.getId()); +// query.setType(1); //孕妇 +// query.setDueStatus(0); //未终止妊娠 +// query.setPhone(patInfo.getLXDH()); +// List patientses = patientsService.queryPatient(query); +// if (CollectionUtils.isNotEmpty(patientses)) +// { +// Patients patient = patientses.get(0); +// +// UsersQuery usersQuery = new UsersQuery(); +// usersQuery.setName(item.getJsz()); +// usersQuery.setYn(YnEnums.YES.getId()); +// List users = usersService.queryUsers(usersQuery); +// if (!CollectionUtils.isNotEmpty(users)) +// { +// usersQuery.setName("产房"); +// users = usersService.queryUsers(usersQuery); +// } +// +// if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) +// { +// MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); +// +// if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(item.getSsrq())) +// { +// continue; +// } +// +// deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); +// deliverAddRequest.setParentId(patient.getId()); +// deliverAddRequest.setPid(patient.getPid()); +// if (StringUtils.isNotEmpty(item.getRc())) +// { +// String week = ""; +// if (item.getRc().split("\\u002B").length > 1) +// { +// week = item.getRc().split("\\u002B")[0]+"周"; +// week+= item.getRc().split("\\u002B")[1]+"天"; +// } +// else +// { +// week = item.getRc()+"周"; +// week+=item.getJts()+"天"; +// } +// deliverAddRequest.setDueWeek(week); +// } +// +// deliverAddRequest.setTireNumber(1);//TODO 胎数 +// deliverAddRequest.setPlacenta("1");//TODO 胎盘 +// +// if ("完好".equals(item.getHyqk())) +// { +// deliverAddRequest.setPerinealCondition("full"); +// } +// else if ("会阴切开".equals(item.getHyqk())) +// { +// deliverAddRequest.setPerinealCondition("split"); +// } +// +// if ("一度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(1); +// } +// else if ("二度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(2); +// } +// else if ("三度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(3); +// } +// +// if (StringUtils.isNotEmpty(item.getChexxsxl())) +// { +// deliverAddRequest.settHloseBloodL(Double.parseDouble(item.getChexxsxl())); +// } +// +// //胎盘信息 +// List extPlacentas = new ArrayList<>(); +// MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta(); +// extPlacenta.setMcType(FmTypeEnums.getIdByName(item.getFmfs())); //分娩方式 +// String tpmcType = ""; +// if ("手术产".equals(item.getTpmcfs())) +// { +// tpmcType = TpmcTypeEnums.O2.getId(); +// } +// else if ("自然产出".equals(item.getTpmcfs())) +// { +// tpmcType = TpmcTypeEnums.O.getId(); +// } +// extPlacenta.setTpmcType(tpmcType); +// extPlacentas.add(extPlacenta); +// +// //儿童 +// 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("pf10", item.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(fmt1.format(dueDate));//分娩时间 +// babies.add(baby); +// matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); +// } +// +// } +// } +// } +// } List duoTaiList = queryRunner.query(conn, "select * 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 = ' 是 ') and " + " CONVERT(varchar(50),SSRQ, 20) > CONVERT(varchar(50),'"+start+"', 20) and CONVERT(varchar(50),SSRQ, 20) <= CONVERT(varchar(50),'"+end+"', 20)", new BeanListHandler(FmItem.class)); - if (CollectionUtils.isNotEmpty(duoTaiList)) { - Map> maps = new HashMap<>(); - for(FmItem item : duoTaiList) - { - if (maps.containsKey(item.getSyxh())) - { - maps.get(item.getSyxh()).add(item); - } - else - { - List items = new ArrayList(); - items.add(item); - maps.put(item.getSyxh(),items); - } - - } - if (maps.size() > 0) - { - for(String key : maps.keySet()) - { - List items = maps.get(key); - FmItem item = items.get(0); - - String dueDateStr = item.getSsrq(); - if (!StringUtils.isNotEmpty(dueDateStr)) - { - continue; - } - Date dueDate = fmt.parse(dueDateStr); - FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); - if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) - { - PatientsQuery query = new PatientsQuery(); - query.setYn(YnEnums.YES.getId()); - query.setType(1); //孕妇 - query.setDueStatus(0); //未终止妊娠 - query.setPhone(patInfo.getLXDH()); - List patientses = patientsService.queryPatient(query); - if (CollectionUtils.isNotEmpty(patientses)) - { - Patients patient = patientses.get(0); - - UsersQuery usersQuery = new UsersQuery(); - usersQuery.setName(item.getJsz()); - usersQuery.setYn(YnEnums.YES.getId()); - List users = usersService.queryUsers(usersQuery); - if (!CollectionUtils.isNotEmpty(users)) - { - usersQuery.setName("产房"); - users = usersService.queryUsers(usersQuery); - } - - if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) - { - MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); - - if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(item.getSsrq())) - { - continue; - } - - deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); - deliverAddRequest.setParentId(patient.getId()); - deliverAddRequest.setPid(patient.getPid()); - if (StringUtils.isNotEmpty(item.getRc())) - { - String week = ""; - if (item.getRc().split("\\u002B").length > 1) - { - week = item.getRc().split("\\u002B")[0]+"周"; - week+= item.getRc().split("\\u002B")[1]+"天"; - } - else - { - week = item.getRc()+"周"; - week+=item.getJts()+"天"; - } - deliverAddRequest.setDueWeek(week); - } - - deliverAddRequest.setTireNumber(items.size());//TODO 胎数 - deliverAddRequest.setPlacenta(items.size()+"");//TODO 胎盘 - - if ("完好".equals(item.getHyqk())) - { - deliverAddRequest.setPerinealCondition("full"); - } - else if ("会阴切开".equals(item.getHyqk())) - { - deliverAddRequest.setPerinealCondition("split"); - } - - if ("一度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(1); - } - else if ("二度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(2); - } - else if ("三度裂伤".equals(item.getHyqk())) - { - deliverAddRequest.setSiLielevel(3); - } - - if (StringUtils.isNotEmpty(item.getChexxsxl())) - { - deliverAddRequest.settHloseBloodL(Double.parseDouble(item.getChexxsxl())); - } - - //胎盘信息 - List extPlacentas = new ArrayList<>(); - //儿童 - List babies = new ArrayList<>(); - - 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(item1.getFmfs())); //分娩方式 - String tpmcType = ""; - if ("手术产".equals(item1.getTpmcfs())) - { - tpmcType = TpmcTypeEnums.O2.getId(); - } - else if ("自然产出".equals(item1.getTpmcfs())) - { - tpmcType = TpmcTypeEnums.O.getId(); - } - extPlacenta.setTpmcType(tpmcType); - extPlacentas.add(extPlacenta); - - MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); - Map as = new HashMap<>(); - as.put("pf1",item1.getYfz()); - as.put("pf5",item1.getWfz()); - as.put("pf10", item1.getSfz()); - baby.setApgarScore(JsonUtil.obj2JsonString(as)); - 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); - - } - matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); - } - - } - } - } - } - } +// if (CollectionUtils.isNotEmpty(duoTaiList)) { +// Map> maps = new HashMap<>(); +// for(FmItem item : duoTaiList) +// { +// if (maps.containsKey(item.getSyxh())) +// { +// maps.get(item.getSyxh()).add(item); +// } +// else +// { +// List items = new ArrayList(); +// items.add(item); +// maps.put(item.getSyxh(),items); +// } +// +// } +// if (maps.size() > 0) +// { +// for(String key : maps.keySet()) +// { +// List items = maps.get(key); +// FmItem item = items.get(0); +// +// String dueDateStr = item.getSsrq(); +// if (!StringUtils.isNotEmpty(dueDateStr)) +// { +// continue; +// } +// Date dueDate = fmt.parse(dueDateStr); +// FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); +// if (patInfo != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(patInfo.getLXDH())) +// { +// PatientsQuery query = new PatientsQuery(); +// query.setYn(YnEnums.YES.getId()); +// query.setType(1); //孕妇 +// query.setDueStatus(0); //未终止妊娠 +// query.setPhone(patInfo.getLXDH()); +// List patientses = patientsService.queryPatient(query); +// if (CollectionUtils.isNotEmpty(patientses)) +// { +// Patients patient = patientses.get(0); +// +// UsersQuery usersQuery = new UsersQuery(); +// usersQuery.setName(item.getJsz()); +// usersQuery.setYn(YnEnums.YES.getId()); +// List users = usersService.queryUsers(usersQuery); +// if (!CollectionUtils.isNotEmpty(users)) +// { +// usersQuery.setName("产房"); +// users = usersService.queryUsers(usersQuery); +// } +// +// if (CollectionUtils.isNotEmpty(users) && users.get(0).getId() != null) +// { +// MatDeliverAddRequest deliverAddRequest = new MatDeliverAddRequest(); +// +// if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(item.getSsrq())) +// { +// continue; +// } +// +// deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); +// deliverAddRequest.setParentId(patient.getId()); +// deliverAddRequest.setPid(patient.getPid()); +// if (StringUtils.isNotEmpty(item.getRc())) +// { +// String week = ""; +// if (item.getRc().split("\\u002B").length > 1) +// { +// week = item.getRc().split("\\u002B")[0]+"周"; +// week+= item.getRc().split("\\u002B")[1]+"天"; +// } +// else +// { +// week = item.getRc()+"周"; +// week+=item.getJts()+"天"; +// } +// deliverAddRequest.setDueWeek(week); +// } +// +// deliverAddRequest.setTireNumber(items.size());//TODO 胎数 +// deliverAddRequest.setPlacenta(items.size()+"");//TODO 胎盘 +// +// if ("完好".equals(item.getHyqk())) +// { +// deliverAddRequest.setPerinealCondition("full"); +// } +// else if ("会阴切开".equals(item.getHyqk())) +// { +// deliverAddRequest.setPerinealCondition("split"); +// } +// +// if ("一度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(1); +// } +// else if ("二度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(2); +// } +// else if ("三度裂伤".equals(item.getHyqk())) +// { +// deliverAddRequest.setSiLielevel(3); +// } +// +// if (StringUtils.isNotEmpty(item.getChexxsxl())) +// { +// deliverAddRequest.settHloseBloodL(Double.parseDouble(item.getChexxsxl())); +// } +// +// //胎盘信息 +// List extPlacentas = new ArrayList<>(); +// //儿童 +// List babies = new ArrayList<>(); +// +// 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(item1.getFmfs())); //分娩方式 +// String tpmcType = ""; +// if ("手术产".equals(item1.getTpmcfs())) +// { +// tpmcType = TpmcTypeEnums.O2.getId(); +// } +// else if ("自然产出".equals(item1.getTpmcfs())) +// { +// tpmcType = TpmcTypeEnums.O.getId(); +// } +// extPlacenta.setTpmcType(tpmcType); +// extPlacentas.add(extPlacenta); +// +// MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby(); +// Map as = new HashMap<>(); +// as.put("pf1",item1.getYfz()); +// as.put("pf5",item1.getWfz()); +// as.put("pf10", item1.getSfz()); +// baby.setApgarScore(JsonUtil.obj2JsonString(as)); +// 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); +// +// } +// matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId()); +// } +// +// } +// } +// } +// } +// } DbUtils.closeQuietly(conn); } catch (SQLException e) { ExceptionUtils.catchException(e, "sql执行异常"); e.printStackTrace(); - } catch (ParseException e) { - ExceptionUtils.catchException(e,"分娩日期解析错误"); - e.printStackTrace(); - } - finally { +// } catch (ParseException e) { +// ExceptionUtils.catchException(e,"分娩日期解析错误"); +// e.printStackTrace(); +// } + }finally { DbUtils.closeQuietly(conn); } } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 3d7ec5a..9f44e5c 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -81,7 +81,7 @@ - + diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml index e944f81..e9eb1d0 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml @@ -35,6 +35,10 @@ + + + +