From 5c7ee7eff9c9ad2d0010f755ea95e43cafb8fcd1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 19 Jun 2017 09:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=B0=E6=B6=A6=E5=8C=BA?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=AC=AC10=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=E6=98=AF=E8=AF=A5=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=B8=8B=E7=9A=84=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntExRecordFacade.java | 62 ++++++++++++++++++---- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index d2c52cf..03e0021 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -6,9 +6,7 @@ import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExcelUtil; -import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; @@ -22,14 +20,12 @@ import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.AntExRecordModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.DataPermissionsModel; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExRecordQuery; import com.lyms.platform.query.DataPermissionsModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -232,11 +228,11 @@ public class AntExRecordFacade { AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); if (CollectionUtils.isNotEmpty(patientses)) { List parentIds = new LinkedList<>(); - for(Patients pa:patientses){ + for (Patients pa : patientses) { parentIds.add(pa.getId()); } antExRecordQuery.setParentIds(parentIds); - }else if(StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())){ + } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); } @@ -427,7 +423,55 @@ public class AntExRecordFacade { cjStatisticsListResult.setrRisk(sb.toString()); } } + String fxys = ""; + Map olevel = new HashMap(); + if (StringUtils.isNotEmpty(record.getfId())) { + String risk = null; + if (record.getType() == 1) { + AntExChuModel model = antExService.findOne(record.getfId()); + if (null != model) { + risk = model.getOtherHighRisk(); + } + } else if (record.getType() == 2) { + AntenatalExaminationModel model = antExService.findOneById(record.getfId()); + if (null != model) { + risk = model.getOtherRisk(); + } + } + + try { + Map map = JsonUtil.str2Obj(risk, Map.class); + Object obj = map.get("fxysu"); + Object idObj1 = map.get("fyyse"); + if (null != obj) { + fxys = obj.toString(); + } + if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { + + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + if (null != basicConfig) { + String name = basicConfig.getName(); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); + } + olevel.put("name", name); + olevel.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + } + } + } catch (Exception e1) { + } + } + if (org.apache.commons.lang.StringUtils.isEmpty(cjStatisticsListResult.getrRisk())) { + cjStatisticsListResult.setrRisk(fxys); + } else if (StringUtils.isNotEmpty(fxys)) { + cjStatisticsListResult.setrRisk(cjStatisticsListResult.getrRisk() + "," + fxys); + } + + List level = new ArrayList(); + if(!olevel.isEmpty()){ + level.add(olevel); + } try { for (Object str : record.gethLevel()) { if (null != str && StringUtils.isNotEmpty(str.toString())) { -- 1.8.3.1