jiangjiazhi / regional-platform

Commit b538172d935af1b7d4750fb2f9f588d4fec12ee4

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

追访

Showing 8 changed files with 67 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java

...	...	@@ -153,8 +153,8 @@
153	153	private String cityPostRestId;
154	154	private String areaPostRestId;
155	155	private String streetPostRestId;
	156	+ private List<String> childExtAddrs;
156	157
157		-
158	158	/**
159	159	* 孕妇居住地
160	160	*/
...	...	@@ -283,6 +283,14 @@
283	283
284	284	//面部信息
285	285	private String face;
	286	+
	287	+ public List<String> getChildExtAddrs() {
	288	+ return childExtAddrs;
	289	+ }
	290	+
	291	+ public void setChildExtAddrs(List<String> childExtAddrs) {
	292	+ this.childExtAddrs = childExtAddrs;
	293	+ }
286	294
287	295	public String getShortCode() {
288	296	return shortCode;

...	...	@@ -1165,6 +1165,7 @@
1165	1165	*/
1166	1166	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1167	1167	Patients patient = new Patients();
	1168	+ patient.setChildExtAddrs(yunRequest.getChildExtAddrs());
1168	1169	patient.setSendCareMan(yunRequest.getSendCareMan());
1169	1170	patient.setReqHusband(yunRequest.getReqHusband());
1170	1171	patient.setFuckLastMens(DateUtil.parseYMD(yunRequest.getFuckLastMens()));
...	...	@@ -1359,6 +1360,7 @@
1359	1360
1360	1361	public PregnantInfoResult getResult(Patients p) {
1361	1362	PregnantInfoResult result = new PregnantInfoResult();
	1363	+ result.setChildExtAddrs(p.getChildExtAddrs());
1362	1364	result.setReqHusband(p.getReqHusband());
1363	1365	result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
1364	1366	result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));

...	...	@@ -193,7 +193,7 @@
193	193	map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
194	194	data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
195	195	map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(),
196		- data.getAreaPostRestId(), data.getStreetPostRestId(), data.getAddressPostRest(), basicConfigService));
	196	+ data.getAreaPostRestId(), data.getStreetPostRestId(), data.getChildExtAddrs(),data.getAddressPostRest(), basicConfigService));
197	197
198	198	/* 丈夫信息 */
199	199	map.put("husbandName", data.getHusbandName());

...	...	@@ -240,6 +240,7 @@
240	240	private String childbirthCityId;
241	241	private String childbirthAreaId;
242	242	private String childbirthStreetId;
	243	+ private List<String> childExtAddrs;
243	244
244	245	/*********孕妇联系方式*********/
245	246
...	...	@@ -348,6 +349,14 @@
348	349	@FormParam
349	350	@NotEmpty(message = "填写日期")
350	351	private String fillDate;
	352	+
	353	+ public List<String> getChildExtAddrs() {
	354	+ return childExtAddrs;
	355	+ }
	356	+
	357	+ public void setChildExtAddrs(List<String> childExtAddrs) {
	358	+ this.childExtAddrs = childExtAddrs;
	359	+ }
351	360
352	361	public String getHusbandBirth() {
353	362	return husbandBirth;

...	...	@@ -211,6 +211,7 @@
211	211	private String childbirthCityId;
212	212	private String childbirthAreaId;
213	213	private String childbirthStreetId;
	214	+ private List<String> childExtAddrs;
214	215
215	216	/*********孕妇联系方式*********/
216	217
...	...	@@ -287,6 +288,14 @@
287	288
288	289	//分娩状态 0未终止妊娠 1终止妊娠
289	290	private Integer dueStatus;
	291	+
	292	+ public List<String> getChildExtAddrs() {
	293	+ return childExtAddrs;
	294	+ }
	295	+
	296	+ public void setChildExtAddrs(List<String> childExtAddrs) {
	297	+ this.childExtAddrs = childExtAddrs;
	298	+ }
290	299
291	300	public String getHusbandBirth() {
292	301	return husbandBirth;

...	...	@@ -173,16 +173,20 @@
173	173	@Override
174	174	public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
175	175	String hospitalId = autoMatchFacade.getHospitalId(userId);
176		- Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
	176	+ Criteria criteria = Criteria.where("hospitalId").is(hospitalId);
177	177	if(startDate != null && endDate != null) {
178	178	criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
179	179	}
180	180	if(StringUtils.isNotBlank(doctor)) {
181	181	criteria.and("doctor").is(doctor);
182	182	}
	183	+ criteria.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0))));
183	184	if(StringUtils.isNotBlank(key)) {
184	185	Criteria c = new Criteria();
185		- c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
	186	+ // c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
	187	+ c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key));
	188	+ c.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0))));
	189	+
186	190	List<BabyModel> babyModels = mongoUtil.findField(BabyModel.class, c, "id");
187	191	List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class);
188	192	criteria.and("babyId").in(babyIds);

...	...	@@ -14,6 +14,7 @@
14	14	import org.apache.commons.lang.StringUtils;
15	15
16	16	import java.util.HashMap;
	17	+import java.util.List;
17	18	import java.util.Map;
18	19
19	20	/**
...	...	@@ -70,6 +71,35 @@
70	71	}
71	72	if (StringUtils.isNotEmpty(streetId)){
72	73	sb.append(getName1(streetId,basicConfigService));
	74	+ }
	75	+ if (StringUtils.isNotEmpty(address)) {
	76	+ sb.append(address);
	77	+ }
	78	+ return sb.toString();
	79	+ }
	80	+ public static String getResidence(String provinceId,
	81	+ String cityId,
	82	+ String areaId,
	83	+ String streetId,
	84	+ List<String> childExtAddrs,
	85	+ String address, BasicConfigService basicConfigService) {
	86	+ StringBuilder sb = new StringBuilder();
	87	+ if (StringUtils.isNotEmpty(provinceId)) {
	88	+ sb.append(getName1(provinceId,basicConfigService));
	89	+ }
	90	+ if (StringUtils.isNotEmpty(cityId)) {
	91	+ sb.append(getName1(cityId,basicConfigService));
	92	+ }
	93	+ if (StringUtils.isNotEmpty(areaId)) {
	94	+ sb.append(getName1(areaId,basicConfigService));
	95	+ }
	96	+ if (StringUtils.isNotEmpty(streetId)){
	97	+ sb.append(getName1(streetId,basicConfigService));
	98	+ }
	99	+ if(CollectionUtils.isNotEmpty(childExtAddrs)){
	100	+ for(String ch:childExtAddrs){
	101	+ sb.append(getName1(ch,basicConfigService));
	102	+ }
73	103	}
74	104	if (StringUtils.isNotEmpty(address)) {
75	105	sb.append(address);

...	...	@@ -172,6 +172,7 @@
172	172	}
173	173	Query query = new BasicQuery(dbObject, fieldObject);
174	174	query.addCriteria(criteria);
	175	+ System.out.println(query.toString());
175	176	List<T> list = mongoTemplate.find(query, clazz);
176	177	return list;
177	178	}