jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b6be7f08c4084713976987a0fcc6c79ba6b915ee

Authored by liquanyu
1 parent ade84a0de0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 61 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ b6be7f0
... ... @@ -1837,8 +1837,9 @@
1837 1837 map.put("operaterUser", operaterUser);
1838 1838  
1839 1839 String hospital = "";
  1840 + Organization organization = null;
1840 1841 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) {
1841   - Organization organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId()));
  1842 + organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId()));
1842 1843 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
1843 1844 hospital = organization.getName();
1844 1845 }
1845 1846  
1846 1847  
... ... @@ -2049,9 +2050,18 @@
2049 2050 } else {//空
2050 2051 map.put("fujian", data.getFujian());
2051 2052 }
2052   -
2053 2053 map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
  2054 + //1初诊：宫高（14周前没有填写，查看页面自动展示三个字：未测量）；胎方位（28周之前没有填写，查看页面自动展示三个字：未测量）
  2055 + if (organization != null && "2".equals(organization.getCityId()))
  2056 + {
  2057 + if (week < 14 && !StringUtils.isNotEmpty(data.getGonggao()))
  2058 + {
  2059 + map.put("gonggao", "未测量");
  2060 + }
  2061 + }
2054 2062  
  2063 +
  2064 +
2055 2065 if (StringUtils.isNotEmpty(data.getGonggaoSelect())) {
2056 2066 map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect()));
2057 2067 }
... ... @@ -2173,6 +2183,18 @@
2173 2183 }
2174 2184 }
2175 2185 }
  2186 + else
  2187 + {
  2188 + //1初诊：胎方位（28周之前没有填写，查看页面自动展示三个字：未测量）
  2189 + if (organization != null && "2".equals(organization.getCityId()))
  2190 + {
  2191 + if (week < 28)
  2192 + {
  2193 + fetalPosition+="未测量";
  2194 + }
  2195 + }
  2196 + }
  2197 +
2176 2198 //胎先露
2177 2199 fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation();
2178 2200 //胎心率
... ... @@ -2245,6 +2267,18 @@
2245 2267 }
2246 2268 }
2247 2269 }
  2270 + else
  2271 + {
  2272 + //1初诊：宫高（14周前没有填写，查看页面自动展示三个字：未测量）；胎方位（28周之前没有填写，查看页面自动展示三个字：未测量）
  2273 + if (organization != null && "2".equals(organization.getCityId()))
  2274 + {
  2275 + if (week < 28)
  2276 + {
  2277 + fetalPosition+="未测量";
  2278 + }
  2279 + }
  2280 + }
  2281 +
2248 2282 heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate");
2249 2283 if (StringUtils.isNotEmpty(heartRate)) {
2250 2284 Integer a = (int) Double.parseDouble(heartRate);
... ... @@ -2307,6 +2341,8 @@
2307 2341 }
2308 2342  
2309 2343 placetaMap.put("fetalPosition", fetalPosition);
  2344 +
  2345 +
2310 2346 placetaMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
2311 2347 placetaMap.put("heartRate", UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
2312 2348 placetaMap.put("join", JoinEnums.getTitle(join));
2313 2349  
... ... @@ -3112,8 +3148,9 @@
3112 3148 map.put("checkDoctor", checkDoctor);
3113 3149  
3114 3150 String hospital = "";
  3151 + Organization organization = null;
3115 3152 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) {
3116   - Organization organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId()));
  3153 + organization = organizationService.getOrganization(Integer.parseInt(data.getHospitalId()));
3117 3154 if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
3118 3155 hospital = organization.getName();
3119 3156 }
3120 3157  
3121 3158  
... ... @@ -3149,9 +3186,18 @@
3149 3186 } else if (StringUtils.isNotEmpty(data.getGongGao())) {
3150 3187 gongGao = UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM);
3151 3188 }
3152   -
3153 3189 map.put("gongGao", gongGao);
  3190 + int week = DateUtil.getWeek2(patients.getLastMenses(),data.getCheckDate());
  3191 + if (!StringUtils.isNotEmpty(data.getGongGao())) {
  3192 + if (organization != null && "2".equals(organization.getCityId())) {
  3193 + if (week < 14) {
  3194 + map.put("gonggao", "未测量");
  3195 + }
  3196 + }
  3197 + }
3154 3198  
  3199 +
  3200 +
3155 3201 if (StringUtils.isNotEmpty(data.getGongGaoSelect())) {
3156 3202 map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect()));
3157 3203 }
... ... @@ -3198,6 +3244,15 @@
3198 3244 tireMap.put("heartRate", "");
3199 3245 }
3200 3246 tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
  3247 + if (organization != null && "2".equals(organization.getCityId()))
  3248 + {
  3249 + if (week < 28 && tire.get("fetalPosition") == null)
  3250 + {
  3251 + tireMap.put("fetalPosition", "未测量");
  3252 + }
  3253 + }
  3254 +
  3255 +
3201 3256 tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
3202 3257 tireMap.put("join", JoinEnums.getTitle(join));
3203 3258 if (tire.get("xlwz") != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ b6be7f0
... ... @@ -603,6 +603,7 @@
603 603 normalQueryMap.put("dueDate", "分娩日期");
604 604 normalQueryMap.put("name", "姓名");
605 605 normalQueryMap.put("age", "年龄");
  606 +
606 607 normalQueryMap.put("cardNo", "证件号");
607 608 normalQueryMap.put("buildWeek", "建档孕周");
608 609 normalQueryMap.put("dueWeek", "分娩孕周");
... ... @@ -624,6 +625,7 @@
624 625 areaQueryMap.put("apgarScorePf5", "Apgar5分钟");
625 626 areaQueryMap.put("apgarScorePf10", "Apgar10分钟");
626 627 areaQueryMap.put("dueDate", "分娩日期");
  628 + areaQueryMap.put("phone", "联系方式");
627 629 areaQueryMap.put("name", "姓名");
628 630 areaQueryMap.put("age", "年龄");
629 631 areaQueryMap.put("cardNo", "证件号");