jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c635d3d3a51577e8d9408a1f05785ae712cf060d

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

缺少未闭合尺寸

Showing 3 changed files with 13 additions and 13 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ c635d3d
... ... @@ -370,6 +370,7 @@
370 370 tr.setTrackType(TrackDownDateEnums.F.getId());
371 371 }
372 372 }else{//否则不显示
  373 + System.out.println("开始处理产检、产筛追访数据进入分娩追访:"+patients.getId());
373 374 tr.setStatus(0);
374 375 }
375 376 trackDownRecordService.updateTrackDown(tr, tr.getId());
376 377  
... ... @@ -390,15 +391,16 @@
390 391 for (TrackDownRecord tr : records) {
391 392 Patients patients = iPatientDao.getPatient(tr.getParentId());
392 393 if (patients == null || tr == null) {
  394 + tr.setStatus(0);
393 395 System.out.println("处理产筛追访数据，孕周大于20周自动进入产检追访:patient为空" + tr.getParentId());
394   - continue;
395   - }
396   - int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
397   - if (week > 20) {//不能做产前筛查追访，显示产前检查追访
398   - if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
399   - tr.setTrackType(TrackDownDateEnums.I.getId());
400   - } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
401   - tr.setTrackType(TrackDownDateEnums.E.getId());
  396 + }else {
  397 + int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
  398 + if (week > 20) {//不能做产前筛查追访，显示产前检查追访
  399 + if (tr.getTrackType() == TrackDownDateEnums.C.getId()) {
  400 + tr.setTrackType(TrackDownDateEnums.I.getId());
  401 + } else if (tr.getTrackType() == TrackDownDateEnums.H.getId()) {
  402 + tr.setTrackType(TrackDownDateEnums.E.getId());
  403 + }
402 404 }
403 405 }
404 406 trackDownRecordService.updateTrackDown(tr, tr.getId());
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ c635d3d
... ... @@ -46,7 +46,7 @@
46 46 private String excrement;
47 47 //睡眠情况
48 48 private String sleep;
49   - //活动小时
  49 + //活动小时（户外活动）
50 50 private String activity;
51 51 //维生素D
52 52 private String vitaminD;
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java View file @ c635d3d
... ... @@ -242,7 +242,6 @@
242 242 String value = QbTypeEnums.getNameById(Integer.parseInt(map.get("select").toString()));
243 243 babyPaedia.setUmbilical(value);
244 244 }
245   -
246 245 }
247 246  
248 247 babyPaedia.setOtherText(babyCheckModel.getBabyCheckOther());
249 248  
250 249  
... ... @@ -288,17 +287,16 @@
288 287 babyCheckCommonly.setHeight(com.lyms.platform.common.utils.StringUtils.unitHandle(babyCheckModel.getHeight(), UnitConstants.CM));
289 288 babyCheckCommonly.setHeightWeight(babyCheckModel.getHeightWeight());
290 289 String bregma = "";
291   - String bregmaValue = "";
292 290 if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getBregma())) {
293 291 Map map = JsonUtil.str2Obj(babyCheckModel.getBregma(), Map.class);
294 292 String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString();
295 293 if ("yes".equals(yesOrNo)) {
296 294 bregma = "闭合";
297 295 } else if ("no".equals(yesOrNo)) {
298   -// bregma = "未闭合";
  296 + bregma = "未闭合";
299 297 String one = map.get("wbhcc1") == null ? "" : map.get("wbhcc1").toString();
300 298 String two = map.get("wbhcc2") == null ? "" : map.get("wbhcc2").toString();
301   - bregma = one + "cm - " + two + "cm";
  299 + bregma = bregma+":"+one + "cm - " + two + "cm";
302 300 }
303 301 }
304 302 babyCheckCommonly.setBregma(bregma);