jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 6 additions and 5 deletions

...	...	@@ -155,11 +155,7 @@
155	155	//备注
156	156	private String mremark;
157	157
158		- //分娩状态 0未终止妊娠 1终止妊娠
159		- private Integer dueStatus;
160	158
161		- //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档
162		- private Integer buildType;
163	159
164	160	/**
165	161	* 产后休养地
...	...	@@ -269,6 +265,11 @@
269	265	private String pid;
270	266	//是否隐藏更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
271	267	private String enable;
	268	+ //分娩状态 0未终止妊娠 1终止妊娠
	269	+ private Integer dueStatus;
	270	+
	271	+ //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档
	272	+ private Integer buildType;
272	273	//最后一次高危时间
273	274	private Date lastRhTime;
274	275	//本院最后一次产检时间

...	...	@@ -250,7 +250,7 @@
250	250	patients1.setHospitalId(hospital);
251	251	patients1.setBuildType(0);
252	252	patients1.setBookbuildingDoctor(postReviewRequest.getProdDoctor());
253		- patients1.setBookbuildingDate(DateUtil.parseYMD(postReviewRequest.getCheckTime()));
	253	+ patients1.setBookbuildingDate(patients1.getBookbuildingDate());
254	254	patients1.setVcCardNo(null);
255	255	patients1.setMremark(null);
256	256	patients1.setFileCode(null);