liquanyu / regional-platform

Download as
Browse Code »

Commit 070d5f43358845233a51d3ecbe0b520ad94f6e81

Authored by liquanyu
1 parent 95b8bc2f62
Exists in master and in 1 other branch dev

大同档案增加字段

Showing 5 changed files with 36 additions and 12 deletions

platform-common/src/main/java/com/lyms/platform/common/Test.java View file @ 070d5f4
... ... @@ -8,9 +8,6 @@
8 8  
9 9 public class Test {
10 10 public static void main(String[] args) {
11   - String fmWeekStr = "37+2";
12   - Date da = DateUtil.parseYMD("0001-01-01");
13   - System.out.println(da);
14 11  
15 12 }
16 13  
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 070d5f4
... ... @@ -9,6 +9,7 @@
9 9  
10 10 import java.util.Date;
11 11 import java.util.List;
  12 +import java.util.Map;
12 13 import java.util.Objects;
13 14  
14 15  
... ... @@ -345,7 +346,7 @@
345 346 private Integer marriageCheck;
346 347  
347 348 //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
348   - private Integer contraceptionType;
  349 + private List<Map<String,Boolean>> contraceptionType;
349 350 private String contraceptionOther;
350 351  
351 352 //丈夫婚姻状态 1初婚 2 再婚 3其他
352 353  
... ... @@ -407,11 +408,11 @@
407 408 this.marriageCheck = marriageCheck;
408 409 }
409 410  
410   - public Integer getContraceptionType() {
  411 + public List<Map<String,Boolean>> getContraceptionType() {
411 412 return contraceptionType;
412 413 }
413 414  
414   - public void setContraceptionType(Integer contraceptionType) {
  415 + public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
415 416 this.contraceptionType = contraceptionType;
416 417 }
417 418  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 070d5f4
... ... @@ -474,6 +474,32 @@
474 474 map.put("numberCode", data.getNumberCode() == null ? "" : data.getNumberCode());
475 475 map.put("normal", (data.getNormal() == null || "1".equals(data.getNormal())) ? "正常" : "补录");
476 476  
  477 +
  478 + map.put("marriageAge",data.getMarriageAge() == null ? "" : data.getMarriageAge());
  479 + map.put("LevelType",getBasicConfig(data.getLevelTypeId()));
  480 + map.put("marriageStatus",data.getMarriageStatus() == null ? "" : data.getMarriageStatus() == 1 ? "初婚" : (data.getMarriageStatus() == 2 ? "再婚" : "其他"));
  481 + map.put("marriageCheck",data.getMarriageCheck() == null ? "" : data.getMarriageCheck() == 1 ? "是" : "否");
  482 + String contraceptionType = "";
  483 + if (data.getContraceptionType() != null)
  484 + {
  485 + StringBuilder sb = new StringBuilder();
  486 + sb.append(data.getContraceptionType().get(0).get("wby") == true ? "未避孕 " : "");
  487 + sb.append(data.getContraceptionType().get(0).get("kfbyy") == true ? "口服避孕药 " : "");
  488 + sb.append(data.getContraceptionType().get(0).get("byt") == true ? "避孕套 " : "");
  489 + sb.append(data.getContraceptionType().get(0).get("bym") == true ? "避孕膜 " : "");
  490 + sb.append(data.getContraceptionType().get(0).get("qt") == true ? data.getContraceptionOther()+" " : "");
  491 + }
  492 + map.put("contraceptionType",contraceptionType);
  493 + map.put("hmarriageStatus",data.getHmarriageStatus() == null ? "" : data.getHmarriageStatus() == 1 ? "初婚" : (data.getHmarriageStatus() == 2 ? "再婚" : "其他"));
  494 + map.put("healthStatus",data.getHealthStatus());
  495 + map.put("smoke",data.getSmoke() == null ? "" : data.getSmoke() == 1 ? "否" : "是");
  496 + map.put("smokeNum",(data.getSmoke() == null && data.getSmoke() == 2) ? data.getSmokeNum() : "");
  497 + map.put("drinkWine",data.getDrinkWine() == null ? "" : data.getDrinkWine() == 1 ? "偶尔" : (data.getDrinkWine() == 2 ? "经常" : "否"));
  498 + map.put("hLevelType",getBasicConfig(data.getHlevelTypeId()));
  499 + map.put("pastHistory",data.getPastHistory() == null ? "" : data.getPastHistory());
  500 + map.put("familyHistory",data.getFamilyHistory() == null ? "" : data.getFamilyHistory());
  501 + map.put("other",data.getOther() == null ? "" :data.getOther());
  502 +
477 503 return map;
478 504 }
479 505  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 070d5f4
... ... @@ -395,7 +395,7 @@
395 395 private Integer marriageCheck;
396 396  
397 397 //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
398   - private Integer contraceptionType;
  398 + private List<Map<String,Boolean>> contraceptionType;
399 399 private String contraceptionOther;
400 400  
401 401 //丈夫婚姻状态 1初婚 2 再婚 3其他
402 402  
... ... @@ -458,11 +458,11 @@
458 458 this.marriageCheck = marriageCheck;
459 459 }
460 460  
461   - public Integer getContraceptionType() {
  461 + public List<Map<String,Boolean>> getContraceptionType() {
462 462 return contraceptionType;
463 463 }
464 464  
465   - public void setContraceptionType(Integer contraceptionType) {
  465 + public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
466 466 this.contraceptionType = contraceptionType;
467 467 }
468 468  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 070d5f4
... ... @@ -357,7 +357,7 @@
357 357 private Integer marriageCheck;
358 358  
359 359 //避孕方式 1 未避孕 2口服避孕药 3避孕套 4避孕膜 5其他
360   - private Integer contraceptionType;
  360 + private List<Map<String,Boolean>> contraceptionType;
361 361 private String contraceptionOther;
362 362  
363 363 //丈夫婚姻状态 1初婚 2 再婚 3其他
364 364  
... ... @@ -419,11 +419,11 @@
419 419 this.marriageCheck = marriageCheck;
420 420 }
421 421  
422   - public Integer getContraceptionType() {
  422 + public List<Map<String,Boolean>> getContraceptionType() {
423 423 return contraceptionType;
424 424 }
425 425  
426   - public void setContraceptionType(Integer contraceptionType) {
  426 + public void setContraceptionType(List<Map<String,Boolean>> contraceptionType) {
427 427 this.contraceptionType = contraceptionType;
428 428 }
429 429