jiangjiazhi / regional-platform

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 40 additions and 0 deletions

...	...	@@ -85,6 +85,17 @@
85	85	}
86	86
87	87	/**
	88	+ * 查询儿保检查记录
	89	+ * @param id
	90	+ * @return
	91	+ */
	92	+ @RequestMapping(value = "/queryBabyBaseInfo/{id}", method = RequestMethod.GET)
	93	+ @ResponseBody
	94	+ public BaseObjectResponse queryBabyBaseInfo(@PathVariable("id")String id){
	95	+ return babyCheckFacade.queryBabyBaseInfo(id);
	96	+ }
	97	+
	98	+ /**
88	99	* 查询儿保检查详情
89	100	* @param id
90	101	* @return

...	...	@@ -71,6 +71,7 @@
71	71
72	72	BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
73	73	query.setBabyId(babyId);
	74	+ query.setSort("follow_time");
74	75	//获取当前登录用户ID
75	76	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
76	77	if (loginState == null) {

...	...	@@ -470,6 +470,25 @@
470	470	return br;
471	471	}
472	472
	473	+ /**
	474	+ * 查询儿保检查记录
	475	+ *
	476	+ * @param id 建档id
	477	+ * @return
	478	+ */
	479	+ public BaseObjectResponse queryBabyBaseInfo(String id) {
	480	+ BaseObjectResponse br = new BaseObjectResponse();
	481	+ BabyBasicResult base = new BabyBasicResult();
	482	+ Map<String, Object> resMap = new HashMap<>();
	483	+ getBabyModel(id, base);
	484	+ resMap.put("baseInfo", base);
	485	+ br.setData(resMap);
	486	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	487	+ br.setErrormsg("成功");
	488	+ return br;
	489	+ }
	490	+
	491	+
473	492	public void getBabyCheckList(String[] ids, PersonModel personModel, List<Map<String, String>> list) {
474	493	List<BabyCheckModel> checkModels;
475	494	if (personModel != null) {

...	...	@@ -34,9 +34,18 @@
34	34	private String vcCardNo;
35	35	//母亲身份证号
36	36	private String cardNo;
	37	+ //证件类型
	38	+ private String pregnantCertificateTypeId;
37	39	//是否高危儿童 0 非高危 1高危
38	40	private Integer babyLastHighRisk;
39	41
	42	+ public String getPregnantCertificateTypeId() {
	43	+ return pregnantCertificateTypeId;
	44	+ }
	45	+
	46	+ public void setPregnantCertificateTypeId(String pregnantCertificateTypeId) {
	47	+ this.pregnantCertificateTypeId = pregnantCertificateTypeId;
	48	+ }
40	49
41	50	public String getSourceId()
42	51	{