jiangjiazhi / regional-platform

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 31 additions and 3 deletions

...	...	@@ -41,8 +41,8 @@
41	41	private Boolean isHighRisk;
42	42	//分娩状态 0未终止妊娠 1终止妊娠
43	43	private Integer dueStatus;
44		-
45		-
	44	+ //是否发放母子保健手册
	45	+ private String sendCareMan;
46	46	/**
47	47	* 产妇名称
48	48	*/
...	...	@@ -76,6 +76,14 @@
76	76
77	77	public void setGtePostTimes(boolean gtePostTimes) {
78	78	this.gtePostTimes = gtePostTimes;
	79	+ }
	80	+
	81	+ public String getSendCareMan() {
	82	+ return sendCareMan;
	83	+ }
	84	+
	85	+ public void setSendCareMan(String sendCareMan) {
	86	+ this.sendCareMan = sendCareMan;
79	87	}
80	88
81	89	/**

...	...	@@ -2486,6 +2486,7 @@
2486	2486	antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk());
2487	2487	}
2488	2488	} catch (Exception e) {
	2489	+
2489	2490	}
2490	2491	try {
2491	2492	if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {

...	...	@@ -295,7 +295,7 @@
295	295	patient.setModified(new Date());
296	296	patient.setOperator(userId);
297	297
298		- //新增孕妇档案
	298	+ //孕妇档案
299	299	Patients p = yunBookbuildingService.addPregnantBookbuilding(patient);
300	300
301	301	//添加追访信息

...	...	@@ -1021,6 +1021,7 @@
1021	1021	PatientManagerResult patientManagerResult = new PatientManagerResult();
1022	1022
1023	1023	PatientsQuery patientsQuery = new PatientsQuery();
	1024	+ patientsQuery.setSendCareMan(patientManagerRequest.getSendCareMan());
1024	1025	if (patientManagerRequest.getBuildWeekStart() != null) {
1025	1026	patientsQuery.setBuildDaysStart(patientManagerRequest.getBuildWeekStart() * 7);
1026	1027	}
...	...	@@ -1123,6 +1124,13 @@
1123	1124	patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
1124	1125	patientManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
1125	1126	patientManagerQueryModel.setId(patients.getId());
	1127	+ if(patients.getSendCareMan()!=null){
	1128	+ if("0".equals(patients.getSendCareMan())){
	1129	+ patientManagerQueryModel.setSendCareMan("否");
	1130	+ }else if("1".equals(patients.getSendCareMan())){
	1131	+ patientManagerQueryModel.setSendCareMan("是");
	1132	+ }
	1133	+ }
1126	1134	patientManagerQueryModelList.add(patientManagerQueryModel);
1127	1135	}
1128	1136	}

...	...	@@ -16,6 +16,9 @@
16	16	*/
17	17	private String provinceRegisterId;
18	18
	19	+ //是否发放母子保健手册
	20	+ private String sendCareMan;
	21	+
19	22	/**
20	23	* @auther HuJiaqi
21	24	* @createTime 2016年12月20日 14时59分
...	...	@@ -36,6 +39,14 @@
36	39	private String cityId;
37	40	private String areaId;
38	41	private String streetId;
	42	+
	43	+ public String getSendCareMan() {
	44	+ return sendCareMan;
	45	+ }
	46	+
	47	+ public void setSendCareMan(String sendCareMan) {
	48	+ this.sendCareMan = sendCareMan;
	49	+ }
39	50
40	51	public String getStreetId() {
41	52	return streetId;