shiyang / regional-platform

Download as
Browse Code »

Commit 42c63c97574a0a952f51658984c2bd12f336f778

Authored by jiangjiazhi
1 parent e5736a43a3
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 3 changed files with 25 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java View file @ 42c63c9
... ... @@ -49,11 +49,20 @@
49 49 private String publishName;
50 50 //数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来
51 51 private String from;
  52 + //申请产筛时间
  53 + private Date applyDate;
52 54  
53 55 private Date created;
54 56 private Date modified;
55 57 private Integer yn;
56 58  
  59 + public Date getApplyDate() {
  60 + return applyDate;
  61 + }
  62 +
  63 + public void setApplyDate(Date applyDate) {
  64 + this.applyDate = applyDate;
  65 + }
57 66  
58 67 public String getCardNo() {
59 68 return cardNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 42c63c9
... ... @@ -265,6 +265,9 @@
265 265 if (CollectionUtils.isNotEmpty(sieveModels)) {
266 266 SieveModel sieveModel = sieveModels.get(0);
267 267 sieveModel.setStatus(2);
  268 + if(StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())){
  269 + sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate()));
  270 + }
268 271 int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
269 272 sieveModel.setDueWeek(days);
270 273 sieveService.updateOneChanQianDiaSieve(sieveModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 42c63c9
... ... @@ -31,7 +31,17 @@
31 31 private String ztfx;
32 32 //整体风险
33 33 private String ztfxText=SPIT;
  34 + //申请时间
  35 + private String applyTime;
34 36  
  37 + public String getApplyTime() {
  38 + return applyTime;
  39 + }
  40 +
  41 + public void setApplyTime(String applyTime) {
  42 + this.applyTime = applyTime;
  43 + }
  44 +
35 45 public String getZtfxText() {
36 46 if(null==ztfxText){
37 47 return SPIT;
... ... @@ -172,6 +182,9 @@
172 182 setId(destModel.getId());
173 183 setParentId(destModel.getParentId());
174 184 setName(destModel.getName());
  185 + if(null!=destModel.getApplyDate()){
  186 + setApplyTime(DateUtil.getyyyy_MM_dd(destModel.getApplyDate()));
  187 + }
175 188 if(null!=destModel.getLastMenses()){
176 189 int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
177 190 this.cDueWeek= StringUtils.dueWeek(days);