From 2e4ad6c5419caf901dda064b82541433fdf36004 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 1 Jul 2016 17:48:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E7=AB=A5=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyCheckController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 4 +- .../operate/web/facade/BabyCheckFacade.java | 110 +++++++++++++++++++-- .../web/request/BabyBookbuildingAddRequest.java | 7 +- .../operate/web/result/BabyBasicResult.java | 17 ++-- .../operate/web/result/BabyBuildResult.java | 10 +- 6 files changed, 123 insertions(+), 27 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 3771b6a..c29f7c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -76,7 +76,7 @@ public class BabyCheckController extends BaseController{ * @param id * @return */ - @RequestMapping(value = "/queryBabyCheckInfo/id", method = RequestMethod.GET) + @RequestMapping(value = "/queryBabyCheckInfo/{id}", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse queryBabyCheckInfo(@PathVariable("id")String id){ return babyCheckFacade.queryBabyCheckInfo(id); 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 c60c7d3..5fca5c9 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 @@ -228,7 +228,7 @@ public class BabyBookbuildingFacade { //bm.setHighRiskReason(b.getHighRiskReason()); bm.setExpVip(b.getExpVip()); bm.setMremark(b.getMremark()); - bm.setDiagnose(b.getDiagnose()); + bm.setDiagnose(JsonUtil.obj2JsonString(b.getDiagnose())); if (b.getExpType() != null) { @@ -353,7 +353,7 @@ public class BabyBookbuildingFacade { //result.setHighRiskReason(model.getHighRiskReason()); result.setExpVip(model.getExpVip()); result.setMremark(model.getMremark() == null ? "" : model.getMremark()); - result.setDiagnose(model.getDiagnose()); + result.setDiagnose(JsonUtil.toList(model.getDiagnose(),List.class)); //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); result.setServiceStatus(String.valueOf(model.getServiceStatus())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index b703b2c..6d9103a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -14,12 +14,8 @@ import com.lyms.platform.operate.web.result.BabyBasicResult; import com.lyms.platform.operate.web.result.BabyCheckResult; import com.lyms.platform.operate.web.result.BabyChooseResult; import com.lyms.platform.operate.web.result.BasicConfigResult; -import com.lyms.platform.pojo.AwModel; -import com.lyms.platform.pojo.BabyCheckModel; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.HwModel; -import com.lyms.platform.query.BabyCheckModelQuery; -import com.lyms.platform.query.BabyModelQuery; +import com.lyms.platform.pojo.*; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,7 +30,20 @@ public class BabyCheckFacade { @Autowired private BabyBookbuildingService babyBookbuildingService; - private BaseObjectResponse baseConfig; + + + @Autowired + private BasicConfigService basicConfigService; + + @Autowired + private PatientsService patientsService; + + @Autowired + private AntenatalExaminationService antenatalExaminationService; + + + @Autowired + private AntenatalExaminationFacade antenatalExaminationFacade; /** * 更新检查 @@ -208,8 +217,91 @@ public class BabyCheckFacade { base.setName(model.getName()); base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); - base.setDiagnose(model.getDiagnose()); - base.setHighRisk(model.getHighRisk()); //TODO + if (model.getDiagnose() != null) + { + //诊断 + List list = JsonUtil.toList(model.getDiagnose(),List.class); + List dlist = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { + for (Object did : list) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setId(String.valueOf(did)); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + + if (CollectionUtils.isNotEmpty(datas)) { + Map map = new HashMap(); + map.put("id", did); + map.put("diagnose", datas.get(0).getName()); + dlist.add(map); + } + + + } + base.setDiagnose(dlist); + } + } + + + //母亲是否高危 + if (!StringUtils.isEmpty(model.getMcertNo())) + { + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(model.getMcertNo()); + patientsQuery.setYn(YnEnums.YES.getId()); + + + List listHighRisk = new ArrayList(); + List list = patientsService.queryPatient(patientsQuery); + Patients patients = null; + if (CollectionUtils.isNotEmpty(list)) { + patients = list.get(0); + + AntExChuQuery antExChuQuery=new AntExChuQuery(); + antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setYn(YnEnums.YES.getId()); + //查询产前检查记录 + List checkList = antenatalExaminationService.findAllByParentId(patients.getId()); + + String highRisk = ""; + if (CollectionUtils.isNotEmpty(checkList)) + { + AntenatalExaminationModel m = (AntenatalExaminationModel)checkList.get(0); + highRisk = m.getRiskFactor(); + } + else + { + + //获取初诊记录 + List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); + AntExChuModel antExChuModel=null; + if(CollectionUtils.isNotEmpty(antExChulist)){ + antExChuModel= antExChulist.get(0); + } + if (antExChuModel != null) + { + highRisk = antExChuModel.getHighrisk(); + } + + } + + if (!StringUtils.isEmpty(highRisk)) + { + listHighRisk = JsonUtil.toList(highRisk, List.class); + } + + if (CollectionUtils.isNotEmpty(listHighRisk)) + { + base.setHighRisk("高危"); + } + else + { + base.setHighRisk("正常"); + } + } + } + + base.setMremark(model.getMremark()); base.setMphone(model.getMphone()); base.setMname(model.getMname()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 83fac25..22b2c93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; +import java.util.List; import java.util.Map; /** @@ -131,7 +132,7 @@ public class BabyBookbuildingAddRequest { //private String highRiskReason; //诊断 - private String diagnose; + private List diagnose; //是否高危 0 非高危 1高危 private Integer highRisk; @@ -156,11 +157,11 @@ public class BabyBookbuildingAddRequest { this.serviceStatus = serviceStatus; } - public String getDiagnose() { + public List getDiagnose() { return diagnose; } - public void setDiagnose(String diagnose) { + public void setDiagnose(List diagnose) { this.diagnose = diagnose; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index ed4957d..00f7720 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -1,5 +1,8 @@ package com.lyms.platform.operate.web.result; +import java.util.List; +import java.util.Map; + /** * Created by Administrator on 2016/6/20. */ @@ -12,15 +15,15 @@ public class BabyBasicResult { //检查日期 private String checkDate; //诊断 - private String diagnose; + private List diagnose; //生日 private String birthday; //母亲名称 private String mname; //联系方式 private String mphone; - //是否高危 0 非高危 1 高危 - private Integer highRisk; + //是否高危 孕妇 + private String highRisk; //备注 private String mremark; //性别 @@ -58,11 +61,11 @@ public class BabyBasicResult { this.name = name; } - public String getDiagnose() { + public List getDiagnose() { return diagnose; } - public void setDiagnose(String diagnose) { + public void setDiagnose(List diagnose) { this.diagnose = diagnose; } @@ -90,11 +93,11 @@ public class BabyBasicResult { this.mphone = mphone; } - public Integer getHighRisk() { + public String getHighRisk() { return highRisk; } - public void setHighRisk(Integer highRisk) { + public void setHighRisk(String highRisk) { this.highRisk = highRisk; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 6f0260c..fd39d59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import java.util.List; import java.util.Map; /** @@ -121,7 +122,7 @@ public class BabyBuildResult { //private String highRiskReason; //诊断 - private String diagnose; + private List diagnose; //是否高危 0 非高危 1高危 private Integer highRisk; @@ -171,16 +172,15 @@ public class BabyBuildResult { // this.highRiskReason = highRiskReason; // } - public String getDiagnose() { + + public List getDiagnose() { return diagnose; } - public void setDiagnose(String diagnose) { + public void setDiagnose(List diagnose) { this.diagnose = diagnose; } - - public Integer getHospitalId() { return hospitalId; } -- 1.8.3.1