jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 12 additions and 9 deletions

...	...	@@ -164,7 +164,7 @@
164	164	List<SieveModel> list = sieveDao.queryList(sieveQuery.convertToQuery());
165	165	if (CollectionUtils.isEmpty(list)) {
166	166	SieveModel sieveModel = convertToModel(patients);
167		- sieveModel.setForm("1");
	167	+ sieveModel.setFrom("1");
168	168	sieveDao.addChanQianSieve(sieveModel);
169	169	}
170	170	}
...	...	@@ -225,7 +225,7 @@
225	225	List<SieveModel> list = sieveDao.queryList(sieveQuery.convertToQuery());
226	226	if (CollectionUtils.isEmpty(list)) {
227	227	SieveModel sieveModel = convertToModel(patient);
228		- sieveModel.setForm("0");
	228	+ sieveModel.setFrom("0");
229	229	sieveDao.addChanQianSieve(sieveModel);
230	230	}
231	231	}

...	...	@@ -46,18 +46,18 @@
46	46	//录入人员
47	47	private String publishName;
48	48	//数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来
49		- private String form;
	49	+ private String from;
50	50
51	51	private Date created;
52	52	private Date modified;
53	53	private Integer yn;
54	54
55		- public String getForm() {
56		- return form;
	55	+ public String getFrom() {
	56	+ return from;
57	57	}
58	58
59		- public void setForm(String form) {
60		- this.form = form;
	59	+ public void setFrom(String from) {
	60	+ this.from = from;
61	61	}
62	62
63	63	public String getHospitalId() {

...	...	@@ -39,7 +39,7 @@
39	39	//状态
40	40	private Integer status;
41	41	private String cardNo;
42		-
	42	+ private String from;
43	43	private Integer yn;
44	44
45	45	//孕周开始
...	...	@@ -103,6 +103,9 @@
103	103	MongoCondition condition = MongoCondition.newInstance();
104	104	if (null != id) {
105	105	condition = condition.and("id", id, MongoOper.IS);
	106	+ }
	107	+ if(null!=from){
	108	+ condition=condition.and("from",from,MongoOper.IS);
106	109	}
107	110	if (null != hospitalId) {
108	111	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);

...	...	@@ -133,7 +133,7 @@
133	133	Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
134	134	if (null != patients) {
135	135	SieveModel sieveModel = patientsService.convertToModel(patients);
136		- sieveModel.setForm("2");
	136	+ sieveModel.setFrom("2");
137	137	sieveModel.setHospitalId(orderModel.getHospitalId());
138	138	sieveService.addChanQianSieve(sieveModel);
139	139	}