jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 62620083e4bcc4b82ef0a7d689db642b3d2f3575

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

婚检

Showing 4 changed files with 31 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 6262008
... ... @@ -63,6 +63,8 @@
63 63 private String menarcheAge;
64 64 //月经周期
65 65 private String menstrualCycle;
  66 + //月经经期
  67 + private String menstrualDay;
66 68 //月经量
67 69 private String menstrualAmount;
68 70 //末次月经
... ... @@ -588,6 +590,14 @@
588 590 private String lhbcms;
589 591 //B超检查号
590 592 private String lhbcjch;
  593 +
  594 + public String getMenstrualDay() {
  595 + return menstrualDay;
  596 + }
  597 +
  598 + public void setMenstrualDay(String menstrualDay) {
  599 + this.menstrualDay = menstrualDay;
  600 + }
591 601  
592 602 public String getLhbcms() {
593 603 return lhbcms;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 6262008
... ... @@ -729,7 +729,7 @@
729 729 checkup.setCxNum(addRequest.getCxNum());
730 730 checkup.setJczt(addRequest.getJczt());
731 731 checkup.setFkjjState(addRequest.getFkjjState());
732   -
  732 + checkup.setMenstrualDay(addRequest.getMenstrualDay());
733 733 //血缘关系
734 734 checkup.setIsBloodshed(addRequest.getIsBloodshed());
735 735 //血缘详情
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java View file @ 6262008
... ... @@ -49,6 +49,8 @@
49 49 private String menarcheAge;
50 50 //月经周期
51 51 private String menstrualCycle;
  52 + //月经经期
  53 + private String menstrualDay;
52 54 //月经量
53 55 private String menstrualAmount;
54 56 //末次月经
... ... @@ -578,6 +580,15 @@
578 580 private String lhbcms;
579 581 //B超检查号
580 582 private String lhbcjch;
  583 +
  584 +
  585 + public String getMenstrualDay() {
  586 + return menstrualDay;
  587 + }
  588 +
  589 + public void setMenstrualDay(String menstrualDay) {
  590 + this.menstrualDay = menstrualDay;
  591 + }
581 592  
582 593 public String getLhbcms() {
583 594 return lhbcms;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 6262008
... ... @@ -889,17 +889,20 @@
889 889 PreEugenicsBaseModel preEugenicsBaseModel = yjList.get(0);
890 890 if(preEugenicsBaseModel.getWifeBaseInfo()!=null){
891 891 Map <String, Object> wifeBaseInfo = preEugenicsBaseModel.getWifeBaseInfo();
892   - if(wifeBaseInfo.containsKey("firstMensesAge")){
893   - map.put("menarcheAge", wifeBaseInfo.get("firstMensesAge"));
  892 + if(wifeBaseInfo.containsKey("menarcheAge")){
  893 + map.put("menarcheAge", wifeBaseInfo.get("menarcheAge"));
894 894 }
895 895 if(wifeBaseInfo.containsKey("lastMenses")){
896 896 map.put("lastMenses", wifeBaseInfo.get("lastMenses"));
897 897 }
898   - if(wifeBaseInfo.containsKey("yjl")){
899   - map.put("menstrualAmount", wifeBaseInfo.get("yjl"));
  898 + if(wifeBaseInfo.containsKey("menstrualAmount")){
  899 + map.put("menstrualAmount", wifeBaseInfo.get("menstrualAmount"));
900 900 }
901   - if(wifeBaseInfo.containsKey("tj")){
902   - map.put("menorrhalgia", wifeBaseInfo.get("tj"));
  901 + if(wifeBaseInfo.containsKey("menstrualCycle")){
  902 + map.put("menstrualCycle", wifeBaseInfo.get("menstrualCycle"));
  903 + }
  904 + if(wifeBaseInfo.containsKey("menorrhalgia")){
  905 + map.put("menorrhalgia", wifeBaseInfo.get("menorrhalgia"));
903 906 }
904 907 }
905 908