liquanyu / regional-platform

Download as
Browse Code »

Commit fe6e20ff969959fffe4c87a14165d82536d0f8cb

Authored by liquanyu
1 parent 90eabd2663
Exists in master and in 1 other branch dev

大同初诊打印

Showing 1 changed file with 22 additions and 33 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ fe6e20f
... ... @@ -385,57 +385,46 @@
385 385  
386 386  
387 387 public Map<String, Object> getPrintPatientViewData(Patients data, String id) {
388   - Map<String, Object> map = new HashMap<>();
  388 + Map<String, Object> map = new LinkedHashMap<>();
389 389  
390 390  
391 391 map.put("id", data.getId());
392 392 /* 孕妇基础数据 */
393 393 map.put("username", data.getUsername());
394 394  
  395 + map.put("age", DateUtil.getAge(data.getBirth()));
395 396 map.put("birth", DateUtil.getyyyy_MM_dd(data.getBirth()));
396   - map.put("age", UnitUtils.unitSplice(DateUtil.getAge(data.getBirth()), UnitConstants.SUI));
397   -
398   -
399   - /* 孕妇联系方式 */
400   -// map.put("residence", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
401   -// data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
402   - map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
403   - data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
  397 + map.put("register", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
  398 + data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
  399 +// map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
  400 +// data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
404 401 // map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(),
405 402 // data.getAreaPostRestId(), data.getStreetPostRestId(), data.getChildExtAddrs(), data.getAddressPostRest(), basicConfigService));
  403 +
406 404 map.put("pprofessionType", getBasicConfig(data.getPprofessionTypeId()));
407   - map.put("hprofessionType", getBasicConfig(data.getHprofessionTypeId()));
408   - /* 丈夫信息 */
409   - map.put("husbandName", data.getHusbandName());
  405 + map.put("LevelType",data.getLevelTypeId() == null ? "" : data.getLevelTypeId());
  406 + map.put("marriageAge",data.getMarriageAge() == null ? "" : data.getMarriageAge());
  407 + map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus());
  408 + map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck());
  409 + map.put("contraceptionType",data.getContraceptionType());
410 410  
411   - map.put("husbandBirth", DateUtil.getyyyy_MM_dd(data.getHusbandBirth()));
  411 + /* 丈夫信息 */
  412 + map.put("husbandName", data.getHusbandName());
412 413 map.put("husbandAge", DateUtil.getAge(data.getHusbandBirth()));
413   -
414 414 map.put("hregister", CommonsHelper.getResidence(data.getHprovinceRegisterId(), data.getHcityRegisterId(),
415 415 data.getHareaRegisterId(), data.getHstreetRegisterId(), data.getHaddressRegister(),
416 416 basicConfigService));
  417 + map.put("hprofessionType", getBasicConfig(data.getHprofessionTypeId()));
  418 + map.put("hmarriageAge",data.getHmarriageAge() == null ? "" : data.getHmarriageAge());
  419 + map.put("hphone", data.getHusbandPhone() == null ? "" : data.getHusbandPhone());
  420 + map.put("healthStatus",data.getHealthStatus() == null ? "" : data.getHealthStatus());
417 421  
418   - map.put("LevelType",getBasicConfig(data.getLevelTypeId()));
419   - map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus() == 1 ? "初婚" : (data.getMarriageStatus() == 2 ? "再婚" : "其他"));
420   - map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck() == 1 ? "是" : "否");
421   - StringBuilder sb = new StringBuilder();
422   - if (data.getContraceptionType() != null && data.getContraceptionType().size() > 0)
423   - {
424 422  
425   - sb.append(data.getContraceptionType().get("wby") != null && data.getContraceptionType().get("wby") == true ? "未避孕 " : "");
426   - sb.append(data.getContraceptionType().get("kfby") != null && data.getContraceptionType().get("kfby") == true ? "口服避孕药 " : "");
427   - sb.append(data.getContraceptionType().get("byt") != null && data.getContraceptionType().get("byt") == true ? "避孕套 " : "");
428   - sb.append(data.getContraceptionType().get("bym") != null && data.getContraceptionType().get("bym") == true ? "避孕膜 " : "");
429   - sb.append(data.getContraceptionType().get("qt") != null && data.getContraceptionType().get("qt") == true ? data.getContraceptionOther()+" " : "");
430   - }
431   - map.put("contraceptionType",sb.toString());
432   - map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他"));
433   - map.put("healthStatus",data.getHealthStatus());
434   - map.put("smoke",data.getSmoke() == null ? "" : data.getSmoke() == 1 ? "否" : "是");
  423 + map.put("smoke",data.getSmoke() == null ? "" : data.getSmoke());
435 424 map.put("smokeNum",(data.getSmoke() != null && data.getSmoke() == 2) ? data.getSmokeNum() : "");
436   - map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine() == 1 ? "偶尔" : (data.getDrinkWine() == 2 ? "经常" : "否"));
437   - map.put("hLevelType",getBasicConfig(data.getHlevelTypeId()));
438   - map.put("hmarriageAge",data.getHmarriageAge() == null ? "" : data.getHmarriageAge());
  425 + map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine());
  426 + map.put("hLevelType",data.getHlevelTypeId() == null ? "" : data.getHlevelTypeId());
  427 +
439 428 map.put("pastHistory",data.getPastHistory() == null ? "" : data.getPastHistory());
440 429 map.put("familyHistory",data.getFamilyHistory() == null ? "" : data.getFamilyHistory());
441 430 map.put("other",data.getOther() == null ? "" :data.getOther());