jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a69c783fd13b4e01f50e60bd19ee2363f489168c

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

修改新电子病历

Showing 1 changed file with 7 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java View file @ a69c783
... ... @@ -316,7 +316,7 @@
316 316 setScore(destModel.getScore());
317 317 if(null!=destModel.getDueDate()){
318 318 int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
319   - if(-1==days){
  319 + if(-1==destModel.getDueWeek()){
320 320 setDueWeek("已分娩");
321 321 }else{
322 322 setDueWeek(StringUtils.dueWeek(days));
... ... @@ -324,8 +324,12 @@
324 324  
325 325 }
326 326 setPid(destModel.getPid());
327   - if(null!=destModel.getDueWeek()){
328   - setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
  327 + if(null!=destModel.getDueWeek()) {
  328 + if (-1 == destModel.getDueWeek()){
  329 + setcDueWeek("已分娩");
  330 + }else{
  331 + setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(destModel.getDueWeek()));
  332 + }
329 333 }
330 334 if(null!=destModel.getReceived()){
331 335 setReceived(DateUtil.getyyyy_MM_dd(destModel.getReceived()));