jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2c3ed59001e7df7031633e6fecce3b931e0dfd8a

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

产前诊断

Showing 2 changed files with 5 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java View file @ 2c3ed59
... ... @@ -378,7 +378,7 @@
378 378 map.put("modified",DateUtil.getyyyy_MM_dd(modified));
379 379 map.put("status",status);
380 380 map.put("diaStatus",diaStatus);
381   - map.put("nowWeek",nowWeek);
  381 + map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date()));
382 382 map.put("rsResult",rsResult);
383 383 map.put("diaResult",diaResult);
384 384 map.put("applyWeek",applyWeek);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java View file @ 2c3ed59
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.utils.DateUtil;
5 5 import com.lyms.platform.pojo.DiagnosisModel;
  6 +import org.apache.commons.lang.StringUtils;
6 7  
7 8 import java.util.Date;
8 9  
... ... @@ -405,7 +406,9 @@
405 406 diagnosisModel.setCardNo(cardNo);
406 407 diagnosisModel.setAge(age);
407 408 diagnosisModel.setDueWeek(dueWeek);
408   - diagnosisModel.setDueDays(100);
  409 + diagnosisModel.setApplyWeek(dueWeek);
  410 + int days = DateUtil.daysBetween(DateUtil.parseYMD(lastMenses), new Date());
  411 + diagnosisModel.setDueDays(days);
409 412 diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi));
410 413 diagnosisModel.setPhone(phone);
411 414 diagnosisModel.setDiaProject(diaProject);