From 76bf2d9076e58015127175a97ab1a59970b30263 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Fri, 12 Jul 2019 17:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=96=B9=E5=BC=8F=E5=86=97?= =?UTF-8?q?=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 37 ++++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 0284df5..6a6abcf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -322,7 +322,7 @@ public class MatDeliverFacade { if (null != patients.get(0).getBuildType() && patients.get(0).getBuildType() == 2) { patientsLocal.setBuildType(0); } - patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); + patientsLocal.setFmType(MapUtils.isEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString()); try { patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); } catch (Exception e) { @@ -1741,9 +1741,7 @@ public class MatDeliverFacade { if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalId())) { fmhospitalId.add(matdeliverFollowRequest.getHospitalId()); matDeliverQuery.setFmHospitalList(fmhospitalId); - } - else if(StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) - { + } else if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) { OrganizationQuery organizationQuery = new OrganizationQuery(); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId())) { organizationQuery.setProvinceId(matdeliverFollowRequest.getHospitalProvinceId()); @@ -1762,16 +1760,12 @@ public class MatDeliverFacade { } } - if (CollectionUtils.isNotEmpty(fmhospitalId)) - { - if (!fmhospitalId.contains(hospitalId)) - { + if (CollectionUtils.isNotEmpty(fmhospitalId)) { + if (!fmhospitalId.contains(hospitalId)) { fmhospitalId.contains(hospitalId); } matDeliverQuery.setFmHospitalList(fmhospitalId); - } - else - { + } else { return listResponse; } } @@ -1807,7 +1801,7 @@ public class MatDeliverFacade { patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setType(3); //居住地 注意需要反起查询，不要搞错l，原因：前端小弟把数据存反了 - patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); + patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId()); patientsQuery.setCityRegisterId(matdeliverFollowRequest.getCityId()); patientsQuery.setProvinceRegisterId(matdeliverFollowRequest.getProvinceId()); patientsQuery.setStreetRegisterId(matdeliverFollowRequest.getStreetId()); @@ -1851,7 +1845,7 @@ public class MatDeliverFacade { c.add(Calendar.YEAR, -Integer.parseInt(startAge)); Date startDate = c.getTime(); c.setTime(new Date()); - c.add(Calendar.YEAR, - Integer.parseInt(endAge) - 1); + c.add(Calendar.YEAR, -Integer.parseInt(endAge) - 1); Date endDate = c.getTime(); List personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lt(startDate)), PersonModel.class); for (PersonModel model : personModels) { @@ -1939,7 +1933,7 @@ public class MatDeliverFacade { Aggregation aggregation = Aggregation.newAggregation(match, group); AggregationResults aggregate = mongoTemplate.aggregate(aggregation, MaternalDeliverModel.class, Map.class); List mappedResults = aggregate.getMappedResults(); - Integer okCount = 0, errorCount = 0, totalCount = 0; + Integer okCount = 0, errorCount = 0, totalCount = 0; if (CollectionUtils.isNotEmpty(mappedResults)) { for (Map map : mappedResults) { Integer visitResult = Integer.parseInt(map.get("_id").toString()); @@ -2111,7 +2105,7 @@ public class MatDeliverFacade { HashMap hashMap = new HashMap<>(16); BasicConfig config = basicConfigService.getOneBasicConfigById(id); hashMap.put("id", id); - hashMap.put("bean",config); + hashMap.put("bean", config); list.add(hashMap); } @@ -2153,7 +2147,7 @@ public class MatDeliverFacade { objects.add(map); } } - matdeliverFollowListResult.setHighRiskLevels(objects); + matdeliverFollowListResult.setHighRiskLevels(objects); List followModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(patient.getPid())), MatdeliverFollowModel.class); // 1-无人接听电话、2-拒绝访视、3-其他 @@ -2197,6 +2191,7 @@ public class MatDeliverFacade { } return ""; } + public ChildbirthManagerResult childbirthManager(ChildbirthManagerRequest childbirthManagerRequest) { ChildbirthManagerResult childbirthManagerResult = new ChildbirthManagerResult(); @@ -3041,7 +3036,7 @@ public class MatDeliverFacade { "from V_SYNC_TO_V3_PDR pdr " + "left join V_SYNC_TO_V3_PATIENT p on p.p_no = pdr.p_no " + "where pdr.PDR_CHILDBIRTHDAY > sysdate - 29 " + - "and to_char(pdr.PDR_CHILDBIRTHDAY,'YYYY-MM') BETWEEN '"+param.getStartTime()+ "' and '"+ param.getEndTime() +"'" + + "and to_char(pdr.PDR_CHILDBIRTHDAY,'YYYY-MM') BETWEEN '" + param.getStartTime() + "' and '" + param.getEndTime() + "'" + "and ( p.P_ADDRESSCOUNTY='160' OR p.P_POSTPARTUMCOUNTY='160' OR p.P_RRCOUNTY ='160')"; List list = new ArrayList(1024); try { @@ -3052,7 +3047,7 @@ public class MatDeliverFacade { MatDeliverAddRequest matDeliverAddRequest = new MatDeliverAddRequest(); List babies = new ArrayList<>(); String pCardno = rs.getString("P_CARDNO"); - if (com.lyms.platform.common.utils.StringUtils.isEmpty(pCardno)){ + if (com.lyms.platform.common.utils.StringUtils.isEmpty(pCardno)) { System.out.println("证件号为空"); continue; } @@ -3084,7 +3079,7 @@ public class MatDeliverFacade { //String pNo = rs.getString("P_NO"); String pdrId = rs.getString("PDR_ID"); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(pdrId)) { - String sqlBaby = "select * from V_SYNC_TO_V3_BABY baby where baby.NB_PDRID = '" + pdrId +"'"; + String sqlBaby = "select * from V_SYNC_TO_V3_BABY baby where baby.NB_PDRID = '" + pdrId + "'"; PreparedStatement statement = connection.prepareStatement(sqlBaby); ResultSet resultSet = statement.executeQuery(); while (resultSet.next()) { @@ -3098,7 +3093,7 @@ public class MatDeliverFacade { baby.setPregnancyOut(getPregnancyOutByV2(nbChantype)); baby.setBabyGender(nbChildsex); - baby.setBabyWeight(nbChildweight+""); + baby.setBabyWeight(nbChildweight + ""); baby.setBabyHeight(nbLength); babies.add(baby); } @@ -3120,7 +3115,7 @@ public class MatDeliverFacade { } catch (SQLException e) { e.printStackTrace(); - }finally { + } finally { try { connection.close(); } catch (SQLException e) { -- 1.8.3.1