From 94becd84c82f52bfe60f53db23de03186104bd5a Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Thu, 20 Sep 2018 12:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=AD=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabySieveModel.java | 21 +++++++++++++++++---- .../operate/web/facade/BabySieveFacede.java | 1 + .../operate/web/result/BabySieveResult.java | 12 ++++++++++++ .../operate/web/utils/BabySieveHandleTask.java | 13 ++++++++++++- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java index 689f6b4..cb82ee0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabySieveModel.java @@ -1,8 +1,10 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.enums.FmTypeEnums; import com.lyms.platform.common.result.BaseModel; import com.lyms.platform.common.utils.DateUtil; +import org.apache.commons.lang.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -319,11 +321,22 @@ public class BabySieveModel extends BaseModel { map.put("babyBirth",DateUtil.getYMDH(babyBirth)+":00"); map.put("babyName",babyName); map.put("dueWeek",dueWeek); - map.put("dueType",dueType); - map.put("duescfs",duescfs); - if(sex != null){ - map.put("sex",String.valueOf(sex)); + if("1".equals(dueType)){ + String fmName = FmTypeEnums.getFmNameById(dueType); + fmName+=","+FmTypeEnums.getFmScNameById(duescfs); + map.put("dueType",fmName); + }else if("2".equals(dueType)){ + String fmName = FmTypeEnums.getFmNameById(dueType); + map.put("dueType",fmName); + } + if(0 == sex){ + map.put("sex","男"); + }else if(1 == sex){ + map.put("sex","女"); } + /*if(sex != null){ + map.put("sex",String.valueOf(sex)); + }*/ map.put("diseaseSieve",diseaseSieve); map.put("sendCheckHospitalId",sendCheckHospitalId); map.put("babyId",babyId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 8be5e43..4a4b325 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -286,6 +286,7 @@ public class BabySieveFacede { } } //babyModelQuery.setDataStatus(false); + babyModelQuery.setYn(0); babyModelQuery.setDeformityKey(babySieveAddRequest.getDeformityKey()); babyModelQuery.setDueType(StringUtils.isEmpty(babySieveAddRequest.getDueType()) ? null : babySieveAddRequest.getDueType()); if("0".equals(babySieveAddRequest.getSieveStatus())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java index e4b07e4..d59df34 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java @@ -37,6 +37,8 @@ public class BabySieveResult { private Integer age; //孕周 private String dueWeek; + //当前孕周 + private String nowWeeks; //预产期 private String yChanQi; //备注 @@ -218,6 +220,14 @@ public class BabySieveResult { this.adress = adress; } + public String getNowWeeks() { + return nowWeeks; + } + + public void setNowWeeks(String nowWeeks) { + this.nowWeeks = nowWeeks; + } + public BabySieveResult convert(Patients pat){ setId(pat.getId()); try { @@ -237,6 +247,8 @@ public class BabySieveResult { if (null != pat.getLastMenses()) { /*int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); this.dueWeek = StringUtils.dueWeek(days);*/ + int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); + this.nowWeeks = StringUtils.dueWeek(days); setLastMenses(DateUtil.getyyyy_MM_dd(pat.getLastMenses())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java index 78df813..3b4ee64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.BabySieveService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.common.enums.FmTypeEnums; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; @@ -76,6 +77,15 @@ public class BabySieveHandleTask implements Callable { babySieveManager.setMatdeliverId(maternalDeliverModel.getId()); if(babySieveModel != null){ babySieveManager.setId(babySieveModel.getId()); + if("1".equals(babySieveModel.getDueType())){ + String fmName = FmTypeEnums.getFmNameById(babySieveModel.getDueType()); + fmName+=","+FmTypeEnums.getFmScNameById(babySieveModel.getDuescfs()); + babySieveManager.setDueType(fmName); + }else if("2".equals(babySieveModel.getDueType())){ + String fmName = FmTypeEnums.getFmNameById(babySieveModel.getDueType()); + babySieveManager.setDueType(fmName); + } + } //获取母亲基本信息 Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); @@ -91,7 +101,8 @@ public class BabySieveHandleTask implements Callable { String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService); String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService); String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService); - String jQquan = jzSheng+jzShi+jzXian+jzXiang; + String address = patients.getAddress(); + String jQquan = jzSheng+jzShi+jzXian+jzXiang+address; babySieveManager.setAdress(jQquan); babySieveManager.setPatientId(patients.getId()); babySieveManager.setCardNo(patients.getCardNo()); -- 1.8.3.1