jiangjiazhi / regional-platform

Commit 4c8d0990863040a71ac4d71c282aeea278a7a4c6

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

隆化：儿童预约建档

Showing 5 changed files with 210 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java

...	...	@@ -263,7 +263,7 @@
263	263	*/
264	264	private Integer yn;
265	265	/**
266		- * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0，2：小程序建档
	266	+ * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0，2：小程序预约建档
267	267	*/
268	268	private Integer dataStatus;
269	269	//预产期
...	...	@@ -577,7 +577,9 @@
577	577	private String cjfy;//刺激反应
578	578	private String zl;//张力
579	579
580		- //居住类别
	580	+ /**
	581	+ * 母亲居住类别
	582	+ */
581	583	private String liveType;
582	584
583	585	private String numberCode;
...	...	@@ -880,6 +882,19 @@
880	882	*详细地址
881	883	*/
882	884	private String babyAddress;
	885	+
	886	+ /**
	887	+ * 儿童户口性质 1：农业 2：非农业
	888	+ */
	889	+ private String babyAccountNature;
	890	+
	891	+ public String getBabyAccountNature() {
	892	+ return babyAccountNature;
	893	+ }
	894	+
	895	+ public void setBabyAccountNature(String babyAccountNature) {
	896	+ this.babyAccountNature = babyAccountNature;
	897	+ }
883	898
884	899	public String getBabyProvinceId() {
885	900	return babyProvinceId;

...	...	@@ -7,12 +7,10 @@
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8	8	import com.lyms.platform.common.utils.StringUtils;
9	9	import org.apache.commons.collections.CollectionUtils;
	10	+import org.apache.commons.collections.MapUtils;
10	11	import org.springframework.data.mongodb.core.query.Criteria;
11	12
12		-import java.util.ArrayList;
13		-import java.util.Arrays;
14		-import java.util.Date;
15		-import java.util.List;
	13	+import java.util.*;
16	14
17	15	/**
18	16	* 新生儿查询模型
19	17
...	...	@@ -405,7 +403,19 @@
405	403	*详细地址
406	404	*/
407	405	private String babyAddress;
	406	+ /**
	407	+ *儿童小程序预约建档母亲身份证和手机号是否存在
	408	+ */
	409	+ private Map<String,Object> cardArticle;
408	410
	411	+ public Map<String, Object> getCardArticle() {
	412	+ return cardArticle;
	413	+ }
	414	+
	415	+ public void setCardArticle(Map<String, Object> cardArticle) {
	416	+ this.cardArticle = cardArticle;
	417	+ }
	418	+
409	419	public String getBabyProvinceId() {
410	420	return babyProvinceId;
411	421	}
412	422
413	423
...	...	@@ -2577,14 +2587,21 @@
2577	2587	c = Criteria.where("lhNextEyeCheckTime").gte(lhNextEyeCheckTimeStrat).lte(lhNextEyeCheckTimeEnd);
2578	2588	}
2579	2589	}
	2590	+ Criteria cor8=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空
	2591	+ if(MapUtils.isNotEmpty(cardArticle)){
	2592	+ MongoCondition con = MongoCondition.newInstance();
	2593	+ MongoCondition con1 = MongoCondition.newInstance("mcertNo", cardArticle.get("mcertNo"), MongoOper.IS);
	2594	+ MongoCondition con2 = MongoCondition.newInstance("mphone",cardArticle.get("mphone"),MongoOper.IS);
	2595	+ cor8=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	2596	+ }
2580	2597
2581	2598	/**
2582	2599	* 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题
2583	2600	*/
2584	2601	if(c!=null){
2585		- return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4,cor5,cor6,cor7)).toMongoQuery();
	2602	+ return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4,cor5,cor6,cor7,cor8)).toMongoQuery();
2586	2603	}
2587		- return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4,cor5,cor6,cor7)).toMongoQuery();
	2604	+ return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4,cor5,cor6,cor7,cor8)).toMongoQuery();
2588	2605	}
2589	2606
2590	2607	public Boolean getFmDataStatu() {

...	...	@@ -1088,5 +1088,18 @@
1088	1088	LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
1089	1089	return babyBookbuildingFacade.queryBabyCheck0_6Toll(checkDateStart,checkDateEnd,babyProvinceId,babyCityId,babyAreaId,babyStreetId ,loginState.getId());
1090	1090	}
	1091	+
	1092	+ /**
	1093	+ * 小程序app 儿童预建档
	1094	+ * @param request
	1095	+ * @param httpServletRequest
	1096	+ * @return
	1097	+ */
	1098	+ @RequestMapping(method = RequestMethod.POST, value = "/babyBuildArticle")
	1099	+ @ResponseBody
	1100	+ public BaseResponse babyBuildArticle(@Valid @RequestBody BabyAppBuildAddRequest request,
	1101	+ HttpServletRequest httpServletRequest) {
	1102	+ return babyBookbuildingFacade.babyBuildArticle(request);
	1103	+ }
1091	1104	}

...	...	@@ -6381,5 +6381,61 @@
6381	6381	}
6382	6382	return new BaseObjectResponse().setData(result);
6383	6383	}
	6384	+
	6385	+ public BaseResponse babyBuildArticle(BabyAppBuildAddRequest request) {
	6386	+ //查询是否存在
	6387	+ BabyModelQuery babyModelQuery=new BabyModelQuery();
	6388	+ babyModelQuery.setHospitalId(request.getHospitalId());
	6389	+ babyModelQuery.setMcertNo(request.getMommyCardNo());
	6390	+ Map<String,Object> map=new HashMap<>();
	6391	+ map.put("mcertNo", request.getMommyCardNo());
	6392	+ map.put("mphone", request.getPhone());
	6393	+ babyModelQuery.setCardArticle(map);
	6394	+ List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
	6395	+
	6396	+ if (CollectionUtils.isEmpty(babyModels)) {
	6397	+ BabyModel model=new BabyModel();
	6398	+ model.setYn(YnEnums.NO.getId());
	6399	+ model.setDataStatus(2);
	6400	+ model.setBuildType(1);
	6401	+ model.setHospitalId(request.getHospitalId());
	6402	+ //母亲
	6403	+ model.setMname(request.getMommyName());
	6404	+ model.setMcertNo(request.getMommyCardNo());
	6405	+ model.setMphone(request.getPhone());
	6406	+ model.setLiveType(request.getLiveType());
	6407	+ //父亲
	6408	+ model.setFname(request.getFname());
	6409	+ model.setFphone(request.getFphone());
	6410	+ //儿童
	6411	+ model.setName(request.getBabyName());
	6412	+ model.setCardNo(request.getBabyCard());
	6413	+ model.setBirth(DateUtil.parseYMD(request.getBirth()));
	6414	+ model.setSex(Integer.valueOf(request.getSex()));
	6415	+ model.setBabyHeight(request.getHeight());
	6416	+ model.setBabyWeight(request.getWeight());
	6417	+ model.setBabyAccountNature(request.getBabyAccountNature());
	6418	+ //儿童居住地
	6419	+ model.setProvinceId(request.getProvinceId());
	6420	+ model.setCityId(request.getCityId());
	6421	+ model.setAreaId(request.getAreaId());
	6422	+ model.setStreetId(request.getStreetId());
	6423	+ model.setAddress(request.getAddress());
	6424	+ //儿童户籍
	6425	+ model.setBabyProvinceId(request.getBabyProvinceId());
	6426	+ model.setBabyCityId(request.getBabyCityId());
	6427	+ model.setBabyAreaId(request.getBabyAreaId());
	6428	+ model.setBabyStreetId(request.getBabyStreetId());
	6429	+ model.setBabyAddress(request.getBabyAddress());
	6430	+ model.setBuildDate(new Date());
	6431	+ model.setCreated(new Date());
	6432	+ model = babyBookbuildingService.addBabyBookbuilding(model);
	6433	+ }else {
	6434	+ return new BaseObjectResponse().setErrormsg("身份证号已经存在档案").setErrorcode(ErrorCodeConstants.DATA_EXIST);
	6435	+ }
	6436	+
	6437	+
	6438	+ return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
	6439	+ }
6384	6440	}

...	...	@@ -22,6 +22,9 @@
22	22	private String mommyName;
23	23	private String vcCardNo;
24	24	private String hospitalId;
	25	+ //父亲
	26	+ private String fname;
	27	+ private String fphone;
25	28
26	29	private String mBirth;//母亲出生日期
27	30	private String dulWeek;//分娩孕周
...	...	@@ -32,7 +35,14 @@
32	35	private String weight;
33	36	private String height;
34	37	private String addr;
35		-
	38	+ //儿童居住地
	39	+ private String address;
	40	+ private String provinceId;
	41	+ private String cityId;
	42	+ private String areaId;
	43	+ private String streetId;
	44	+ //儿童身份证号码
	45	+ private String babyCard;
36	46	/********************************************/
37	47	//隆化-儿童建档户籍地
38	48	/**
...	...	@@ -55,6 +65,96 @@
55	65	*详细地址
56	66	*/
57	67	private String babyAddress;
	68	+ /**
	69	+ * 儿童户口性质 1：农业 2：非农业
	70	+ */
	71	+ private String babyAccountNature;
	72	+
	73	+ /**
	74	+ * 母亲居住属性
	75	+ */
	76	+ //baby里的名字：居住类别
	77	+ private String liveType;
	78	+
	79	+ public String getFname() {
	80	+ return fname;
	81	+ }
	82	+
	83	+ public void setFname(String fname) {
	84	+ this.fname = fname;
	85	+ }
	86	+
	87	+ public String getFphone() {
	88	+ return fphone;
	89	+ }
	90	+
	91	+ public void setFphone(String fphone) {
	92	+ this.fphone = fphone;
	93	+ }
	94	+
	95	+ public String getLiveType() {
	96	+ return liveType;
	97	+ }
	98	+
	99	+ public void setLiveType(String liveType) {
	100	+ this.liveType = liveType;
	101	+ }
	102	+
	103	+ public String getBabyAccountNature() {
	104	+ return babyAccountNature;
	105	+ }
	106	+
	107	+ public void setBabyAccountNature(String babyAccountNature) {
	108	+ this.babyAccountNature = babyAccountNature;
	109	+ }
	110	+
	111	+ public String getBabyCard() {
	112	+ return babyCard;
	113	+ }
	114	+
	115	+ public void setBabyCard(String babyCard) {
	116	+ this.babyCard = babyCard;
	117	+ }
	118	+
	119	+ public String getAddress() {
	120	+ return address;
	121	+ }
	122	+
	123	+ public void setAddress(String address) {
	124	+ this.address = address;
	125	+ }
	126	+
	127	+ public String getProvinceId() {
	128	+ return provinceId;
	129	+ }
	130	+
	131	+ public void setProvinceId(String provinceId) {
	132	+ this.provinceId = provinceId;
	133	+ }
	134	+
	135	+ public String getCityId() {
	136	+ return cityId;
	137	+ }
	138	+
	139	+ public void setCityId(String cityId) {
	140	+ this.cityId = cityId;
	141	+ }
	142	+
	143	+ public String getAreaId() {
	144	+ return areaId;
	145	+ }
	146	+
	147	+ public void setAreaId(String areaId) {
	148	+ this.areaId = areaId;
	149	+ }
	150	+
	151	+ public String getStreetId() {
	152	+ return streetId;
	153	+ }
	154	+
	155	+ public void setStreetId(String streetId) {
	156	+ this.streetId = streetId;
	157	+ }
58	158
59	159	public String getBabyProvinceId() {
60	160	return babyProvinceId;