jiangjiazhi / regional-platform

Commit 9643daae5e06e538bd24c819d7398277abf56abb

Authored by jiangjiazhi over 8 years ago

Exists in master and in 7 other branches

分娩作废产检劵

Showing 5 changed files with 67 additions and 1 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/PatientCheckTicketDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCheckTicketDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCheckTicketService.java
platform-dal/src/main/java/com/lyms/platform/query/PatientCheckTicketQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -20,5 +20,7 @@
20	20
21	21	public List<PatientCheckTicket> queryTicket(MongoQuery query);
22	22
	23	+ void findAndModify(MongoQuery query,PatientCheckTicket ticket);
	24	+
23	25	}

...	...	@@ -39,5 +39,9 @@
39	39	public List<PatientCheckTicket> queryTicket(MongoQuery query) {
40	40	return find(query.convertToMongoQuery());
41	41	}
	42	+
	43	+ public void findAndModify(MongoQuery query,PatientCheckTicket ticket){
	44	+ updateMulti(query.convertToMongoQuery(), ticket);
	45	+ }
42	46	}

...	...	@@ -29,6 +29,10 @@
29	29	patientCheckTicketDao.updateTicket(obj);;
30	30	}
31	31
	32	+
	33	+
	34	+
	35	+
32	36	public String updateTicket(String id, Integer status, String cousumeHospitalId) {
33	37	PatientCheckTicket ticket = getTicket(id);
34	38	if (ticket == null) {
...	...	@@ -43,6 +47,10 @@
43	47	ticket.setConsumeDate(new Date());
44	48	updateTicket(ticket);
45	49	return null;
	50	+ }
	51	+
	52	+ public void findAndModify(PatientCheckTicketQuery query,PatientCheckTicket ticket){
	53	+ patientCheckTicketDao.findAndModify(query.convertToQuery(),ticket);
46	54	}
47	55
48	56	public PatientCheckTicket getTicket(String id) {

...	...	@@ -8,6 +8,8 @@
8	8	import com.lyms.platform.common.utils.StringUtils;
9	9	import org.springframework.data.mongodb.core.query.Criteria;
10	10
	11	+import java.util.Date;
	12	+
11	13	/**
12	14	* Created by riecard on 2016/12/28.
13	15	*/
14	16
...	...	@@ -28,7 +30,25 @@
28	30	private String hospitalId;
29	31	private String consumeHospitalId;
30	32	private Integer status; // 1：创建未使用， 2：产检使用，3：分娩销毁
	33	+ private Date createdStart;
	34	+ private Date createdEnd;
31	35
	36	+ public Date getCreatedStart() {
	37	+ return createdStart;
	38	+ }
	39	+
	40	+ public void setCreatedStart(Date createdStart) {
	41	+ this.createdStart = createdStart;
	42	+ }
	43	+
	44	+ public Date getCreatedEnd() {
	45	+ return createdEnd;
	46	+ }
	47	+
	48	+ public void setCreatedEnd(Date createdEnd) {
	49	+ this.createdEnd = createdEnd;
	50	+ }
	51	+
32	52	@Override
33	53	public MongoQuery convertToQuery() {
34	54	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -49,6 +69,25 @@
49	69	}
50	70	if (!StringUtils.isEmpty(consumeHospitalId)) {
51	71	condition = condition.and("consumeHospitalId", consumeHospitalId, MongoOper.IS);
	72	+ }
	73	+ Criteria c1=null;
	74	+ if (null != createdStart) {
	75	+ if (null != c1) {
	76	+ c1 = c1.and("created").gte(createdStart);
	77	+ } else {
	78	+ c1 = Criteria.where("created").gte(createdStart);
	79	+ }
	80	+ }
	81	+
	82	+ if (null != createdEnd) {
	83	+ if (null != c1) {
	84	+ c1 = c1.lte(createdEnd);
	85	+ } else {
	86	+ c1 = Criteria.where("created").lte(createdEnd);
	87	+ }
	88	+ }
	89	+ if (null != c1) {
	90	+ condition = condition.andCondition(new MongoCondition(c1));
52	91	}
53	92	return condition.toMongoQuery();
54	93	}

...	...	@@ -254,6 +254,19 @@
254	254
255	255	maternalDeliverModel.setYn(YnEnums.YES.getId());
256	256	matDeliverService.addMatDeliver(maternalDeliverModel);
	257	+
	258	+
	259	+ //作废产检劵
	260	+ PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery();
	261	+ Patients pa=patientsService.findOnePatientById(deliverAddRequest.getParentId());
	262	+ patientCheckTicketQuery.setStatus(1);
	263	+ patientCheckTicketQuery.setCreatedStart(pa.getLastMenses());
	264	+ patientCheckTicketQuery.setCreatedEnd(pa.getFmDate());
	265	+
	266	+ PatientCheckTicket patientCheckTicket=new PatientCheckTicket();
	267	+ patientCheckTicket.setStatus(3);
	268	+ patientCheckTicket.setConsumeHospitalId(hospitalId);
	269	+ patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket);
257	270	//修改
258	271	} else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
259	272
...	...	@@ -348,7 +361,7 @@
348	361	patients1.setType(3);
349	362	//自动分娩的时候修改buildtype为0 http://jira.healthbaby.com.cn/browse/WEB-808
350	363	if (null != patients.getBuildType() && patients.getBuildType() == 2) {
351		- patients.setBuildType(0);
	364	+ patients1.setBuildType(0);
352	365	}
353	366	patients1.setIsAutoFm(YnEnums.NO.getId());
354	367	patients1.setFmHospital(deliverAddRequest.getFmHospital());