jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 76bf2d9076e58015127175a97ab1a59970b30263

Authored by [wangbo]
1 parent f356912585
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩方式冗余

Showing 1 changed file with 16 additions and 21 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 76bf2d9
... ... @@ -322,7 +322,7 @@
322 322 if (null != patients.get(0).getBuildType() && patients.get(0).getBuildType() == 2) {
323 323 patientsLocal.setBuildType(0);
324 324 }
325   - patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
  325 + patientsLocal.setFmType(MapUtils.isEmpty(deliverAddRequest.getDeliveryMode()) ? null : deliverAddRequest.getDeliveryMode().toString());
326 326 try {
327 327 patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate));
328 328 } catch (Exception e) {
... ... @@ -1741,9 +1741,7 @@
1741 1741 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalId())) {
1742 1742 fmhospitalId.add(matdeliverFollowRequest.getHospitalId());
1743 1743 matDeliverQuery.setFmHospitalList(fmhospitalId);
1744   - }
1745   - else if(StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId()))
1746   - {
  1744 + } else if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
1747 1745 OrganizationQuery organizationQuery = new OrganizationQuery();
1748 1746 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId())) {
1749 1747 organizationQuery.setProvinceId(matdeliverFollowRequest.getHospitalProvinceId());
1750 1748  
... ... @@ -1762,16 +1760,12 @@
1762 1760 }
1763 1761 }
1764 1762  
1765   - if (CollectionUtils.isNotEmpty(fmhospitalId))
1766   - {
1767   - if (!fmhospitalId.contains(hospitalId))
1768   - {
  1763 + if (CollectionUtils.isNotEmpty(fmhospitalId)) {
  1764 + if (!fmhospitalId.contains(hospitalId)) {
1769 1765 fmhospitalId.contains(hospitalId);
1770 1766 }
1771 1767 matDeliverQuery.setFmHospitalList(fmhospitalId);
1772   - }
1773   - else
1774   - {
  1768 + } else {
1775 1769 return listResponse;
1776 1770 }
1777 1771 }
... ... @@ -1807,7 +1801,7 @@
1807 1801 patientsQuery.setIsAutoFm(YnEnums.NO.getId());
1808 1802 patientsQuery.setType(3);
1809 1803 //居住地 注意需要反起查询，不要搞错l，原因：前端小弟把数据存反了
1810   - patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId());
  1804 + patientsQuery.setAreaRegisterId(matdeliverFollowRequest.getAreaId());
1811 1805 patientsQuery.setCityRegisterId(matdeliverFollowRequest.getCityId());
1812 1806 patientsQuery.setProvinceRegisterId(matdeliverFollowRequest.getProvinceId());
1813 1807 patientsQuery.setStreetRegisterId(matdeliverFollowRequest.getStreetId());
... ... @@ -1851,7 +1845,7 @@
1851 1845 c.add(Calendar.YEAR, -Integer.parseInt(startAge));
1852 1846 Date startDate = c.getTime();
1853 1847 c.setTime(new Date());
1854   - c.add(Calendar.YEAR, - Integer.parseInt(endAge) - 1);
  1848 + c.add(Calendar.YEAR, -Integer.parseInt(endAge) - 1);
1855 1849 Date endDate = c.getTime();
1856 1850 List<PersonModel> personModels = mongoTemplate.find(Query.query(Criteria.where("birth").gte(endDate).lt(startDate)), PersonModel.class);
1857 1851 for (PersonModel model : personModels) {
... ... @@ -1939,7 +1933,7 @@
1939 1933 Aggregation aggregation = Aggregation.newAggregation(match, group);
1940 1934 AggregationResults<Map> aggregate = mongoTemplate.aggregate(aggregation, MaternalDeliverModel.class, Map.class);
1941 1935 List<Map> mappedResults = aggregate.getMappedResults();
1942   - Integer okCount = 0, errorCount = 0, totalCount = 0;
  1936 + Integer okCount = 0, errorCount = 0, totalCount = 0;
1943 1937 if (CollectionUtils.isNotEmpty(mappedResults)) {
1944 1938 for (Map map : mappedResults) {
1945 1939 Integer visitResult = Integer.parseInt(map.get("_id").toString());
... ... @@ -2111,7 +2105,7 @@
2111 2105 HashMap<String, Object> hashMap = new HashMap<>(16);
2112 2106 BasicConfig config = basicConfigService.getOneBasicConfigById(id);
2113 2107 hashMap.put("id", id);
2114   - hashMap.put("bean",config);
  2108 + hashMap.put("bean", config);
2115 2109 list.add(hashMap);
2116 2110  
2117 2111 }
... ... @@ -2153,7 +2147,7 @@
2153 2147 objects.add(map);
2154 2148 }
2155 2149 }
2156   - matdeliverFollowListResult.setHighRiskLevels(objects);
  2150 + matdeliverFollowListResult.setHighRiskLevels(objects);
2157 2151  
2158 2152 List<MatdeliverFollowModel> followModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(patient.getPid())), MatdeliverFollowModel.class);
2159 2153 // 1-无人接听电话、2-拒绝访视、3-其他
... ... @@ -2197,6 +2191,7 @@
2197 2191 }
2198 2192 return "";
2199 2193 }
  2194 +
2200 2195 public ChildbirthManagerResult childbirthManager(ChildbirthManagerRequest childbirthManagerRequest) {
2201 2196 ChildbirthManagerResult childbirthManagerResult = new ChildbirthManagerResult();
2202 2197  
... ... @@ -3041,7 +3036,7 @@
3041 3036 "from V_SYNC_TO_V3_PDR pdr " +
3042 3037 "left join V_SYNC_TO_V3_PATIENT p on p.p_no = pdr.p_no " +
3043 3038 "where pdr.PDR_CHILDBIRTHDAY > sysdate - 29 " +
3044   - "and to_char(pdr.PDR_CHILDBIRTHDAY,'YYYY-MM') BETWEEN '"+param.getStartTime()+ "' and '"+ param.getEndTime() +"'" +
  3039 + "and to_char(pdr.PDR_CHILDBIRTHDAY,'YYYY-MM') BETWEEN '" + param.getStartTime() + "' and '" + param.getEndTime() + "'" +
3045 3040 "and ( p.P_ADDRESSCOUNTY='160' OR p.P_POSTPARTUMCOUNTY='160' OR p.P_RRCOUNTY ='160')";
3046 3041 List<MatDeliverAddRequest> list = new ArrayList<MatDeliverAddRequest>(1024);
3047 3042 try {
... ... @@ -3052,7 +3047,7 @@
3052 3047 MatDeliverAddRequest matDeliverAddRequest = new MatDeliverAddRequest();
3053 3048 List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
3054 3049 String pCardno = rs.getString("P_CARDNO");
3055   - if (com.lyms.platform.common.utils.StringUtils.isEmpty(pCardno)){
  3050 + if (com.lyms.platform.common.utils.StringUtils.isEmpty(pCardno)) {
3056 3051 System.out.println("证件号为空");
3057 3052 continue;
3058 3053 }
... ... @@ -3084,7 +3079,7 @@
3084 3079 //String pNo = rs.getString("P_NO");
3085 3080 String pdrId = rs.getString("PDR_ID");
3086 3081 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(pdrId)) {
3087   - String sqlBaby = "select * from V_SYNC_TO_V3_BABY baby where baby.NB_PDRID = '" + pdrId +"'";
  3082 + String sqlBaby = "select * from V_SYNC_TO_V3_BABY baby where baby.NB_PDRID = '" + pdrId + "'";
3088 3083 PreparedStatement statement = connection.prepareStatement(sqlBaby);
3089 3084 ResultSet resultSet = statement.executeQuery();
3090 3085 while (resultSet.next()) {
... ... @@ -3098,7 +3093,7 @@
3098 3093  
3099 3094 baby.setPregnancyOut(getPregnancyOutByV2(nbChantype));
3100 3095 baby.setBabyGender(nbChildsex);
3101   - baby.setBabyWeight(nbChildweight+"");
  3096 + baby.setBabyWeight(nbChildweight + "");
3102 3097 baby.setBabyHeight(nbLength);
3103 3098 babies.add(baby);
3104 3099 }
... ... @@ -3120,7 +3115,7 @@
3120 3115  
3121 3116 } catch (SQLException e) {
3122 3117 e.printStackTrace();
3123   - }finally {
  3118 + } finally {
3124 3119 try {
3125 3120 connection.close();
3126 3121 } catch (SQLException e) {