From 86edc5f1850480df4ac7bd64e55bbcf1be9093b0 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 25 May 2018 16:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E7=BC=96=E8=BE=91=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 143 ++++++++++++--------- .../operate/web/facade/BabyBookbuildingFacade.java | 1 + .../web/result/AntenatalExaminationResult.java | 7 +- .../operate/web/result/AntexChuResult.java | 7 +- 4 files changed, 90 insertions(+), 68 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 19c4256..312f4e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -919,7 +919,7 @@ public class AntenatalExaminationFacade { * @param pid * @return */ - public Map getPatLastScreenResult(String pid) { + public Map getPatLastScreenResult(String pid) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(pid); antExQuery.setYn(YnEnums.YES.getId()); @@ -931,7 +931,7 @@ public class AntenatalExaminationFacade { if (!next) { break; } - highScoreResult.put("screenResult",model.getScreenResult()); + highScoreResult.put("screenResult", model.getScreenResult()); next = false; } } @@ -950,7 +950,7 @@ public class AntenatalExaminationFacade { if (!next) { break; } - highScoreResult.put("screenResult",antExChuModel.getScreenResult()); + highScoreResult.put("screenResult", antExChuModel.getScreenResult()); next = false; } } @@ -1432,9 +1432,9 @@ public class AntenatalExaminationFacade { } //获取产程ID patientId = patients.getId(); - if(patients.getBuildType()==3){//转诊建档，数据则装入主档案数据中,必须要有主档案，而且是第一条 - if(CollectionUtils.isNotEmpty(sortList)){ - listData = sortList.get(sortList.size()-1); + if (patients.getBuildType() == 3) {//转诊建档，数据则装入主档案数据中,必须要有主档案，而且是第一条 + if (CollectionUtils.isNotEmpty(sortList)) { + listData = sortList.get(sortList.size() - 1); } } @@ -1459,8 +1459,8 @@ public class AntenatalExaminationFacade { } else { antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); } - if (patients2!=null) { - antExChuQuery.setParentIds(Arrays.asList(patientId,patients2.getId())); + if (patients2 != null) { + antExChuQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); } else { antExChuQuery.setParentId(patientId); } @@ -1483,8 +1483,8 @@ public class AntenatalExaminationFacade { } else { antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); } - if (patients2!=null) { - antExQuery.setParentIds(Arrays.asList(patientId,patients2.getId())); + if (patients2 != null) { + antExQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); } else { antExQuery.setParentId(patientId); } @@ -1504,8 +1504,8 @@ public class AntenatalExaminationFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); - if (patients2!=null) { - matDeliverQuery.setParentIdList(Arrays.asList(patientId,patients2.getId())); + if (patients2 != null) { + matDeliverQuery.setParentIdList(Arrays.asList(patientId, patients2.getId())); } else { matDeliverQuery.setParentId(patientId); } @@ -1520,7 +1520,7 @@ public class AntenatalExaminationFacade { //出院小结 DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId()); - if (patients2!=null) { + if (patients2 != null) { dischargeAbstractMotherQuery.setPatientId(patients2.getId()); } else { dischargeAbstractMotherQuery.setPatientId(patientId); @@ -1538,7 +1538,7 @@ public class AntenatalExaminationFacade { if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { StopPregQuery stopPregQuery = new StopPregQuery(); stopPregQuery.setYn(YnEnums.YES.getId()); - if (patients2!=null) { + if (patients2 != null) { stopPregQuery.setPatientId(patients2.getId()); } else { stopPregQuery.setPatientId(patientId); @@ -1555,7 +1555,7 @@ public class AntenatalExaminationFacade { } else { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setYn(YnEnums.YES.getId()); - if (patients2!=null) { + if (patients2 != null) { postReviewQuery.setParentId(patients2.getId()); } else { postReviewQuery.setParentId(patientId); @@ -1579,7 +1579,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(listData)) { sort(listData); updateEditEnable(listData, sortList); - if(!sortList.contains(listData)){ + if (!sortList.contains(listData)) { sortList.add(listData); } } @@ -2048,8 +2048,8 @@ public class AntenatalExaminationFacade { patients1.setoRiskFactor(StringUtils.isNotEmpty(highScoreResult.getOtherRisk()) ? highScoreResult.getOtherRisk() : ""); //查询最后一次产检筛查结果冗余到patient表 - Map map = getPatLastScreenResult(patients.getId()); - if(map!=null&&map.containsKey("screenResult")){ + Map map = getPatLastScreenResult(patients.getId()); + if (map != null && map.containsKey("screenResult")) { patients1.setScreenResult((List) map.get("screenResult")); } patientsService.findAndModify(patientsQuery1, patients1); @@ -2429,6 +2429,16 @@ public class AntenatalExaminationFacade { Assert.notNull(examinationModel, "id不存在."); AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult(); antenatalExaminationResult.convertToResult(examinationModel); + + try { + //筛查结果 + if (CollectionUtils.isNotEmpty(examinationModel.getScreenResult())) { + List> screenResults = getscreenResult(examinationModel.getScreenResult()); + antenatalExaminationResult.setScreenResult(screenResults); + } + } catch (Exception e) { + e.printStackTrace(); + } try { if (StringUtils.isNotEmpty(examinationModel.getRiskFactor())) { List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); @@ -2436,7 +2446,7 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setRiskFactor(highScoreResult.getHighRisk()); } } catch (Exception e) { - + e.printStackTrace(); } try { if (StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { @@ -2515,7 +2525,7 @@ public class AntenatalExaminationFacade { } if (null != antExChuModel) { Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); - if(patients!=null){ + if (patients != null) { //月经周期 String mensDay = ""; if (patients.getMensEndDay() != null) { @@ -2532,6 +2542,18 @@ public class AntenatalExaminationFacade { } antexChuResult.convertToResult(antExChuModel); + + try { + //筛查结果 + if (CollectionUtils.isNotEmpty(antExChuModel.getScreenResult())) { + List> screenResults = getscreenResult(antExChuModel.getScreenResult()); + antexChuResult.setScreenResult(screenResults); + } + } catch (Exception e) { + e.printStackTrace(); + } + + try { if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); @@ -2593,6 +2615,26 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + private List> getscreenResult(List screenResult) { + List> list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(screenResult)) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + for (String scr : screenResult) { + basicConfigQuery.setId(scr); + List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(basicConfigs)) { + for (BasicConfig basicConfig : basicConfigs) { + Map scrMap = new HashMap<>(); + scrMap.put("id", basicConfig.getId()); + scrMap.put("name", basicConfig.getName()); + list.add(scrMap); + } + } + } + } + return list; + } + public HighScoreResult queryRisk(List id, boolean n) { HighScoreResult highScoreResult = new HighScoreResult(); @@ -2847,7 +2889,7 @@ public class AntenatalExaminationFacade { public BaseResponse getGongGaoLine(String patientId, Integer id) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); List titles = new ArrayList<>(); List values = new ArrayList<>(); @@ -2857,55 +2899,43 @@ public class AntenatalExaminationFacade { List patientIds = new ArrayList<>(); - if (patients != null) - { + if (patients != null) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setPid(patients.getPid()); List patientses = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(patientses)) - { - for (Patients pat : patientses) - { + if (CollectionUtils.isNotEmpty(patientses)) { + for (Patients pat : patientses) { patientIds.add(pat.getId()); } } - } - else - { + } else { patientIds.add(patientId); } - List> tables = new LinkedList<>(); + List> tables = new LinkedList<>(); AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setParentIds(patientIds); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery,Sort.Direction.ASC, "created"); - if (CollectionUtils.isNotEmpty(antExChuModels)) - { - for (AntExChuModel chumodel : antExChuModels) - { - if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) - { - Map item = new HashMap<>(); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery, Sort.Direction.ASC, "created"); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + for (AntExChuModel chumodel : antExChuModels) { + if (StringUtils.isNotEmpty(chumodel.getGonggao()) || StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) { + Map item = new HashMap<>(); String value = ""; - if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect()) ) - { + if (StringUtils.isNotEmpty(chumodel.getGonggaoSelect())) { if (StringUtils.isNotEmpty(chumodel.getGonggaoType())) { value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(chumodel.getGonggaoType()); } else { value = GongJingEnums.getGongGaoNameById(chumodel.getGonggaoSelect()); } - } - else if (StringUtils.isNotEmpty(chumodel.getGonggao())) - { + } else if (StringUtils.isNotEmpty(chumodel.getGonggao())) { value = chumodel.getGonggao(); } item.put("value", value); item.put("time", DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); - if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches())) - { + if (StringUtils.isNotEmpty(chumodel.getGonggao()) && (StringUtils.isNumeric(chumodel.getGonggao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(chumodel.getGonggao()).matches())) { titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); values.add(chumodel.getGonggao()); } @@ -2919,32 +2949,25 @@ public class AntenatalExaminationFacade { antExQuery.setParentIds(patientIds); antExQuery.setYn(YnEnums.YES.getId()); List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); - if (CollectionUtils.isNotEmpty(examinationModelList)) - { - for (AntenatalExaminationModel anmodel : examinationModelList) - { - if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) - { - Map item = new HashMap<>(); + if (CollectionUtils.isNotEmpty(examinationModelList)) { + for (AntenatalExaminationModel anmodel : examinationModelList) { + if (StringUtils.isNotEmpty(anmodel.getGongGao()) || StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) { + Map item = new HashMap<>(); String value = ""; - if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect()) ) - { + if (StringUtils.isNotEmpty(anmodel.getGongGaoSelect())) { if (StringUtils.isNotEmpty(anmodel.getGongGaoType())) { value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()) + "，" + GongJingEnums.getHengZhiNameById(anmodel.getGongGaoType()); } else { value = GongJingEnums.getGongGaoNameById(anmodel.getGongGaoSelect()); } - } - else if (StringUtils.isNotEmpty(anmodel.getGongGao())) - { + } else if (StringUtils.isNotEmpty(anmodel.getGongGao())) { value = anmodel.getGongGao(); } item.put("value", value); item.put("time", DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); - if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches())) - { + if (StringUtils.isNotEmpty(anmodel.getGongGao()) && (StringUtils.isNumeric(anmodel.getGongGao()) || Pattern.compile("^[-\\+]?[.\\d]*$").matcher(anmodel.getGongGao()).matches())) { titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); values.add(anmodel.getGongGao()); } 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 bd65631..5aa6c48 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 @@ -1756,6 +1756,7 @@ public class BabyBookbuildingFacade { basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); basicConfigQuery.setKeyword(keyword); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + // System.out.println(basicConfigQuery.convertToQuery().convertToMongoQuery()); List configResults = new ArrayList<>(); if (datas != null) { for (BasicConfig data : datas) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 41c0728..5b2cbbb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -60,15 +60,15 @@ public class AntenatalExaminationResult implements IBasicResultConvert screenResult; + private List> screenResult; //结果补充 private String resultSupple; - public List getScreenResult() { + public List> getScreenResult() { return screenResult; } - public void setScreenResult(List screenResult) { + public void setScreenResult(List> screenResult) { this.screenResult = screenResult; } @@ -587,7 +587,6 @@ public class AntenatalExaminationResult implements IBasicResultConvert screenResult; + private List> screenResult; //结果补充 private String resultSupple; - public List getScreenResult() { + public List> getScreenResult() { return screenResult; } - public void setScreenResult(List screenResult) { + public void setScreenResult(List> screenResult) { this.screenResult = screenResult; } @@ -1561,7 +1561,6 @@ public class AntexChuResult { public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { - setScreenResult(antExChuModel.getScreenResult()); setResultSupple(antExChuModel.getResultSupple()); setTtita(antExChuModel.getTtita()); setTotalThy(antExChuModel.getTotalThy()); -- 1.8.3.1