From c7c216dab480f1cac3234c4b1c6c4371b7453116 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 3 Jul 2018 17:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/SieveFacade.java | 425 +++++++++------------ 1 file changed, 185 insertions(+), 240 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 843dba2..3c9ced8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -107,8 +107,7 @@ public class SieveFacade { sieveService.addSieve(sieveResultModel); - if (StringUtils.isNotEmpty(sieveResultModel.getExamineId()) && StringUtils.isNotEmpty(sieveResultModel.getCheckerId()) ) - { + if (StringUtils.isNotEmpty(sieveResultModel.getExamineId()) && StringUtils.isNotEmpty(sieveResultModel.getCheckerId())) { createSieveSms(sieveResultModel.getParentId()); } @@ -139,9 +138,7 @@ public class SieveFacade { } - - public void createSieveSms(String patientId) - { + public void createSieveSms(String patientId) { Patients patient = patientsService.findOnePatientById(patientId); //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); @@ -160,10 +157,9 @@ public class SieveFacade { sieveApplyOrderQuery.setParentId(patientId); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) - { + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { SieveApplyOrderModel model = sieveApplyOrderModels.get(0); - mr.setKeyword1(CommonsHelper.getHospitalName(model.getHospitalId(),organizationService)); + mr.setKeyword1(CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); mr.setKeyword2(CommonsHelper.getHospitalName(model.getSieveHospitalId(), organizationService)); mr.setRemark(DateUtil.getyyyy_MM_dd1(model.getSendTime() == null ? new Date() : model.getSendTime())); } @@ -206,9 +202,9 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(records)) { TrackDownRecord track = records.get(0); trackDownRecord.setId(track.getId()); - if (track.getTrackType()== TrackDownDateEnums.C.getId()) { + if (track.getTrackType() == TrackDownDateEnums.C.getId()) { trackDownRecord.setTrackType(TrackDownDateEnums.I.getId()); - }else if(track.getTrackType()== TrackDownDateEnums.H.getId()){ + } else if (track.getTrackType() == TrackDownDateEnums.H.getId()) { trackDownRecord.setTrackType(TrackDownDateEnums.E.getId()); } } @@ -307,8 +303,7 @@ public class SieveFacade { } - public String getSieveStatus(String patientId,String hospitalId) - { + public String getSieveStatus(String patientId, String hospitalId) { String siveStatus = ""; SieveQuery sieveQuery = new SieveQuery(); @@ -317,73 +312,58 @@ public class SieveFacade { sieveQuery.setParentId(patientId); //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { SieveModel model = list.get(0); - if (model.getZtfx() == null) - { + if (model.getZtfx() == null) { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(patientId); sieveApplyOrderQuery1.setHospitalId(hospitalId); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isEmpty(list1)) - { + if (CollectionUtils.isEmpty(list1)) { siveStatus = "未产筛"; - } - else - { + } else { siveStatus = "已申请"; } - } - else - { + } else { siveStatus = SieveEnums.getTitle(model.getZtfx()); } - } - else - { + } else { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(patientId); sieveApplyOrderQuery1.setHospitalId(hospitalId); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isEmpty(list1)) - { + if (CollectionUtils.isEmpty(list1)) { siveStatus = "未产筛"; - } - else - { + } else { SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(patientId); sieveResultQuery.setYn(YnEnums.YES.getId()); List resultModels = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(resultModels)) - { + if (CollectionUtils.isNotEmpty(resultModels)) { SieveResultModel resultModel = resultModels.get(0); - List slist =new ArrayList<>(); + List slist = new ArrayList<>(); - if(StringUtils.isNotEmpty(resultModel.getTszhz())){ + if (StringUtils.isNotEmpty(resultModel.getTszhz())) { slist.add(Integer.valueOf(resultModel.getTszhz())); } - if(StringUtils.isNotEmpty(resultModel.getSjgjx())){ + if (StringUtils.isNotEmpty(resultModel.getSjgjx())) { slist.add(Integer.valueOf(resultModel.getSjgjx())); } - if(StringUtils.isNotEmpty(resultModel.getSbst())){ + if (StringUtils.isNotEmpty(resultModel.getSbst())) { slist.add(Integer.valueOf(resultModel.getSbst())); } - if(StringUtils.isNotEmpty(resultModel.getDzhpx())){ + if (StringUtils.isNotEmpty(resultModel.getDzhpx())) { slist.add(Integer.valueOf(resultModel.getDzhpx())); } - if(StringUtils.isNotEmpty(resultModel.getStzhz13())){ + if (StringUtils.isNotEmpty(resultModel.getStzhz13())) { slist.add(Integer.valueOf(resultModel.getStzhz13())); } siveStatus = SieveEnums.getTitle(Collections.max(slist)); - } - else - { + } else { siveStatus = "已申请"; } } @@ -399,7 +379,7 @@ public class SieveFacade { * @param cqSieveQueryRequest * @return */ - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) { + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) { List data = new ArrayList<>(); SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo()); @@ -458,40 +438,30 @@ public class SieveFacade { sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); - if(isSieveLagManage) - { - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId())) - { + if (isSieveLagManage) { + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId())) { sieveQuery.setApplyHospitalId(cqSieveQueryRequest.getApplyHospitalId()); } sieveQuery.setSieveHospitalId(hospitalId); - } - else - { + } else { sieveQuery.setHospitalId(hospitalId); } - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) - { + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) { List parentIds = new ArrayList<>(); SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); sieveApplyOrderQuery.setSieveHospitalId(hospitalId); sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) - { - for(SieveApplyOrderModel model : sieveApplyOrderModels) - { + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { + for (SieveApplyOrderModel model : sieveApplyOrderModels) { parentIds.add(model.getParentId()); } } - if (CollectionUtils.isNotEmpty(parentIds)) - { + if (CollectionUtils.isNotEmpty(parentIds)) { sieveQuery.setParentIds(parentIds); - } - else - { + } else { return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); } } @@ -507,7 +477,7 @@ public class SieveFacade { if (end > list.size()) { end = list.size(); } - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService))); } for (Future f : listFuture) { try { @@ -522,7 +492,7 @@ public class SieveFacade { public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false); + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null, false); List list = listResponse.getData(); List> datas = new ArrayList<>(); @@ -628,38 +598,32 @@ public class SieveFacade { } /** - * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案 + * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案 + * * @param cardNo * @param userId * @return */ - public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) { + public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); - if (StringUtils.isNotEmpty(cardNo)) - { + if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setPhoneOrCert(cardNo); - } - else if (StringUtils.isNotEmpty(vcCardNo)) - { + } else if (StringUtils.isNotEmpty(vcCardNo)) { patientsQuery.setVcCardNo(vcCardNo); } List localPatients = patientsService.queryPatient(patientsQuery); Patients pat = null; - if (CollectionUtils.isNotEmpty(localPatients)) - { + if (CollectionUtils.isNotEmpty(localPatients)) { pat = localPatients.get(0); - } - else - { + } else { patientsQuery.setHospitalId(null); List areaPatients = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(areaPatients)) { @@ -669,9 +633,7 @@ public class SieveFacade { String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1); pat = patientsService.findOnePatientById(id); - } - else - { + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛"); } } @@ -687,8 +649,7 @@ public class SieveFacade { sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛！"); } @@ -702,8 +663,7 @@ public class SieveFacade { antExChuQuery.setYn(YnEnums.YES.getId()); List list = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { AntExChuModel chuModel = list.get(0); patientBaseResult.setWeight(chuModel.getYqWeight()); } @@ -711,9 +671,9 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } - public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) { + public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); //String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); @@ -727,9 +687,8 @@ public class SieveFacade { sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); - if (CollectionUtils.isNotEmpty(localPatients)) - { - Patients pat = localPatients.get(0); + if (CollectionUtils.isNotEmpty(localPatients)) { + Patients pat = localPatients.get(0); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); patientBaseResult.convert(pat); @@ -741,95 +700,89 @@ public class SieveFacade { map.put("patientInfo", patientBaseResult); } - if (type == 4) - { + if (type == 4) { - Map sieveResultEditInfo = new HashMap<>(); + Map sieveResultEditInfo = new HashMap<>(); SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); sieveResultQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { SieveResultModel model = list.get(0); - sieveResultEditInfo.put("id",model.getId()); - sieveResultEditInfo.put("hcg",model.getHcg() != null ? model.getHcg() : ""); - sieveResultEditInfo.put("hcgMom",model.getHcgMom() != null ? model.getHcgMom() : ""); - sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : ""); - sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : ""); + sieveResultEditInfo.put("id", model.getId()); + sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : ""); + sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : ""); + sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : ""); + sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : ""); sieveResultEditInfo.put("examineId", model.getExamineId()); - sieveResultEditInfo.put("checkerId",model.getCheckerId()); - sieveResultEditInfo.put("resultTime",DateUtil.getyyyy_MM_dd(model.getResultTime())); + sieveResultEditInfo.put("checkerId", model.getCheckerId()); + sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime())); - sieveResultEditInfo.put("tszhz",model.getTszhz()); - sieveResultEditInfo.put("sbst",model.getSbst()); - sieveResultEditInfo.put("stzhz13",model.getStzhz13()); - sieveResultEditInfo.put("sjgjx",model.getSjgjx()); + sieveResultEditInfo.put("tszhz", model.getTszhz()); + sieveResultEditInfo.put("sbst", model.getSbst()); + sieveResultEditInfo.put("stzhz13", model.getStzhz13()); + sieveResultEditInfo.put("sjgjx", model.getSjgjx()); - sieveResultEditInfo.put("tszhzValue",model.getTszhzValue()); - sieveResultEditInfo.put("sbstValue",model.getSbstValue()); - sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value()); - sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue()); - sieveResultEditInfo.put("publishName",model.getPublishName()); + sieveResultEditInfo.put("tszhzValue", model.getTszhzValue()); + sieveResultEditInfo.put("sbstValue", model.getSbstValue()); + sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value()); + sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue()); + sieveResultEditInfo.put("publishName", model.getPublishName()); } - map.put("sieveResultEditInfo",sieveResultEditInfo); - } - else - { + map.put("sieveResultEditInfo", sieveResultEditInfo); + } else { List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) - { - Map result = new HashMap<>(); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { + Map result = new HashMap<>(); - Map viewInfo = new HashMap<>(); + Map viewInfo = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); - result.put("id",sieveApply.getId()); - result.put("parentId",sieveApply.getParentId()); - - result.put("check",sieveApply.getCheckItem()); - result.put("guide",sieveApply.getGuide()); - result.put("checkDate",sieveApply.getCheckDate()); - result.put("applyDoctor",sieveApply.getApplyDoctor()); - result.put("hospitalId",sieveApply.getHospitalId()); - result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime())); - result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth())); - result.put("weight",sieveApply.getWeight()); - result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); - result.put("number",sieveApply.getNumber()); - result.put("collectionDoctorId",sieveApply.getCollectionDoctorId()); - result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); - result.put("crl",sieveApply.getCrl()); - result.put("bpd",sieveApply.getBpd()); - result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); - result.put("historyBirth",sieveApply.getHistoryBirth()); - result.put("pastHistory",sieveApply.getPastHistory()); - result.put("sieveHospitalId",sieveApply.getSieveHospitalId()); - result.put("sendDoctor",sieveApply.getSendDoctor()); - result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); - result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); - result.put("mensesDay",sieveApply.getMensesDay()); - result.put("mensesWeek",sieveApply.getMensesWeek()); - result.put("experimentNum",""); - - map.put("sieveApplyInfo",result); - - if (type == 1 || type == 3) - { - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService); - viewInfo.put("applyDoctorName",applyDoctorName); - - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService); - viewInfo.put("collectionDoctorName",collectionDoctorName); - - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService); - viewInfo.put("sendDoctorName",sendDoctorName); - - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService); + result.put("id", sieveApply.getId()); + result.put("parentId", sieveApply.getParentId()); + + result.put("check", sieveApply.getCheckItem()); + result.put("guide", sieveApply.getGuide()); + result.put("checkDate", sieveApply.getCheckDate()); + result.put("applyDoctor", sieveApply.getApplyDoctor()); + result.put("hospitalId", sieveApply.getHospitalId()); + result.put("applyTime", DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime())); + result.put("birth", DateUtil.getyyyy_MM_dd(sieveApply.getBirth())); + result.put("weight", sieveApply.getWeight()); + result.put("lastMenses", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); + result.put("number", sieveApply.getNumber()); + result.put("collectionDoctorId", sieveApply.getCollectionDoctorId()); + result.put("collectionDate", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); + result.put("crl", sieveApply.getCrl()); + result.put("bpd", sieveApply.getBpd()); + result.put("bcCheckDate", DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); + result.put("historyBirth", sieveApply.getHistoryBirth()); + result.put("pastHistory", sieveApply.getPastHistory()); + result.put("sieveHospitalId", sieveApply.getSieveHospitalId()); + result.put("sendDoctor", sieveApply.getSendDoctor()); + result.put("sendTime", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); + result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); + result.put("mensesDay", sieveApply.getMensesDay()); + result.put("mensesWeek", sieveApply.getMensesWeek()); + result.put("experimentNum", ""); + + map.put("sieveApplyInfo", result); + + if (type == 1 || type == 3) { + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(), usersService); + viewInfo.put("applyDoctorName", applyDoctorName); + + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); + viewInfo.put("collectionDoctorName", collectionDoctorName); + + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService); + viewInfo.put("sendDoctorName", sendDoctorName); + + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService); viewInfo.put("applyHospitalName", applyHospitalName); - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService); + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService); viewInfo.put("currentHospitalName", currentHospitalName); String isTire = ""; @@ -838,82 +791,74 @@ public class SieveFacade { antExChuQuery1.setParentId(parentId); antExChuQuery1.setYn(YnEnums.YES.getId()); List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); - if (CollectionUtils.isNotEmpty(data1)) - { + if (CollectionUtils.isNotEmpty(data1)) { AntExChuModel chuModel = data1.get(0); - if (StringUtils.isNotEmpty(chuModel.getTireNumber())) - { - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否"; + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) { + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否"; tireNumber = chuModel.getTireNumber(); } } map.put("isTire", isTire); - map.put("tireNumber",tireNumber); - map.put("viewInfo",viewInfo); + map.put("tireNumber", tireNumber); + map.put("viewInfo", viewInfo); - if (type == 3) - { - Map sieveResultInfo = new HashMap<>(); + if (type == 3) { + Map sieveResultInfo = new HashMap<>(); SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); sieveResultQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { SieveResultModel sieveResultModel = list.get(0); - sieveResultInfo.put("hcg",sieveResultModel.getHcg() != null ? sieveResultModel.getHcg()+"ng/ml" : ""); - sieveResultInfo.put("hcgMom",sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : ""); - sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : ""); - sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : ""); + sieveResultInfo.put("hcg", sieveResultModel.getHcg() != null ? sieveResultModel.getHcg() + "ng/ml" : ""); + sieveResultInfo.put("hcgMom", sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : ""); + sieveResultInfo.put("hafp", sieveResultModel.getHafp() != null ? sieveResultModel.getHafp() + "U/ml" : ""); + sieveResultInfo.put("hafpMom", sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : ""); sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService)); - sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); - sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); + sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); + sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); String tszhzValue = ""; - if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) - { + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) { String valueOne = sieveResultModel.getTszhzValue().get("valueOne"); String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo"); - tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险"); + tszhzValue = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险"); } - sieveResultInfo.put("tszhz",tszhzValue); + sieveResultInfo.put("tszhz", tszhzValue); String sbst = ""; - if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) - { + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) { String valueOne = sieveResultModel.getSbstValue().get("valueOne"); String valueTwo = sieveResultModel.getSbstValue().get("valueTwo"); - sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险"); + sbst = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险"); } - sieveResultInfo.put("sbst",sbst); + sieveResultInfo.put("sbst", sbst); - String sjgjx = ""; - if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) - { + String sjgjx = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) { String valueOne = sieveResultModel.getSjgjxValue().get("valueOne"); String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo"); - sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险"); + sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险"); } - sieveResultInfo.put("sjgjx",sjgjx); + sieveResultInfo.put("sjgjx", sjgjx); - String stzhz13 = ""; - if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) - { + String stzhz13 = ""; + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) { String valueOne = sieveResultModel.getStzhz13Value().get("valueOne"); String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo"); - stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险"); + stzhz13 = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险"); } - sieveResultInfo.put("stzhz13",stzhz13); + sieveResultInfo.put("stzhz13", stzhz13); } - map.put("sieveResultInfo",sieveResultInfo); + map.put("sieveResultInfo", sieveResultInfo); } } } @@ -950,12 +895,12 @@ public class SieveFacade { if (type == 2) {//查看报告 - Map sieveResultEditInfo = new HashMap<>(); + Map sieveResultEditInfo = new HashMap<>(); List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService); - sieveResultEditInfo.put("reportHostName",hostName); + sieveResultEditInfo.put("reportHostName", hostName); } SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); @@ -1023,7 +968,7 @@ public class SieveFacade { Map result = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); String hostName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService); - result.put("reportHostName",hostName); + result.put("reportHostName", hostName); result.put("patientInfo", patientBaseResult); result.put("weight", sieveApply.getWeight()); result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); @@ -1037,49 +982,52 @@ public class SieveFacade { result.put("historyBirth", sieveApply.getHistoryBirth());//生育史 Map historMap = sieveApply.getHistoryBirth(); - if(historMap.containsKey("tshr")){ - if("true".equals(historMap.get("tshr"))){ - historMap.put("tshr","是"); - }else{ - historMap.put("tshr","否"); + if (historMap != null) { + + + if (historMap.containsKey("tshr")) { + if ("true".equals(historMap.get("tshr"))) { + historMap.put("tshr", "是"); + } else { + historMap.put("tshr", "否"); + } } - } - if(historMap.containsKey("rsthr")){ - if("true".equals(historMap.get("rsthr"))){ - historMap.put("rsthr","是"); - }else{ - historMap.put("rsthr","否"); + if (historMap.containsKey("rsthr")) { + if ("true".equals(historMap.get("rsthr"))) { + historMap.put("rsthr", "是"); + } else { + historMap.put("rsthr", "否"); + } } - } - if(historMap.containsKey("sjhr")){ - if("true".equals(historMap.get("sjhr"))){ - historMap.put("sjhr","是"); - }else{ - historMap.put("sjhr","否"); + if (historMap.containsKey("sjhr")) { + if ("true".equals(historMap.get("sjhr"))) { + historMap.put("sjhr", "是"); + } else { + historMap.put("sjhr", "否"); + } } - } - if(historMap.containsKey("qt")){ - if("true".equals(historMap.get("qt"))){ - historMap.put("qt","是："+historMap.get("qtText")); - }else{ - historMap.put("qt","否"); + if (historMap.containsKey("qt")) { + if ("true".equals(historMap.get("qt"))) { + historMap.put("qt", "是：" + historMap.get("qtText")); + } else { + historMap.put("qt", "否"); + } } } - - result.put("pastHistory",sieveApply.getPastHistory()); - if(result.containsKey("pastHistory")){ - if("yes".equals(result.get("pastHistory"))){ - result.put("pastHistory","是"); - }else{ - result.put("pastHistory","否"); + result.put("pastHistory", sieveApply.getPastHistory()); + if (result.containsKey("pastHistory")) { + if ("yes".equals(result.get("pastHistory"))) { + result.put("pastHistory", "是"); + } else { + result.put("pastHistory", "否"); } } String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService); result.put("cxys", collectionDoctorName); - result.put("experimentNum",""); + result.put("experimentNum", ""); String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService); result.put("sjys", sendDoctorName); @@ -1096,7 +1044,7 @@ public class SieveFacade { if (StringUtils.isNotEmpty(chuModel.getTireNumber())) { isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否"; } - result.put("embryoNum", chuModel.getTireNumber()==null?"0":chuModel.getTireNumber()); + result.put("embryoNum", chuModel.getTireNumber() == null ? "0" : chuModel.getTireNumber()); result.put("lastMenstr", chuModel.getLastMenses()); result.put("polyember", isTire); } @@ -1104,20 +1052,17 @@ public class SieveFacade { } } return baseResponse; -} + } public BaseResponse reviceSieve(List parentIds, Integer userId) { - if (CollectionUtils.isNotEmpty(parentIds)) - { + if (CollectionUtils.isNotEmpty(parentIds)) { SieveQuery query = new SieveQuery(); query.setParentIds(parentIds); query.setYn(YnEnums.YES.getId()); List list = sieveService.queryList(query); - if (CollectionUtils.isNotEmpty(list)) - { - for (SieveModel sieve : list) - { + if (CollectionUtils.isNotEmpty(list)) { + for (SieveModel sieve : list) { sieve.setReviceStatus(2); sieveService.updateOneChanQianDiaSieve(sieve); } -- 1.8.3.1