From 6af85732b795a93095f8c552186b3ed71eeed6a5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 24 Aug 2016 11:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 83 ++++++++++++++-------- .../operate/web/result/MatDeliverListResult.java | 10 +-- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4b9c79d..a7b9dcf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -55,7 +55,7 @@ public class MatDeliverFacade { private static Map ONE_ENUMS = new HashMap<>(); - private static Map babyMap = new HashMap<>(); + private static Map babyMap = new HashMap<>(); static { ONE_ENUMS.put(0, "长"); @@ -133,7 +133,7 @@ public class MatDeliverFacade { if (null != deliverAddRequest.getDueDate()) { Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); //修改分娩日期 - updatePatientFmDate(patients1.getPid(),fmDate,1); + updatePatientFmDate(patients1.getPid(), fmDate, 1); //修改person表状态为产妇 if (StringUtils.isNotEmpty(patients1.getPid())) { PersonModel personModel = new PersonModel(); @@ -152,7 +152,7 @@ public class MatDeliverFacade { babyModelQuery.setBirthEnd(patients1.getFmDate()); List babyModels = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModels)) { - handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1,hospitalId); + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId); } else { List babies = new ArrayList<>(); for (BabyModel babyModel : babyModels) { @@ -195,7 +195,7 @@ public class MatDeliverFacade { patientsQuery.setId(deliverAddRequest.getParentId()); Patients patients = patientsService.findOnePatientById(deliverAddRequest.getParentId()); //修改分娩日期 - updatePatientFmDate(patients.getPid(),fmDate,3); + updatePatientFmDate(patients.getPid(), fmDate, 3); /* if (CollectionUtils.isNotEmpty(patients)) { if(fmDate.after(DateUtil.addDay(patients.get(0).getLastMenses(),168))){ Patients patients2=new Patients(); @@ -217,19 +217,20 @@ public class MatDeliverFacade { /** * 修改建档记录的分娩时间和 + * * @param pid * @param fmDate */ - private void updatePatientFmDate(String pid,Date fmDate,int type){ - PatientsQuery patientsQuery=new PatientsQuery(); + private void updatePatientFmDate(String pid, Date fmDate, int type) { + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setPid(pid); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(type); patientsQuery.setDueStatus(0); - List patientsList = patientsService.queryPatient(patientsQuery); - for(Patients patients:patientsList){ + List patientsList = patientsService.queryPatient(patientsQuery); + for (Patients patients : patientsList) { //判断分娩日期是否大于24孕周 - if(fmDate.after(DateUtil.addDay(patients.getLastMenses(), 168))){ + if (fmDate.after(DateUtil.addDay(patients.getLastMenses(), 168))) { patients.setFmDate(fmDate); patients.setType(3); patientsService.updatePatient(patients); @@ -324,13 +325,14 @@ public class MatDeliverFacade { /*list.add(baby2); list.add(baby3); list.add(baby4); */ - System.out.print(buildBabyName(list));; + System.out.print(buildBabyName(list)); + ; Date fmDate = DateUtil.parseYMD("2016-8-18"); - Date date= DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168); + Date date = DateUtil.addDay(DateUtil.parseYMD("2015-8-11"), 168); System.out.print(DateUtil.getyyyy_MM_dd(date)); System.out.print(fmDate.after(date)); @@ -347,7 +349,7 @@ public class MatDeliverFacade { * @param parentId * @param userName */ - private void handBaby(MatDeliverAddRequest deliverAddRequest, List babyList, MaternalDeliverModel maternalDeliverModel, List list, List babyIds, String parentId, String userName, Patients patients,String hospital) { + private void handBaby(MatDeliverAddRequest deliverAddRequest, List babyList, MaternalDeliverModel maternalDeliverModel, List list, List babyIds, String parentId, String userName, Patients patients, String hospital) { List babyName = buildBabyName(list); @@ -452,9 +454,10 @@ public class MatDeliverFacade { } else if (null == patients) { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());; - if(days < 168 && patients.getFmDate() == null){ - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + + if (days < 168 && patients.getFmDate() == null) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩"); } @@ -464,6 +467,24 @@ public class MatDeliverFacade { List list = matDeliverService.query(matDeliverQuery); MatDeliverListResult matDeliverListResult = new MatDeliverListResult(); matDeliverListResult.convertToResult(list, patients); + + + if (CollectionUtils.isNotEmpty(list)) { + List list12 = new ArrayList<>(); + for (MaternalDeliverModel model : list) { + MatDeliverListResult.MatDeliverExt matDeliverExt = new MatDeliverListResult.MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate()); + if (NumberUtils.isNumber(model.getFmHospital())) { + Organization organization = organizationService.getOrganization(Integer.valueOf(model.getFmHospital())); + if (null != organization) { + matDeliverExt.setHospitalName(organization.getName()); + } + } + list12.add(matDeliverExt); + } + matDeliverListResult.setData(list12); + } + + AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); @@ -522,12 +543,12 @@ public class MatDeliverFacade { MaternalDeliverResult maternalDeliverResult = new MaternalDeliverResult(); maternalDeliverResult.convertToResult(deliverModel); - String doctorId = deliverModel.getDeliverDoctor(); - Users users= usersService.getUsers(Integer.valueOf(doctorId)); - Map map =new HashMap<>(); - if(null!=users){ - map.put("id",users.getId()+""); - map.put("name",users.getName()); + String doctorId = deliverModel.getDeliverDoctor(); + Users users = usersService.getUsers(Integer.valueOf(doctorId)); + Map map = new HashMap<>(); + if (null != users) { + map.put("id", users.getId() + ""); + map.put("name", users.getName()); } maternalDeliverResult.setDeliverDoctor(map); //获取新生儿信息 @@ -538,16 +559,16 @@ public class MatDeliverFacade { babyList.add(maternalDeliverResult.new Baby(baby)); } } - Map map1 =new HashMap<>(); - String fmHospital=deliverModel.getFmHospital(); - - map1.put("id","-1"); - map1.put("name",fmHospital); - if(NumberUtils.isNumber(fmHospital)){ - Organization organization= organizationService.getOrganization(Integer.valueOf(fmHospital)); - if(null!=organization){ - map1.put("id",organization.getId()+""); - map1.put("name",organization.getName()); + Map map1 = new HashMap<>(); + String fmHospital = deliverModel.getFmHospital(); + + map1.put("id", "-1"); + map1.put("name", fmHospital); + if (NumberUtils.isNumber(fmHospital)) { + Organization organization = organizationService.getOrganization(Integer.valueOf(fmHospital)); + if (null != organization) { + map1.put("id", organization.getId() + ""); + map1.put("name", organization.getName()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index f25f3c4..6413bbf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -109,13 +109,7 @@ public class MatDeliverListResult { int day = (days % 7); this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); } - if (CollectionUtils.isNotEmpty(destList)) { - List list = new ArrayList<>(); - for (MaternalDeliverModel model : destList) { - list.add(new MatDeliverExt(model, patients.getCreated(), patients.getBuildType(), patients.getFmDate())); - } - setData(list); - } + return this; } @@ -204,7 +198,7 @@ public class MatDeliverListResult { this.yChanQi = yChanQi; } - private class MatDeliverExt { + public static class MatDeliverExt { private String hospitalName; private String hospitalId; private String id; -- 1.8.3.1