jiangjiazhi / regional-platform

Commit 36abcf74b5508518f699bc0fbd680f91903d54a8

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

肌萎缩

Showing 4 changed files with 250 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java

...	...	@@ -67,7 +67,71 @@
67	67	private Date checkDate;//检查日期
68	68	private Date created;//创建记录时间
69	69
70		- private Integer sfStatus;//随访状态 0 终止状态 1 丈夫阳性状态 2 产前诊断异常 3 分娩异常 4新生儿异常
	70	+ private Map<String,Object> cqzd;//产前诊断
	71	+ private Map<String,Object> ycxsc;//遗传学筛查
	72	+ private Map<String,Object> mtys;//母体因素
	73	+ private Integer rsResult;//妊娠结局 2 继续妊娠 3 失联 4终止妊娠
	74	+ private Map<String,Object> babyInfo;//新生儿信息
	75	+
	76	+ private Date sfDate;//随访日期
	77	+ private Date ysfDate;//应随访日期
	78	+ private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
	79	+
	80	+ public Date getYsfDate() {
	81	+ return ysfDate;
	82	+ }
	83	+
	84	+ public void setYsfDate(Date ysfDate) {
	85	+ this.ysfDate = ysfDate;
	86	+ }
	87	+
	88	+ public Map<String, Object> getCqzd() {
	89	+ return cqzd;
	90	+ }
	91	+
	92	+ public void setCqzd(Map<String, Object> cqzd) {
	93	+ this.cqzd = cqzd;
	94	+ }
	95	+
	96	+ public Map<String, Object> getYcxsc() {
	97	+ return ycxsc;
	98	+ }
	99	+
	100	+ public void setYcxsc(Map<String, Object> ycxsc) {
	101	+ this.ycxsc = ycxsc;
	102	+ }
	103	+
	104	+ public Map<String, Object> getMtys() {
	105	+ return mtys;
	106	+ }
	107	+
	108	+ public void setMtys(Map<String, Object> mtys) {
	109	+ this.mtys = mtys;
	110	+ }
	111	+
	112	+ public Integer getRsResult() {
	113	+ return rsResult;
	114	+ }
	115	+
	116	+ public void setRsResult(Integer rsResult) {
	117	+ this.rsResult = rsResult;
	118	+ }
	119	+
	120	+ public Map<String, Object> getBabyInfo() {
	121	+ return babyInfo;
	122	+ }
	123	+
	124	+ public void setBabyInfo(Map<String, Object> babyInfo) {
	125	+ this.babyInfo = babyInfo;
	126	+ }
	127	+
	128	+ public Date getSfDate() {
	129	+ return sfDate;
	130	+ }
	131	+
	132	+ public void setSfDate(Date sfDate) {
	133	+ this.sfDate = sfDate;
	134	+ }
71	135
72	136	private List<HusbandSmn> husbandSmns;
73	137

...	...	@@ -35,6 +35,12 @@
35	35	return smnFacade.addSmn(param, getUserId(request));
36	36	}
37	37
	38	+ /**
	39	+ * 添加丈夫smn申请
	40	+ * @param param
	41	+ * @param request
	42	+ * @return
	43	+ */
38	44	@RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnApply")
39	45	@ResponseBody
40	46	@TokenRequired
...	...	@@ -43,6 +49,12 @@
43	49	}
44	50
45	51
	52	+ /**
	53	+ * 编辑丈夫smn申请
	54	+ * @param param
	55	+ * @param request
	56	+ * @return
	57	+ */
46	58	@RequestMapping(method = RequestMethod.POST, value = "/editHusbandSmn")
47	59	@ResponseBody
48	60	@TokenRequired
...	...	@@ -50,6 +62,12 @@
50	62	return smnFacade.editHusbandSmn(param, getUserId(request));
51	63	}
52	64
	65	+ /**
	66	+ * 添加修改丈夫筛查结果记录
	67	+ * @param param
	68	+ * @param request
	69	+ * @return
	70	+ */
53	71	@RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnResult")
54	72	@ResponseBody
55	73	@TokenRequired
56	74
...	...	@@ -57,7 +75,60 @@
57	75	return smnFacade.addHusbandSmnResult(param, getUserId(request));
58	76	}
59	77
	78	+ /**
	79	+ * 增加产前随访记录
	80	+ * @param param
	81	+ * @param request
	82	+ * @return
	83	+ */
	84	+ @RequestMapping(method = RequestMethod.POST, value = "/addCqsfRecord")
	85	+ @ResponseBody
	86	+ @TokenRequired
	87	+ public BaseResponse addCqsfRecord(@RequestBody SmnRequest param, HttpServletRequest request) {
	88	+ return smnFacade.addCqsfRecord(param, getUserId(request));
	89	+ }
60	90
	91	+
	92	+ /**
	93	+ * 编辑产前随访记录
	94	+ * @param param
	95	+ * @param request
	96	+ * @return
	97	+ */
	98	+ @RequestMapping(method = RequestMethod.POST, value = "/editCqsfRecord")
	99	+ @ResponseBody
	100	+ @TokenRequired
	101	+ public BaseResponse editCqsfRecord(@RequestBody SmnRequest param, HttpServletRequest request) {
	102	+ return smnFacade.editCqsfRecord(param, getUserId(request));
	103	+ }
	104	+
	105	+
	106	+ /**
	107	+ * 增加新生儿随访记录
	108	+ * @param param
	109	+ * @param request
	110	+ * @return
	111	+ */
	112	+ @RequestMapping(method = RequestMethod.POST, value = "/addBabyInfoRecord")
	113	+ @ResponseBody
	114	+ @TokenRequired
	115	+ public BaseResponse addBabyInfoRecord(@RequestBody SmnRequest param, HttpServletRequest request) {
	116	+ return smnFacade.addBabyInfoRecord(param, getUserId(request));
	117	+ }
	118	+
	119	+
	120	+ /**
	121	+ * 编辑新生儿随访记录
	122	+ * @param param
	123	+ * @param request
	124	+ * @return
	125	+ */
	126	+ @RequestMapping(method = RequestMethod.POST, value = "/editBabyInfoRecord")
	127	+ @ResponseBody
	128	+ @TokenRequired
	129	+ public BaseResponse editBabyInfoRecord(@RequestBody SmnRequest param, HttpServletRequest request) {
	130	+ return smnFacade.editBabyInfoRecord(param, getUserId(request));
	131	+ }
61	132
62	133
63	134	/**

...	...	@@ -251,8 +251,30 @@
251	251	}
252	252
253	253
	254	+ Integer sfStatus = param.getSfStatus();
	255	+ if (result != null) {
	256	+ query.addCriteria(Criteria.where("sfStatus").is(sfStatus));
	257	+ }
	258	+ String sfDate = param.getSfDate();
	259	+ if (StringUtils.isNotEmpty(sfDate)) {
	260	+ String[] arrs = sfDate.split(" - ");
	261	+ Date start = DateUtil.parseYMD(arrs[0]);
	262	+ Date end = DateUtil.parseYMD(arrs[1]);
	263	+ end = DateUtil.getDayLastSecond(end);
	264	+ query.addCriteria(Criteria.where("sfDate").gte(start).lte(end));
	265	+ }
254	266
	267	+ String ysfDate = param.getYsfDate();
	268	+ if (StringUtils.isNotEmpty(ysfDate)) {
	269	+ String[] arrs = ysfDate.split(" - ");
	270	+ Date start = DateUtil.parseYMD(arrs[0]);
	271	+ Date end = DateUtil.parseYMD(arrs[1]);
	272	+ end = DateUtil.getDayLastSecond(end);
	273	+ query.addCriteria(Criteria.where("ysfDate").gte(start).lte(end));
	274	+ }
255	275
	276	+
	277	+
256	278	Integer startWeek = param.getStartWeek();
257	279	if (startWeek != null) {
258	280	query.addCriteria(Criteria.where("lastMenses").lte(DateUtil.addWeek(new Date(),-startWeek)));
259	281
...	...	@@ -426,10 +448,19 @@
426	448	husbandSmn.setSmn8Result(smn8Result);
427	449	if ((husbandSmn.getSmn7() > -0.45 && param.getSmn7() <=0.45) \|\| (param.getSmn8() > -0.45 && param.getSmn8() <=0.45))
428	450	{
	451	+ if (smnModel.getYsfDate() == null)
	452	+ {
	453	+ //随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
	454	+ smnModel.setSfStatus(1);
	455	+ smnModel.setYsfDate(new Date());
	456	+ }
	457	+
429	458	husbandSmn.setResult(2);
430	459	}
431	460	else
432	461	{
	462	+ //随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
	463	+ smnModel.setSfStatus(0);
433	464	husbandSmn.setResult(1);
434	465	}
435	466	}
...	...	@@ -464,6 +495,61 @@
464	495	Update update = MongoConvertHelper
465	496	.convertToNativeUpdate(ReflectionUtils.getUpdateField(smnModel));
466	497	mongoTemplate.updateFirst(query, update, SmnModel.class);
	498	+ return new BaseResponse();
	499	+ }
	500	+// private Map<String,Object> cqzd;//产前诊断
	501	+// private Map<String,Object> ycxsc;//遗传学筛查
	502	+// private Map<String,Object> mtys;//母体因素
	503	+// private Integer rsResult;//妊娠结局 2 继续妊娠 3 失联 4终止妊娠 5 分娩
	504	+// private Map<String,Object> babyInfo;//新生儿信息
	505	+//
	506	+// private Date sfDate;//随访日期
	507	+// private Date ysfDate;//应随访日期
	508	+// private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
	509	+ public BaseResponse addCqsfRecord(SmnRequest param, Integer userId) {
	510	+ Query query = Query.query(Criteria.where("id").is(param.getId()));
	511	+ SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
	512	+ BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
	513	+ param.setSfDate(new Date());
	514	+ Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
	515	+ Update update = MongoConvertHelper
	516	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
	517	+ mongoTemplate.updateFirst(query1, update, SmnModel.class);
	518	+ return new BaseResponse();
	519	+ }
	520	+
	521	+ public BaseResponse editCqsfRecord(SmnRequest param, Integer userId) {
	522	+ Query query = Query.query(Criteria.where("id").is(param.getId()));
	523	+ SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
	524	+ BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
	525	+ smnModel.setSfStatus(6);
	526	+ Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
	527	+ Update update = MongoConvertHelper
	528	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
	529	+ mongoTemplate.updateFirst(query1, update, SmnModel.class);
	530	+ return new BaseResponse();
	531	+ }
	532	+
	533	+ public BaseResponse addBabyInfoRecord(SmnRequest param, Integer userId) {
	534	+ Query query = Query.query(Criteria.where("id").is(param.getId()));
	535	+ SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
	536	+ BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
	537	+ param.setSfDate(new Date());
	538	+ Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
	539	+ Update update = MongoConvertHelper
	540	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
	541	+ mongoTemplate.updateFirst(query1, update, SmnModel.class);
	542	+ return new BaseResponse();
	543	+ }
	544	+
	545	+ public BaseResponse editBabyInfoRecord(SmnRequest param, Integer userId) {
	546	+ Query query = Query.query(Criteria.where("id").is(param.getId()));
	547	+ SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
	548	+ BeanUtils.copyProperties(smnModel,param, com.lyms.platform.common.utils.BeanUtils.getNullPropertyNames(smnModel));
	549	+ Query query1 = Query.query(Criteria.where("id").is(smnModel.getId()));
	550	+ Update update = MongoConvertHelper
	551	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));
	552	+ mongoTemplate.updateFirst(query1, update, SmnModel.class);
467	553	return new BaseResponse();
468	554	}
469	555	}

...	...	@@ -32,6 +32,34 @@
32	32	private Integer husbandResult; //1 阴性 2 阳性
33	33	private String husbandCheckDate;//检查日期
34	34
	35	+ private String sfDate;//随访日期
	36	+ private String ysfDate;//应随访日期
	37	+ private Integer sfStatus;//随访状态 0 正常状态 1 产前诊断 2 继续妊娠 3 失联 4终止妊娠 5 分娩 6随访完成
	38	+
	39	+ public String getSfDate() {
	40	+ return sfDate;
	41	+ }
	42	+
	43	+ public void setSfDate(String sfDate) {
	44	+ this.sfDate = sfDate;
	45	+ }
	46	+
	47	+ public String getYsfDate() {
	48	+ return ysfDate;
	49	+ }
	50	+
	51	+ public void setYsfDate(String ysfDate) {
	52	+ this.ysfDate = ysfDate;
	53	+ }
	54	+
	55	+ public Integer getSfStatus() {
	56	+ return sfStatus;
	57	+ }
	58	+
	59	+ public void setSfStatus(Integer sfStatus) {
	60	+ this.sfStatus = sfStatus;
	61	+ }
	62	+
35	63	public String getHusbandSendDate() {
36	64	return husbandSendDate;
37	65	}