From 3057d3d64c2adc72673cdc8994b8dc536dfeecd3 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Thu, 14 Mar 2019 16:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E6=8A=A5=E5=91=8A=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 106 ++++++++++----------- .../operate/web/result/PatientBaseResult.java | 22 +++-- 2 files changed, 67 insertions(+), 61 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 4a4c7e8..2cf39a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -44,6 +44,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; +import scala.util.parsing.combinator.testing.Str; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; @@ -396,8 +397,7 @@ public class PatientFacade { //徐倩说的额改成只查询分娩医院记录 不管是否隐藏建档 20180703 10:01 //http://jira.healthbaby.com.cn/browse/WEB-2711 - if (type != 3) - { + if (type != 3) { patientsQuery.setExtEnable(false); } @@ -479,12 +479,9 @@ public class PatientFacade { } else { fmHospitalList.retainAll(orgId); } - } - else - { + } else { //没有选择分娩医院 并且未产妇查询的时候 就只查询主档案 - if (type == 3) - { + if (type == 3) { patientsQuery.setExtSource(false); } } @@ -653,11 +650,10 @@ public class PatientFacade { data = convertToQuanCPatient(patientses, userId, hospital); } } - if (StringUtils.isNotEmpty(hospital)) - { + if (StringUtils.isNotEmpty(hospital)) { Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); - if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 + if (og != null && "2".equals(og.getCityId()) && riskPatientsQueryRequest.getShowDetail() == 1) {//隐藏姓名、地址 for (Object result : data) { if (result instanceof RiskPatientsResult) { RiskPatientsResult riskResult = (RiskPatientsResult) result; @@ -712,7 +708,6 @@ public class PatientFacade { Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, true, patientQueryRequest.getPid(), false); - PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { patientBaseResult.convert(patients); @@ -746,7 +741,7 @@ public class PatientFacade { if (end > patientses.size()) { end = patientses.size(); } - listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService,antExService,dischargeAbstractMotherService,matDeliverFollowService))); + listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService, antExService, dischargeAbstractMotherService, matDeliverFollowService))); } for (Future f : listFuture) { try { @@ -1041,59 +1036,57 @@ public class PatientFacade { /** - * - *唐山（滦县）需求导出孕产妇健康管理登记表 - * + * 唐山（滦县）需求导出孕产妇健康管理登记表 */ public void tsLxExport(RiskPatientsQueryRequest patientsQueryRequest, Integer userId, - HttpServletResponse response){ + HttpServletResponse response) { response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment;fileName=" + "datas.xls"); - try{ + try { BaseListResponse listResponse = null; List> datas = new ArrayList<>(); if (patientsQueryRequest.getQueryType() == 1) { //全部孕妇 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); - if(list != null && list.size()>0){ - for(Object obj : list){ + if (list != null && list.size() > 0) { + for (Object obj : list) { Map data = new HashMap<>(); QuanPatientsResult rp = (QuanPatientsResult) obj; data.put("name", rp.getName()); - data.put("address",rp.getAddr()); - data.put("phone",rp.getPhone()); + data.put("address", rp.getAddr()); + data.put("phone", rp.getPhone()); data.put("lastMenses", rp.getLastMenses()); - data.put("yi",rp.getYi()); - data.put("er",rp.getEr()); - data.put("san",rp.getSan()); - data.put("si",rp.getSi()); - data.put("wu",rp.getWu()); - data.put("total",rp.getcTimes()); + data.put("yi", rp.getYi()); + data.put("er", rp.getEr()); + data.put("san", rp.getSan()); + data.put("si", rp.getSi()); + data.put("wu", rp.getWu()); + data.put("total", rp.getcTimes()); datas.add(data); } } - }else if(patientsQueryRequest.getQueryType() == 2){ + } else if (patientsQueryRequest.getQueryType() == 2) { //全部产妇 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { Map data = new HashMap<>(); QuanChanResult rp = (QuanChanResult) obj; - data.put("name",rp.getName()); - data.put("address",rp.getAddr()); - data.put("phone",rp.getPhone()); + data.put("name", rp.getName()); + data.put("address", rp.getAddr()); + data.put("phone", rp.getPhone()); data.put("lastMenses", rp.getLastMenses()); - data.put("yi",rp.getYi()); - data.put("er",rp.getEr()); - data.put("san",rp.getSan()); - data.put("si",rp.getSi()); - data.put("wu",rp.getWu()); + data.put("yi", rp.getYi()); + data.put("er", rp.getEr()); + data.put("san", rp.getSan()); + data.put("si", rp.getSi()); + data.put("wu", rp.getWu()); data.put("total", rp.getCjTimes()); - data.put("cyxj",rp.getCyxj()); - data.put("chfs",rp.getChfs()); - data.put("chfc",rp.getChfc()); + data.put("cyxj", rp.getCyxj()); + data.put("chfs", rp.getChfs()); + data.put("chfc", rp.getChfc()); datas.add(data); } @@ -1101,7 +1094,7 @@ public class PatientFacade { } OutputStream out = response.getOutputStream(); ExcelUtil.WriteTsLxExport(out, datas); - }catch (Exception e){ + } catch (Exception e) { ExceptionUtils.catchException(e, e.getMessage()); } @@ -1109,8 +1102,6 @@ public class PatientFacade { } - - private String getLevel(List levels) { String str = ""; @@ -1211,10 +1202,10 @@ public class PatientFacade { } catch (Exception e) { // 什么都不干 } - if("1000000114".equals(patients.getHospitalId())){ + if ("1000000114".equals(patients.getHospitalId())) { patientManagerQueryModel.setPhone(patients.getPhone()); patientManagerQueryModel.setCardNo(patients.getCardNo()); - }else{ + } else { patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); } @@ -1236,12 +1227,12 @@ public class PatientFacade { patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); patientManagerQueryModel.setId(patients.getId()); - if(patients.getSendCareMan()!=null){ - if("0".equals(patients.getSendCareMan())){ + if (patients.getSendCareMan() != null) { + if ("0".equals(patients.getSendCareMan())) { patientManagerQueryModel.setSendCareMan("未发放"); - }else if("1".equals(patients.getSendCareMan())){ + } else if ("1".equals(patients.getSendCareMan())) { patientManagerQueryModel.setSendCareMan("首发"); - }else if("2".equals(patients.getSendCareMan())){ + } else if ("2".equals(patients.getSendCareMan())) { patientManagerQueryModel.setSendCareMan("补发"); } } @@ -1392,17 +1383,13 @@ public class PatientFacade { if (p != null) { AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class); if (chuModel != null) { - if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight())) - { + if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight())) { patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : ""); patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); - } - else - { + } else { PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(p.getId())), PatientWeight.class); - if (patientWeight != null) - { + if (patientWeight != null) { patientBaseResult.setHeight(StringUtils.isNotEmpty(patientWeight.getBeforeHeight()) ? patientWeight.getBeforeHeight() : ""); patientBaseResult.setWeight(StringUtils.isNotEmpty(patientWeight.getNowWeight()) ? patientWeight.getNowWeight() : ""); patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(patientWeight.getBeforeWeight()) ? patientWeight.getBeforeWeight() : ""); @@ -1414,6 +1401,15 @@ public class PatientFacade { if (pw != null) { patientBaseResult.setPwId(pw.getId()); } + //高危报告权限判断 + String HealthyId = "d42eec03-aa86-45b8-a4e0-78a0ff365fb6";//健康id// + String bmiId = "a427da89-594a-46c2-b9f7-1b0d355ce54c";//28＞BMI＞25 + String bmiIdStr = "5a40c6c5422b03d4ad2bf7bd";//BMI＜18.5 + if (null == patients.getRiskFactorId() || patients.getRiskFactorId().contains(HealthyId) || patients.getRiskFactorId().contains(bmiId) || patients.getRiskFactorId().contains(bmiIdStr)) { + patientBaseResult.setFlag(false); + } else { + patientBaseResult.setFlag(true); + } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 261247a..56f515a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -47,17 +47,27 @@ public class PatientBaseResult { //筛查结果 private List> screenResult; // 身高 - private String height; + private String height; //体重 - private String weight ; - private String beforWeight ; + private String weight; + private String beforWeight; private String birth; private String sex; //新增产前诊断信息 - private List> dia; + private List> dia; + + private boolean flag; + + public boolean isFlag() { + return flag; + } + + public void setFlag(boolean flag) { + this.flag = flag; + } public String getBeforWeight() { return beforWeight; @@ -230,10 +240,10 @@ public class PatientBaseResult { setPhone(patients.getPhone()); setRemarks(patients.getMremark()); - if(null!=patients.getFmDate()){ + if (null != patients.getFmDate()) { //1 孕妇 0 产妇 setIsGravida("0"); - }else{ + } else { setIsGravida("1"); } setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); -- 1.8.3.1