From 4906f943762f1c8fe6d45449db97bc1d9fc6467b Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 21 Mar 2018 17:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=EF=BC=8C?= =?UTF-8?q?=E5=8D=A1=E4=BB=8B=E8=8B=97=EF=BC=8C=E4=B9=99=E8=82=9D=E8=82=B2?= =?UTF-8?q?=E8=8B=97=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/DischargeAbstractBabyModel.java | 53 +++++++++++++++++++++ .../web/facade/DischargeAbstractFacade.java | 7 +++ .../platform/operate/web/facade/ViewFacade.java | 15 ++++++ .../web/request/DischargeAbstractSaveRequest.java | 54 ++++++++++++++++++++++ .../web/service/impl/TrackDownServiceImpl.java | 2 +- 5 files changed, 130 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index e08ce51..190564e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -55,6 +55,27 @@ public class DischargeAbstractBabyModel extends BaseModel { */ private Integer isHBV; + /** 2018年3月21日要求进行分离 + * 卡介苗接种日期 + */ + private Date bCGVaccinDate; + /** + * 2018年3月21日要求进行分离 + * 乙肝疫苗接种日期 + */ + private Date hbvVaccinDate; + /** + * 2018年3月21日要求进行分离 + * 乙肝疫苗注射者 + */ + private String hbvInjectUserName; + + /** + * 2018年3月21日要求进行分离 + * 卡介苗接种注射者 + */ + private String bCGInjectUserName; + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时14分 @@ -148,6 +169,38 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer yn; + public Date getbCGVaccinDate() { + return bCGVaccinDate; + } + + public void setbCGVaccinDate(Date bCGVaccinDate) { + this.bCGVaccinDate = bCGVaccinDate; + } + + public Date getHbvVaccinDate() { + return hbvVaccinDate; + } + + public void setHbvVaccinDate(Date hbvVaccinDate) { + this.hbvVaccinDate = hbvVaccinDate; + } + + public String getHbvInjectUserName() { + return hbvInjectUserName; + } + + public void setHbvInjectUserName(String hbvInjectUserName) { + this.hbvInjectUserName = hbvInjectUserName; + } + + public String getbCGInjectUserName() { + return bCGInjectUserName; + } + + public void setbCGInjectUserName(String bCGInjectUserName) { + this.bCGInjectUserName = bCGInjectUserName; + } + public Integer getYn() { return yn; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index fe8c1ee..f767c79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -132,6 +132,13 @@ public class DischargeAbstractFacade { BeanUtils.copy(baby, dischargeAbstractBabyModel); dischargeAbstractBabyModel.setMotherId(dischargeAbstractMotherModel.getId()); dischargeAbstractBabyModel.setCreateDate(new Date()); + //新增字段 + dischargeAbstractBabyModel.setbCGVaccinDate(DateUtil.parseYMD(baby.getbCGVaccinDate())); + dischargeAbstractBabyModel.setHbvVaccinDate(DateUtil.parseYMD(baby.getHbvVaccinDate())); + dischargeAbstractBabyModel.setHbvInjectUserName(baby.getHbvInjectUserName()); + dischargeAbstractBabyModel.setbCGInjectUserName(baby.getbCGInjectUserName()); + + dischargeAbstractBabyModel.setbCGAndHBVVaccinationDate(DateUtil.parseYMD(baby.getbCGAndHBVVaccinationDate())); dischargeAbstractBabyModel.sethBIGInjectDate(DateUtil.parseYMD(baby.gethBIGInjectDate())); dischargeAbstractBabyModel.setpId(baby.getpId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 86bdb12..4401547 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2842,6 +2842,21 @@ public class ViewFacade { } Map babyMap = new HashMap<>(); + + //新增字段 + if(temp.getbCGVaccinDate()!=null||temp.getHbvVaccinDate()!=null|| + StringUtils.isNotEmpty(temp.getHbvInjectUserName())||StringUtils.isNotEmpty(temp.getbCGInjectUserName())){//如果修改过数据 + babyMap.put("bCGVaccinDate", temp.getbCGVaccinDate()); + babyMap.put("hbvVaccinDate", temp.getHbvVaccinDate()); + babyMap.put("hbvInjectUserName", temp.getHbvInjectUserName()); + babyMap.put("bCGInjectUserName", temp.getbCGInjectUserName()); + }else{ + babyMap.put("bCGVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate())); + babyMap.put("hbvVaccinDate", DateUtil.getyyyy_MM_dd(temp.getbCGAndHBVVaccinationDate())); + babyMap.put("hbvInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName()); + babyMap.put("bCGInjectUserName", temp.getbCGAndHBVVaccinationInjectUserName()); + } + babyMap.put("description", temp.getDescription()); babyMap.put("birthCertificateId", temp.getBirthCertificateId()); babyMap.put("isBCG", FunvCommonUtil.checkIsInoculation(temp.getIsBCG())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index e823613..3ee35c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -117,6 +117,17 @@ public class DischargeAbstractSaveRequest { private Integer isHBV; /** + * 2018年3月21日要求进行分离 + * 卡介苗接种日期 + */ + private String bCGVaccinDate; + /** + * 2018年3月21日要求进行分离 + * 乙肝疫苗接种日期 + */ + private String hbvVaccinDate; + + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时14分 * @discription 卡介苗和乙肝疫苗接种日期 @@ -138,6 +149,18 @@ public class DischargeAbstractSaveRequest { private String bCGAndHBVVaccinationInjectUserName; /** + * 2018年3月21日要求进行分离 + * 乙肝疫苗注射者 + */ + private String hbvInjectUserName; + + /** + * 2018年3月21日要求进行分离 + * 卡介苗接种注射者 + */ + private String bCGInjectUserName; + + /** * @auther HuJiaqi * @createTime 2016年12月05日 18时19分 * @discription 是否注射乙肝免疫球蛋白 @@ -201,6 +224,37 @@ public class DischargeAbstractSaveRequest { private String orderScreenDescription; + public String getbCGVaccinDate() { + return bCGVaccinDate; + } + + public void setbCGVaccinDate(String bCGVaccinDate) { + this.bCGVaccinDate = bCGVaccinDate; + } + + public String getHbvVaccinDate() { + return hbvVaccinDate; + } + + public void setHbvVaccinDate(String hbvVaccinDate) { + this.hbvVaccinDate = hbvVaccinDate; + } + + public String getHbvInjectUserName() { + return hbvInjectUserName; + } + + public void setHbvInjectUserName(String hbvInjectUserName) { + this.hbvInjectUserName = hbvInjectUserName; + } + + public String getbCGInjectUserName() { + return bCGInjectUserName; + } + + public void setbCGInjectUserName(String bCGInjectUserName) { + this.bCGInjectUserName = bCGInjectUserName; + } public String getpId() { return pId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 21e34c5..644ae21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -86,10 +86,10 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS query.setEndBuildDay(buildEnd); //妇女建档主数据 List modelList = residentsArchiveService.queryResident(query); - restList = getResidentMainData(modelList); // StopWatch stopWatch = new StopWatch("妇女建档主数据"); //优化前 // stopWatch.start("妇女建档优化前"); + restList = getResidentMainData(modelList); // stopWatch.stop(); //优化后 // stopWatch.start("妇女建档优化后"); -- 1.8.3.1