jiangjiazhi / regional-platform

Commit dab140f7f2d1c8136a11729ab064cd999b1bc76f

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 49 additions and 13 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewQueryRequest.java

...	...	@@ -445,12 +445,26 @@
445	445	* 自动分娩产妇的
446	446	*/
447	447	public void autoMatDeliver() {
	448	+ setAutoMatDeliver(null);
448	449
	450	+ }
	451	+
	452	+
	453	+ public void setAutoMatDeliver(String cardNo)
	454	+ {
449	455	Date endDate = DateUtil.addDay(new Date(), -294);
450	456	PatientsQuery patientsQuery = new PatientsQuery();
451	457	patientsQuery.setYn(YnEnums.YES.getId());
452	458	patientsQuery.setType(1);
453		- patientsQuery.setLastMensesNeEnd(endDate);
	459	+ if (StringUtils.isNotEmpty(cardNo))
	460	+ {
	461	+ patientsQuery.setCardNo(cardNo);
	462	+ }
	463	+ else
	464	+ {
	465	+ patientsQuery.setLastMensesNeEnd(endDate);
	466	+ }
	467	+
454	468	List<Patients> patientses = queryPatient(patientsQuery);
455	469	List<PersonModel> list = null;
456	470	for (Patients patients : patientses) {

...	...	@@ -352,7 +352,14 @@
352	352
353	353	//未分娩建档
354	354	if (null != patients) {
355		- return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查");
	355	+ if (postReviewQueryRequest.getFlag() != null)
	356	+ {
	357	+ patientsService.setAutoMatDeliver(patients.getCardNo());
	358	+ }
	359	+ else
	360	+ {
	361	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("该孕妇还未分娩，不能进行复查");
	362	+ }
356	363	}
357	364
358	365	//取所有医院的建档数据优先取本院，然后取外院
359	366
...	...	@@ -363,15 +370,18 @@
363	370	return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇已终止妊娠，不能进行复查");
364	371	}
365	372
366		-// MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
367		-// matDeliverQuery.setPid(patientsList.getPid());
368		-// matDeliverQuery.setYn(YnEnums.YES.getId());
369		-// List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
370		-// if (CollectionUtils.isEmpty(list)) {
371		-// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
372		-// }
	373	+ List<MaternalDeliverModel> list = null;
	374	+ if (postReviewQueryRequest.getFlag() == null)
	375	+ {
	376	+ MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	377	+ matDeliverQuery.setPid(patientsList.getPid());
	378	+ matDeliverQuery.setYn(YnEnums.YES.getId());
	379	+ list = matDeliverService.query(matDeliverQuery);
	380	+ if (CollectionUtils.isEmpty(list)) {
	381	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇没有录入分娩信息，不能进行复查");
	382	+ }
	383	+ }
373	384
374		-
375	385	PostReviewQuery postReviewQuery = new PostReviewQuery();
376	386	postReviewQuery.setPid(patientsList.getPid());
377	387	postReviewQuery.setYn(YnEnums.YES.getId());
...	...	@@ -383,9 +393,9 @@
383	393	if (patientsList.getType() == 3){
384	394	dueDate = DateUtil.getyyyy_MM_dd(patientsList.getFmDate());
385	395	}
386		-// else {
387		-// dueDate = list.get(0).getDueDate();
388		-// }
	396	+ else if (postReviewQueryRequest.getFlag() == null && CollectionUtils.isNotEmpty(list)) {
	397	+ dueDate = list.get(0).getDueDate();
	398	+ }
389	399	HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getPid(), false);
390	400
391	401	List<AntData> dataList = new ArrayList<>();

...	...	@@ -24,6 +24,18 @@
24	24
25	25	private String patientId;
26	26
	27	+
	28	+ //空的时候表示不只直接填写产后复查，不为空直接填写产后复查
	29	+ private Integer flag;
	30	+
	31	+ public Integer getFlag() {
	32	+ return flag;
	33	+ }
	34	+
	35	+ public void setFlag(Integer flag) {
	36	+ this.flag = flag;
	37	+ }
	38	+
27	39	public String getPatientId() {
28	40	return patientId;
29	41	}