From 7357e35276c77e562d78b4ec08e1ee8225f15edd Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 11 Oct 2017 15:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E7=AD=9B=E6=A8=A1=E5=9D=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 4 ++-- .../platform/operate/web/facade/BabyEarFacade.java | 19 ++++++++++++++++--- .../web/facade/PatientMarkHospServiceFacade.java | 19 ++++++++++++++----- .../platform/operate/web/request/BabyEarBase.java | 12 ++++++++++++ .../platform/operate/web/result/BabyEarBaseView.java | 10 ++++++++++ .../resources/spring/applicationContext-quartz.xml | 2 +- 6 files changed, 55 insertions(+), 11 deletions(-) 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 c82f827..ef4c9bb 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 @@ -1396,8 +1396,8 @@ public class BabyBookbuildingFacade { map.put("serviceStatus", serviceStatus); //医院 - List hospitals = antenatalExaminationFacade.convert(); - map.put("hospitals", hospitals); + // List hospitals = antenatalExaminationFacade.convert(); + // map.put("hospitals", hospitals); //分娩方式 List fmType = FmTypeEnums.getFmTypeEnums(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 6983aff..262b990 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1447,7 +1447,16 @@ public class BabyEarFacade { if (babyEarBase.getNation() != null) { babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation())); } - + if (StringUtils.isNotEmpty(babyEarBase.getDeliverOrg())) { + try { + Organization organization = organizationService.getOrganization(Integer.parseInt(babyEarBase.getDeliverOrg())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + babyEarBaseView.setDeliverOrg(organization.getName()); + } + } catch (Exception e) { + babyEarBaseView.setDeliverOrg(babyEarBase.getDeliverOrg()); + } + } String docotorId = babyEarBase.getCreateUserId(); if (NumberUtils.isNumber(docotorId)) { Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); @@ -1799,9 +1808,13 @@ public class BabyEarFacade { List serviceStatus = ServiceStatusEnums.getServiceStatusList(); map.put("serviceStatus", serviceStatus); + //流产方式 + List abortion = InitDataUtils.getAbortionEnums(); + map.put("liuchan", abortion); + //医院 - List hospitals = InitDataUtils.getAbortionEnums(); - map.put("liuchan", hospitals); + List hospitals = antenatalExaminationFacade.convert(); + map.put("hospitals", hospitals); //分娩方式 List fmType = FmTypeEnums.getHdFmEnums(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index c2cc339..66e1566 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -731,8 +731,7 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setSort("hospit_date"); patientMarkHospQuery.setNeed("y"); patientMarkHospQuery.setOffset(offset); - patientMarkHospQuery.setLimit(2); - patientMarkHospQuery.setPage(page); + patientMarkHospQuery.setLimit(100); List patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery); for (PatientMarkHospital ps : patientMarkHospitals) { @@ -741,8 +740,8 @@ public class PatientMarkHospServiceFacade { } synUpdateHisData(ps); } - if (patientMarkHospQuery.getCount() > page * 2) { - synLlHisData((page + 1) * 2, page + 1); + if (patientMarkHospQuery.getCount() > page * 100) { + synLlHisData((page + 1) * 100, page + 1); } } @@ -754,7 +753,17 @@ public class PatientMarkHospServiceFacade { public void synUpdateHisData(PatientMarkHospital ps) { Patients patients = patientsService.findOnePatientById(ps.getPatientId()); if (null != patients) { - List> makePatients = llfyHisService.getPatientInfo(patients, DateUtil.getyyyy_MM_dd(ps.getMakeDate()), DateUtil.getyyyy_MM_dd(new Date())); + //住院结束时间 + Date hospitEndDate = null; + if(ps.getInHospitMakeDate()!=null){ + hospitEndDate = ps.getInHospitMakeDate(); + }else if(ps.getBackMakeDate()!=null){ + hospitEndDate = ps.getBackMakeDate(); + }else{ + hospitEndDate = ps.getMakeInHospitDate(); + } + + List> makePatients = llfyHisService.getPatientInfo(patients, DateUtil.getyyyy_MM_dd(ps.getMakeDate()), DateUtil.getyyyy_MM_dd(hospitEndDate)); if (CollectionUtils.isNotEmpty(makePatients)) { for (Map map : makePatients) { String inHospDiagn = map.get("inHospDiagn"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index d9b95b2..fe0af9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -43,6 +43,8 @@ public class BabyEarBase implements IBasicRequestConvert { private String address; //邮编号码 private String postCode; + //助产机构 + private String deliverOrg; /** * 母亲基本信息 @@ -136,6 +138,7 @@ public class BabyEarBase implements IBasicRequestConvert { setAreaId(babyModel.getAreaId()); setStreetId(babyModel.getStreetId()); setAddress(babyModel.getAddress()); + setDeliverOrg(babyModel.getDeliverOrg()); setVcCardNo(babyModel.getVcCardNo()); setServiceType(babyModel.getServiceType()); setServiceStatus(babyModel.getServiceStatus()); @@ -170,6 +173,7 @@ public class BabyEarBase implements IBasicRequestConvert { @Override public BabyModel convertToDataModel() { BabyModel babyModel = new BabyModel(); + babyModel.setDeliverOrg(deliverOrg); babyModel.setMname(mname); babyModel.setMphone(mphone); babyModel.setMbirth(DateUtil.parseYMD(mbirth)); @@ -528,6 +532,14 @@ public class BabyEarBase implements IBasicRequestConvert { return fphone; } + public String getDeliverOrg() { + return deliverOrg; + } + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + public void setFphone(String fphone) { this.fphone = fphone; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java index adc589b..e93a874 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java @@ -26,6 +26,8 @@ public class BabyEarBaseView { private String residence; //邮编 private String zipCode; + //助产机构 + private String deliverOrg; /** * 母亲信息 @@ -98,6 +100,14 @@ public class BabyEarBaseView { //备注 private String remark; + public String getDeliverOrg() { + return deliverOrg; + } + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + public String getId() { return id; } 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 f43f480..71a7b9e 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -20,7 +20,7 @@ 0 - 1 + 0 -- 1.8.3.1