jiangjiazhi / regional-platform

Download as
Browse Code »

Commit df160e998e86d05117bd2ae15ebcae84a5a16aa7

Authored by jiangjiazhi
1 parent bed7500289
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加设置parentid

Showing 4 changed files with 44 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java View file @ df160e9
... ... @@ -26,6 +26,8 @@
26 26 private String phone;
27 27 //生日
28 28 private Date birth;
  29 + //申请孕周、申请月龄
  30 + private String dueWeek;
29 31  
30 32 //身份证号
31 33 private String cardNo;
... ... @@ -64,6 +66,14 @@
64 66 private Integer status;
65 67 //转诊类型 1 儿童 2 孕妇
66 68 private Integer type;
  69 +
  70 + public String getDueWeek() {
  71 + return dueWeek;
  72 + }
  73 +
  74 + public void setDueWeek(String dueWeek) {
  75 + this.dueWeek = dueWeek;
  76 + }
67 77  
68 78 public Integer getSex() {
69 79 return sex;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ df160e9
... ... @@ -95,6 +95,8 @@
95 95 referralApplyOrderModel.setName(patients.getUsername());
96 96 referralApplyOrderModel.setPhone(patients.getPhone());
97 97 referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
  98 + int days= DateUtil.daysBetween(new Date(),patients.getDueDate());;
  99 + referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
98 100 }
99 101 } else {
100 102 BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
... ... @@ -102,6 +104,7 @@
102 104 if (null != babyModel.getBirth()) {
103 105 referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth()));
104 106 }
  107 + referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())));
105 108 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
106 109 referralApplyOrderModel.setParentId(babyModel.getId());
107 110 referralApplyOrderModel.setMname(patients.getUsername());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ df160e9
... ... @@ -23,14 +23,17 @@
23 23 private Integer age;
24 24 //转入医院
25 25 private String transferredHospital;
26   - //孕周
  26 + //申请孕周
27 27 private String dueWeek;
  28 + //当前孕周
  29 + private String cDueWeek;
28 30 //预产期
29 31 private String dueDate;
30 32 //高危等级
31 33 private String rLevel;
32 34 //风险因素
33 35 private String rRisk;
  36 +
34 37 private Integer score=0;
35 38 //病情描述
36 39 private String diseaseDesc;
... ... @@ -56,6 +59,17 @@
56 59 //转入医院
57 60 private String zhuanRname;
58 61  
  62 + public String getcDueWeek() {
  63 + if(null==cDueWeek){
  64 + return SPIT;
  65 + }
  66 + return cDueWeek;
  67 + }
  68 +
  69 + public void setcDueWeek(String cDueWeek) {
  70 + this.cDueWeek = cDueWeek;
  71 + }
  72 +
59 73 public String getZhuanCName() {
60 74 return zhuanCName;
61 75 }
62 76  
... ... @@ -279,8 +293,9 @@
279 293 setrLevel(destModel.getrLevel());
280 294 if(null!=destModel.getDueDate()){
281 295 int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
282   - this.dueWeek= StringUtils.dueWeek(days);
  296 + this.cDueWeek= StringUtils.dueWeek(days);
283 297 }
  298 + setDueWeek(destModel.getDueWeek());
284 299 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
285 300 setApplyDoctor(destModel.getApplyDoctor());
286 301 setCreated(DateUtil.getyyyy_MM_dd(destModel.getCreated()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java View file @ df160e9
... ... @@ -22,8 +22,11 @@
22 22 private String hRisk;
23 23 //性别
24 24 private String sex;
25   - //月龄
  25 + //申请月龄
26 26 private String yl;
  27 +
  28 + //当前月龄
  29 + private String cyl;
27 30 //生日
28 31 private String birth;
29 32 //母亲姓名
... ... @@ -51,6 +54,14 @@
51 54 private String zhuanRname;
52 55 private String status;
53 56  
  57 + public String getCyl() {
  58 + return cyl;
  59 + }
  60 +
  61 + public void setCyl(String cyl) {
  62 + this.cyl = cyl;
  63 + }
  64 +
54 65 public String getStatus() {
55 66 return status;
56 67 }
57 68  
... ... @@ -98,9 +109,9 @@
98 109 }
99 110 if(null!=referralApplyOrderModel.getBirth()){
100 111 setBirth(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getBirth()));
101   -
102   - setYl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date())));
  112 + setCyl(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(referralApplyOrderModel.getBirth(), new Date())));
103 113 }
  114 + setYl(referralApplyOrderModel.getDueWeek());
104 115 if (null != referralApplyOrderModel.getCreated()) {
105 116 setCreated(DateUtil.getyyyy_MM_dd(referralApplyOrderModel.getCreated()));
106 117 }