jiangjiazhi / regional-platform

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 0 deletions

...	...	@@ -883,6 +883,7 @@
883	883	base.setCardNo(model.getMcertNo());
884	884	base.setPregnantCertificateTypeId(model.getMcertTypeId());
885	885	base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	886	+ base.setMonth(DateUtil.getMonth(model.getBirth(), new Date()));
886	887	//计算儿童的预产期
887	888	if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期
888	889	String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth());

...	...	@@ -25,6 +25,9 @@
25	25	private String name;
26	26	//儿童月龄
27	27	private String monthAge;
	28	+ //不转换的月龄
	29	+ private Integer month;
	30	+
28	31	//检查日期
29	32	private String checkDate;
30	33	//诊断
...	...	@@ -76,6 +79,14 @@
76	79	* 增值服务name list
77	80	*/
78	81	private List<String> serviceList;
	82	+
	83	+ public Integer getMonth() {
	84	+ return month;
	85	+ }
	86	+
	87	+ public void setMonth(Integer month) {
	88	+ this.month = month;
	89	+ }
79	90
80	91	public String getEndCase() {
81	92	return endCase;