From f356912585d2e407028c5b8e3659b6d145fd1279 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Fri, 12 Jul 2019 15:43:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E6=8A=A5=E5=91=8A=E4=B8=89?= =?UTF-8?q?=E5=91=A8=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/TrackDownController.java | 13 ++++---- .../platform/operate/web/facade/PatientFacade.java | 36 ++++++++++++-------- .../operate/web/result/PatientBaseResult.java | 11 +++++++ .../operate/web/service/ITrackDownService.java | 6 ++-- .../web/service/impl/PatientWeightServiceImpl.java | 2 +- .../service/impl/TemporaryWeightServiceImpl.java | 2 +- .../web/service/impl/TrackDownServiceImpl.java | 38 +++++++++------------- 7 files changed, 61 insertions(+), 47 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index beb3c53..832c4aa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -87,20 +87,19 @@ public class TrackDownController extends BaseController { @RequestMapping(value = "/all", method = RequestMethod.GET) public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver) { + Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption) { return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, - page, limit, getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver); + page, limit, getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, encryption); } - @ResponseBody @TokenRequired @RequestMapping(value = "/allExport", method = RequestMethod.GET) public void allExport(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, - @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, HttpServletResponse response) { - trackDownService.Export(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, - page, limit, getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, response); + HttpServletRequest request, + Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) { + trackDownService.Export(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key + , getUserId(request), type, check, checkup, pregnantBuild, followupStatus, isDeliver, response, encryption); } 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 9f9e632..2a6517a 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 @@ -1084,8 +1084,8 @@ public class PatientFacade { AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 antExChuQuery.setParentId(patients.getId()); List antExChulist = antExService.queryAntExChu(antExChuQuery); - AntExChuModel data2=null; - if(antExChulist.size()!=0){ + AntExChuModel data2 = null; + if (antExChulist.size() != 0) { data2 = antExService.findOne(antExChulist.get(0).getId()); } //孕次：怀孕次数== 查看母子实现 @@ -1104,19 +1104,19 @@ public class PatientFacade { String basicConfig = getBasicConfig(patients.getPliveTypeId()); //keyPregnantWomenExcelModel.setAddress(basicConfig); // keyPregnantWomenExcelModel.setAddress( map.get("residence").toString()); - if(basicConfig.contains("常住")){ + if (basicConfig.contains("常住")) { keyPregnantWomenExcelModel.setAddressbs("√"); keyPregnantWomenExcelModel.setAddressld(""); keyPregnantWomenExcelModel.setAddresswd(""); - }else if(basicConfig.contains("暂住")){ + } else if (basicConfig.contains("暂住")) { keyPregnantWomenExcelModel.setAddressbs(""); keyPregnantWomenExcelModel.setAddressld(""); keyPregnantWomenExcelModel.setAddresswd("√"); - }else if(basicConfig.contains("流动")){ + } else if (basicConfig.contains("流动")) { keyPregnantWomenExcelModel.setAddressbs(""); keyPregnantWomenExcelModel.setAddressld("√"); keyPregnantWomenExcelModel.setAddresswd(""); - }else{ + } else { keyPregnantWomenExcelModel.setAddressbs(""); keyPregnantWomenExcelModel.setAddressld(""); keyPregnantWomenExcelModel.setAddresswd(""); @@ -1132,8 +1132,8 @@ public class PatientFacade { //高危等级：展示红/橙/黄/紫 （不显示绿色）==rLevel getRiskLevelId(patients, keyPregnantWomenExcelModel); String str = keyPregnantWomenExcelModel.getrLevel(); - if(str.contains("(") && str.contains(")") ){ - String jieguo = str.substring(str.indexOf("("),str.indexOf(")")+1); + if (str.contains("(") && str.contains(")")) { + String jieguo = str.substring(str.indexOf("("), str.indexOf(")") + 1); keyPregnantWomenExcelModel.setrLevel(str.replace(jieguo, "")); } keyPregnantWomenExcelModel.setAcknowledgingTiem(DateUtil.getyyyy_MM_dd(new Date())); @@ -1146,7 +1146,7 @@ public class PatientFacade { response.setContentType("application/force-download"); response.setHeader("Content-Disposition", "attachment;filename=" + new String(("重点孕妇登记表.xls").getBytes("UTF-8"), "ISO-8859-1")); String path = this.getClass().getResource("/").getPath() + "zddc.xls"; - Map model=new HashMap(); + Map model = new HashMap(); model.put("employees", keyPregnantWomenExcelModelList); model.put("nowdate", new Date()); JxlsUtils.exportExcel(path, response.getOutputStream(), model); @@ -1526,7 +1526,7 @@ public class PatientFacade { //发放机构：当前机构名称== 当前机构名称 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId()); healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName); - if(patients!=null && patients.getId()!=null){ + if (patients != null && patients.getId() != null) { //镇街、村居或单位：现住地址 Map map = viewFacade.getPatientViewData(patients, patients.getId()); healthHandbookExcelModel.setAddress(map.get("register").toString()); @@ -1535,13 +1535,13 @@ public class PatientFacade { AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录 antExChuQuery.setParentId(patients.getId()); List antExChulist = antExService.queryAntExChu(antExChuQuery); - if(CollectionUtils.isNotEmpty(antExChulist)){ + if (CollectionUtils.isNotEmpty(antExChulist)) { AntExChuModel data = antExChulist.get(0); healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : data.getProdTime().toString())); - }else { + } else { healthHandbookExcelModel.setChildTime(""); } - }else{ + } else { healthHandbookExcelModel.setAddress(""); healthHandbookExcelModel.setChildTime(""); @@ -1735,6 +1735,16 @@ public class PatientFacade { } else { patientBaseResult.setFlag(true); } + if (null != pw.getPrintingTime()) { + int hasPrint = DateUtil.getDays(pw.getPrintingTime(), new Date()); + if (hasPrint > 21) { + patientBaseResult.setHasPrintInWeek(false); + } else { + patientBaseResult.setHasPrintInWeek(true); + } + } else { + patientBaseResult.setHasPrintInWeek(false); + } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } 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 1d439a9..26039b2 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 @@ -63,6 +63,17 @@ public class PatientBaseResult { private String doctorId; + //限制三周打印 + private boolean hasPrintInWeek; + + public boolean isHasPrintInWeek() { + return hasPrintInWeek; + } + + public void setHasPrintInWeek(boolean hasPrintInWeek) { + this.hasPrintInWeek = hasPrintInWeek; + } + public String getDoctorId() { return doctorId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java index 887dc95..a844586 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java @@ -18,11 +18,11 @@ public interface ITrackDownService extends IBaseService { BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, - Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver); + Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, Integer encryption); void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, - Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver, HttpServletResponse response); + Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, + Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption); BaseObjectResponse info(String patientId, Integer trackType, Integer buildType); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 8ee86c4..0d0e7b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -364,7 +364,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } if (null != patientWeight.getPrintingTime()) { int hasPrint = DateUtil.getDays(patientWeight.getPrintingTime(), new Date()); - if (hasPrint > 7) { + if (hasPrint > 21) { map.put("hasPrintInWeek", false); } else { map.put("hasPrintInWeek", true); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index 6babcb8..6b9aef5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -372,7 +372,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo //限制一周能打印 if (null != template.getPrintingTime()) { int hasPrint = DateUtil.getDays(template.getPrintingTime(), new Date()); - if (hasPrint > 7) { + if (hasPrint > 21) { map.put("hasPrintInWeek", false); } else { map.put("hasPrintInWeek", true); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index c2e036b..1fc7638 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -73,7 +73,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver) { + Integer followupStatus, Boolean isDeliver, Integer encryption) { String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList = new ArrayList<>(); Integer archiveModelCount = 0; @@ -100,7 +100,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS //优化前 // stopWatch.start("妇女建档优化前"); if (null != check) { - List> checkList = getResidentMainData(modelList); + List> checkList = getResidentMainData(modelList, encryption); //婚检过 if (check == 1) { for (Map checkMap : checkList) { @@ -117,7 +117,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } } else { - restList = getResidentMainData(modelList); + restList = getResidentMainData(modelList, encryption); } @@ -156,7 +156,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS // System.out.println(stopWatch.toString()); //优化后 stopWatch.start("孕妇建档优化后"); - restList = dispPatient(patientsList, hospitalId); + restList = dispPatient(patientsList, hospitalId, encryption); stopWatch.stop(); System.out.println(stopWatch.toString()); @@ -168,17 +168,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public void Export(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, - Integer page, Integer limit, Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, - Integer followupStatus, Boolean isDeliver, HttpServletResponse response) { + Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, + Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) { String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList = new ArrayList<>(); Integer archiveModelCount = 0; if (type == 1) {//查询妇女建档为主数据 //查询条件 ResidentsArchiveQuery query = new ResidentsArchiveQuery(); - query.setLimit(limit); - query.setPage(page); - query.setNeed("1"); query.setYn(YnEnums.YES.getId()); query.setQueryNo(key); query.setHospitalId(hospitalId); @@ -191,7 +188,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS query.setFollowupStatus(followupStatus); //妇女建档主数据 List modelList = residentsArchiveService.queryResident(query); - restList = getResidentMainData(modelList); + restList = getResidentMainData(modelList, encryption); this.surveyExport(restList, response); } else {//孕妇建档主数据 @@ -202,9 +199,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setFmDateEnd(fmEnd); patientsQuery.setTypeList(Arrays.asList(1, 3)); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setNeed("need"); - patientsQuery.setLimit(limit); - patientsQuery.setPage(page); patientsQuery.setHospitalId(hospitalId); patientsQuery.setQueryNo(key); patientsQuery.setFollowupStatus(followupStatus); @@ -219,14 +213,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS // System.out.println(stopWatch.toString()); //优化后 stopWatch.start("孕妇建档优化后"); - restList = dispPatient(patientsList, hospitalId); + restList = dispPatient(patientsList, hospitalId, encryption); this.surveyExport(restList, response); } } - private List> dispResidentMainData(List residentsArchiveModels, String hospitalId) { + /*private List> dispResidentMainData(List residentsArchiveModels, String hospitalId) { List> archiveModelList = new ArrayList<>(); List patients = new ArrayList<>(); @@ -299,9 +293,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS archiveModelList.addAll(dispPatient(patientsList, hospitalId)); } return archiveModelList; - } + }*/ - private List> getResidentMainData(List residentsArchiveModels) { + private List> getResidentMainData(List residentsArchiveModels, Integer encryption) { List> archiveModelList = new ArrayList<>(); @@ -315,9 +309,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("check", 3); // 婚检 temp.put("id", archiveModel.getId()); - temp.put("cardNo", StringUtils.encryCardNo(archiveModel.getCertificateNum())); + temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(archiveModel.getCertificateNum()) : archiveModel.getCertificateNum()); temp.put("username", archiveModel.getUsername()); - temp.put("phone", StringUtils.encryPhone(archiveModel.getPhone())); + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(archiveModel.getPhone()) : archiveModel.getPhone()); temp.put("age", DateUtil.getAge(archiveModel.getBirthday())); temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 @@ -436,7 +430,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS return archiveModelList; } - private List> dispPatient(List patients, String hospitalId) { + private List> dispPatient(List patients, String hospitalId, Integer encryption) { List> restList = new ArrayList<>(); Map> cardMap = new HashMap<>(); @@ -455,9 +449,9 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("fm", 3);//分娩空白 temp.put("chfc", 3);//产后复查空白 temp.put("id", patient.getId()); - temp.put("cardNo", StringUtils.encryCardNo(patient.getCardNo())); + temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(patient.getCardNo()) : patient.getCardNo()); temp.put("username", patient.getUsername()); - temp.put("phone", StringUtils.encryPhone(patient.getPhone())); + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patient.getPhone()) : patient.getPhone()); temp.put("age", DateUtil.getAge(patient.getBirth())); //建档时间 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); -- 1.8.3.1