From b02736a247abbab5fe6663e0427842d389f63cd6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 7 Mar 2017 14:41:42 +0800 Subject: [PATCH] update code --- .../operate/web/controller/ViewController.java | 14 +- .../platform/operate/web/facade/ViewFacade.java | 2 +- .../operate/web/result/BabyPageResult.java | 565 +++++++++++++++++++++ 3 files changed, 579 insertions(+), 2 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index c570dd4..82c4733 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -121,10 +121,22 @@ public class ViewController extends BaseController{ * @param id 儿童建档id * @return */ - @RequestMapping(value = "/getBabyBuildInfo/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/getBabyBuildPageInfo/{id}", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse getBabyBuildInfo(@PathVariable("id")String id){ return viewFacade.getBabyBuildInfo(id); } + /** + * 儿童检查查看页面 + * @param id 儿童建档id + * @return + */ + @RequestMapping(value = "/getBabyCheckPageInfo/{id}", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse getBabyCheckPageInfo(@PathVariable("id")String id){ + return viewFacade.getBabyBuildInfo(id); + } + + } 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 54047df..16b96be 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 @@ -1507,7 +1507,7 @@ public class ViewFacade { result.setMommyProfessionType(getBasicConfig(model.getMproTypeId())); result.setFatherLevel(getBasicConfig(model.getfLevelId())); - result.setFatherProfessionType(model.getFproTypeId()); + result.setFatherProfessionType(getBasicConfig(model.getFproTypeId())); if (StringUtils.isNotEmpty(model.getDeliverOrg())) { Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java new file mode 100644 index 0000000..2032745 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -0,0 +1,565 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.enums.FmTypeEnums; +import com.lyms.platform.common.enums.ServiceStatusEnums; +import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.pojo.BabyModel; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Created by lqy on 2016/6/17. + */ +public class BabyPageResult implements IBasicResultConvert { + + //建档Id + private String id; + + //建档Id + private String pid; + + /***********儿童基本信息***************/ + + //儿童名称 + private String babyName; + + //儿童性别 + private String sex; + + //儿童生日 + private String babyBirthday; + + //月龄 + private String monthAge; + + //家庭住址 + private String homeAddress; + + //儿童身份证 + private String babyCardNo; + + + /***********母亲基本信息***********/ + + //母亲名称 + private String mommyName; + + //证件类型 + private String mommyCertificateType; + + //证件号号 + private String mommyCertificateNum; + + //母亲生日 + private String mommyBirthday; + + //母亲年龄 + private String mommyAge; + + //母亲联系方式 + private String mommyPhone; + + //文化程度ID + private String mommyLevel; + + //母亲居住类别 +// private String mommyLiveType; + + //职业类别 + private String mommyProfessionType; + + /***********父亲基本信息***********/ + + //父亲姓名 + private String fatherName; + + //父亲联系方式 + private String fatherPhone; + + //父亲生日 + private String fatherBirthday; + + //父亲年龄 + private String fatherAge; + + //父亲文化程度ID + private String fatherLevel; + + //职业类别 + private String fatherProfessionType; + + + + /***********分娩信息***********/ + + //分娩孕周 + private String dueWeek; + //分娩方式 + private String dueType; + //胎产次 + private String fetusCount; + + //体重 + private String babyWeight; + //身高 + private String babyHeight; + //头围 + private String babyHead; + //分娩医院 + private String deliverOrg; + + //是否畸形 0非畸形 1畸形 + private String malformation; + + + /***********高危及诊断***********/ + + //母亲高危因素 + private String mommyHighRiskReason; + + //是否高危 0 非高危 1高危 + private String highRisk; + + //儿童出院诊断 + private String babyDiagnosis; + + //诊断 + private String diagnose; + + //apgar评分 + private String apgarScore; + + + + /***********院内信息***********/ + + //建档医生 + private String buildDoctor; + //建档日期 + private String buildDate; + //服务类型 + private String serviceType; + //服务状态 + private String serviceStatus; + //就诊卡号 + private String vcCardNo; + //备注 + private String remark; + //病历号(住院号) + private String blNo; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getBabyBirthday() { + return babyBirthday; + } + + public void setBabyBirthday(String babyBirthday) { + this.babyBirthday = babyBirthday; + } + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + + public String getHomeAddress() { + return homeAddress; + } + + public void setHomeAddress(String homeAddress) { + this.homeAddress = homeAddress; + } + + public String getBabyCardNo() { + return babyCardNo; + } + + public void setBabyCardNo(String babyCardNo) { + this.babyCardNo = babyCardNo; + } + + public String getMommyName() { + return mommyName; + } + + public void setMommyName(String mommyName) { + this.mommyName = mommyName; + } + + public String getMommyCertificateType() { + return mommyCertificateType; + } + + public void setMommyCertificateType(String mommyCertificateType) { + this.mommyCertificateType = mommyCertificateType; + } + + public String getMommyCertificateNum() { + return mommyCertificateNum; + } + + public void setMommyCertificateNum(String mommyCertificateNum) { + this.mommyCertificateNum = mommyCertificateNum; + } + + public String getMommyBirthday() { + return mommyBirthday; + } + + public void setMommyBirthday(String mommyBirthday) { + this.mommyBirthday = mommyBirthday; + } + + public String getMommyAge() { + return mommyAge; + } + + public void setMommyAge(String mommyAge) { + this.mommyAge = mommyAge; + } + + public String getMommyPhone() { + return mommyPhone; + } + + public void setMommyPhone(String mommyPhone) { + this.mommyPhone = mommyPhone; + } + + public String getMommyLevel() { + return mommyLevel; + } + + public void setMommyLevel(String mommyLevel) { + this.mommyLevel = mommyLevel; + } + + + public String getMommyProfessionType() { + return mommyProfessionType; + } + + public void setMommyProfessionType(String mommyProfessionType) { + this.mommyProfessionType = mommyProfessionType; + } + + public String getFatherName() { + return fatherName; + } + + public void setFatherName(String fatherName) { + this.fatherName = fatherName; + } + + public String getFatherPhone() { + return fatherPhone; + } + + public void setFatherPhone(String fatherPhone) { + this.fatherPhone = fatherPhone; + } + + public String getFatherBirthday() { + return fatherBirthday; + } + + public void setFatherBirthday(String fatherBirthday) { + this.fatherBirthday = fatherBirthday; + } + + public String getFatherAge() { + return fatherAge; + } + + public void setFatherAge(String fatherAge) { + this.fatherAge = fatherAge; + } + + public String getFatherLevel() { + return fatherLevel; + } + + public void setFatherLevel(String fatherLevel) { + this.fatherLevel = fatherLevel; + } + + public String getFatherProfessionType() { + return fatherProfessionType; + } + + public void setFatherProfessionType(String fatherProfessionType) { + this.fatherProfessionType = fatherProfessionType; + } + + public String getDueWeek() { + return dueWeek; + } + + public void setDueWeek(String dueWeek) { + this.dueWeek = dueWeek; + } + + public String getDueType() { + return dueType; + } + + public void setDueType(String dueType) { + this.dueType = dueType; + } + + public String getFetusCount() { + return fetusCount; + } + + public void setFetusCount(String fetusCount) { + this.fetusCount = fetusCount; + } + + public String getBabyWeight() { + return babyWeight; + } + + public void setBabyWeight(String babyWeight) { + this.babyWeight = babyWeight; + } + + public String getBabyHeight() { + return babyHeight; + } + + public void setBabyHeight(String babyHeight) { + this.babyHeight = babyHeight; + } + + public String getBabyHead() { + return babyHead; + } + + public void setBabyHead(String babyHead) { + this.babyHead = babyHead; + } + + public String getDeliverOrg() { + return deliverOrg; + } + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + + public String getMalformation() { + return malformation; + } + + public void setMalformation(String malformation) { + this.malformation = malformation; + } + + public String getMommyHighRiskReason() { + return mommyHighRiskReason; + } + + public void setMommyHighRiskReason(String mommyHighRiskReason) { + this.mommyHighRiskReason = mommyHighRiskReason; + } + + public String getHighRisk() { + return highRisk; + } + + public void setHighRisk(String highRisk) { + this.highRisk = highRisk; + } + + public String getBabyDiagnosis() { + return babyDiagnosis; + } + + public void setBabyDiagnosis(String babyDiagnosis) { + this.babyDiagnosis = babyDiagnosis; + } + + + public String getApgarScore() { + return apgarScore; + } + + public void setApgarScore(String apgarScore) { + this.apgarScore = apgarScore; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public String getBuildDoctor() { + return buildDoctor; + } + + public void setBuildDoctor(String buildDoctor) { + this.buildDoctor = buildDoctor; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + public String getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(String serviceStatus) { + this.serviceStatus = serviceStatus; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } + + @Override + public BabyPageResult convertToResult(BabyModel destModel) { + + setId(destModel.getId()); + setPid(destModel.getPid()); + setBabyName(destModel.getName()); + setSex(SexEnum.getTextById(destModel.getSex())); + setBabyBirthday(DateUtil.getyyyy_MM_dd(destModel.getBirth())); + setMonthAge(DateUtil.getBabyMonthAge(destModel.getBirth(), new Date())); + + setBabyCardNo(destModel.getCardNo()); + setMommyName(destModel.getMname()); + setMommyCertificateNum(destModel.getMcertNo()); + setMommyPhone(destModel.getMphone()); + setMommyBirthday(DateUtil.getyyyy_MM_dd(destModel.getMbirth())); + if (destModel.getMbirth() != null) + { + setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + ""); + } + + setFatherName(destModel.getFname()); + setFatherBirthday(DateUtil.getyyyy_MM_dd(destModel.getFbirth())); + if (destModel.getFbirth() != null) + { + setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + ""); + } + + setFatherPhone(destModel.getFphone()); + + if (destModel.getDueWeek() != null) + { + setDueWeek(destModel.getDueWeek() + "周"); + } + + setDueType(FmTypeEnums.getFmNameById(destModel.getDueType())); + + if (StringUtils.isNotEmpty(destModel.getFetusCount()) && StringUtils.isNotEmpty(destModel.getDueCount())) + { + setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"次"); + } + + setBabyWeight(destModel.getBabyWeight()); + + setBabyHeight(destModel.getBabyHeight()); + setBabyHead(destModel.getBabyHead()); + if (StringUtils.isNotEmpty(destModel.getApgarScore())) + { + Map map = JsonUtil.getMap(destModel.getApgarScore()); + String as = (map.get("pf1") == null ? "" : map.get("pf1"))+"分 - "+(map.get("pf5") == null ? "" : map.get("pf5"))+"分 - " +(map.get("pf10") == null ? "" : map.get("pf10"))+"分"; + setApgarScore(as); + } + + // 0非畸形 1畸形 + setMalformation(destModel.getMalformation() == 1 ? "是" : "否"); + //0 非高危 1高危 + setHighRisk(destModel.getHighRisk() == 1 ? "是" : "否"); + setBabyDiagnosis(destModel.getBabyDiagnosis()); + setVcCardNo(destModel.getVcCardNo()); + setBlNo(destModel.getBlNo()); + + setBuildDate(DateUtil.getyyyy_MM_dd(destModel.getBuildDate())); + setRemark(destModel.getMremark()); + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus())); + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType())); + + return this; + } +} -- 1.8.3.1