jiangjiazhi / regional-platform

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 35 additions and 0 deletions

...	...	@@ -233,6 +233,8 @@
233	233	private String triageOrderNo;
234	234
235	235	private Date nextCheckTime;
	236	+ //前端计算出来的孕周
	237	+ private String cDueWeek;
236	238
237	239	private Integer patientLevel;
238	240	//最后一次产检医生职工ID
...	...	@@ -805,6 +807,14 @@
805	807
806	808	public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) {
807	809	this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate;
	810	+ }
	811	+
	812	+ public String getcDueWeek() {
	813	+ return cDueWeek;
	814	+ }
	815	+
	816	+ public void setcDueWeek(String cDueWeek) {
	817	+ this.cDueWeek = cDueWeek;
808	818	}
809	819
810	820	public String getFace() {

...	...	@@ -324,6 +324,8 @@
324	324	Patients patient = getPatientsData(yunRequest);
325	325	patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
326	326
	327	+ patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
	328	+ patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
327	329
328	330	//承德市妇幼通过就诊卡号查询到病人id保存下来
329	331	if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
...	...	@@ -1162,6 +1164,9 @@
1162	1164
1163	1165	Patients patient = getPatientsData(yunRequest);
1164	1166	patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
	1167	+ patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
	1168	+ patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
	1169	+
1165	1170	patient.setModified(new Date());
1166	1171	patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
1167	1172	// patient.setHospitalId(autoMatchFacade.getHospitalId(userId));

...	...	@@ -13,6 +13,10 @@
13	13	*/
14	14	@Form
15	15	public class YunBookbuildingAddRequest {
	16	+ //下次产检时间
	17	+ private String nextCheckTime;
	18	+ //前端计算出来的孕周
	19	+ private String cDueWeek;
16	20
17	21	/20201130 null历史\|\|1 不是特殊产筛建档, 2 衡水特殊产筛建档 /
18	22	private String screening;
...	...	@@ -643,6 +647,22 @@
643	647
644	648	public void setLowerHairOgrId(String lowerHairOgrId) {
645	649	this.lowerHairOgrId = lowerHairOgrId;
	650	+ }
	651	+
	652	+ public String getNextCheckTime() {
	653	+ return nextCheckTime;
	654	+ }
	655	+
	656	+ public void setNextCheckTime(String nextCheckTime) {
	657	+ this.nextCheckTime = nextCheckTime;
	658	+ }
	659	+
	660	+ public String getcDueWeek() {
	661	+ return cDueWeek;
	662	+ }
	663	+
	664	+ public void setcDueWeek(String cDueWeek) {
	665	+ this.cDueWeek = cDueWeek;
646	666	}
647	667
648	668	public String getTownOrgId() {