shiyang / regional-platform

Authored by hanshaofeng over 9 years ago

Showing 5 changed files

...	...	@@ -261,15 +261,6 @@
261	261	continue;
262	262	}
263	263
264		- HighRiskSmsModel highRiskSmsModel = new HighRiskSmsModel();
265		- highRiskSmsModel.setPatientId(pat.getId());
266		- highRiskSmsModel.setHighId(String.valueOf(riskMap.get("id")));
267		- highRiskSmsModel.setPhone(pat.getPhone());
268		- highRiskSmsModel.setHospitalId(pat.getHospitalId());
269		- highRiskSmsModel.setCreated(new Date());
270		- highRiskSmsModel.setModified(new Date());
271		- highRiskService.addHighRiskSmsModel(highRiskSmsModel);
272		-
273	264	String name = String.valueOf(riskMap.get("name"));
274	265	List<MessageContent> messageContents = amsSmses.get(name);
275	266	if (CollectionUtils.isNotEmpty(messageContents))
...	...	@@ -283,6 +274,16 @@
283	274
284	275	messages.add(request);
285	276	isRisk = true;
	277	+
	278	+ HighRiskSmsModel highRiskSmsModel = new HighRiskSmsModel();
	279	+ highRiskSmsModel.setPatientId(pat.getId());
	280	+ highRiskSmsModel.setHighId(String.valueOf(riskMap.get("id")));
	281	+ highRiskSmsModel.setPhone(pat.getPhone());
	282	+ highRiskSmsModel.setHospitalId(pat.getHospitalId());
	283	+ highRiskSmsModel.setCreated(new Date());
	284	+ highRiskSmsModel.setModified(new Date());
	285	+ highRiskService.addHighRiskSmsModel(highRiskSmsModel);
	286	+
286	287	break;
287	288	}
288	289

...	...	@@ -387,10 +387,11 @@
387	387	patientsQuery.setPid(pid);
388	388	patientsQuery.setType(3);
389	389	patientsQuery.setYn(YnEnums.YES.getId());
	390	+ patientsQuery.setBuildType(1);
390	391	List<Patients> patientses = patientsService.queryPatient(patientsQuery);
391	392	if (CollectionUtils.isNotEmpty(patientses)) {
392	393	for (Patients patients : patientses) {
393		- listDate.add(new SortIn(patients, 1));
	394	+ listDate.add(new SortIn(patients, "1"));
394	395	}
395	396	}
396	397	//排序集合
...	...	@@ -404,7 +405,7 @@
404	405
405	406	Date min = null;
406	407	if (CollectionUtils.isNotEmpty(patientses1)) {
407		- min = patientses1.get(0).getBookbuildingDate();
	408	+ min = patientses1.get(0).getLastMenses();
408	409	}
409	410
410	411	Date max = null;
...	...	@@ -994,6 +995,12 @@
994	995	public SortIn(Patients patients, int i) {
995	996	this.id = patients.getId();
996	997	this.date = patients.getFmDate();
	998	+ this.type = 2;
	999	+ }
	1000	+
	1001	+ public SortIn(Patients patients, String i) {
	1002	+ this.id = patients.getId();
	1003	+ this.date = patients.getLastMenses();
997	1004	this.type = 2;
998	1005	}
999	1006

...	...	@@ -469,9 +469,13 @@
469	469	personModel.setName(babyModel.getName());
470	470	personModel.setCreated(new Date());
471	471	babyModel.setPid(personService.addPerson(personModel).getId());
	472	+
	473	+ //儿童建档
	474	+ babyBookbuildingFacade.createBuildSms(babyModel);
	475	+
472	476	}
473	477	babyIds.add(babyService.addOneBaby(babyModel).getId());
474		- babyBookbuildingFacade.createBuildSms(babyModel);
	478	+
475	479	i++;
476	480	}
477	481	maternalDeliverModel.setBaby(babyList);

...	...	@@ -206,7 +206,7 @@
206	206	patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
207	207	patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore());
208	208	patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore());
209		- patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor());
	209	+ patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr());
210	210	Date currentDate = DateUtil.formatDate(new Date());
211	211	if (null != riskPatientsQueryRequest.getServiceType()) {
212	212	patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));

...	...	@@ -48,7 +48,7 @@
48	48	private Integer strtHScore;
49	49	//风险因素
50	50	@FormParam
51		- private String rFactor;
	51	+ private String rFacotr;
52	52	//联系方式
53	53	@FormParam
54	54	private String phone;
55	55
...	...	@@ -222,12 +222,12 @@
222	222	this.phone = phone;
223	223	}
224	224
225		- public String getrFactor() {
226		- return rFactor;
	225	+ public String getrFacotr() {
	226	+ return rFacotr;
227	227	}
228	228
229		- public void setrFactor(String rFactor) {
230		- this.rFactor = rFactor;
	229	+ public void setrFacotr(String rFacotr) {
	230	+ this.rFacotr = rFacotr;
231	231	}
232	232
233	233	public String getrLevel() {