jiangjiazhi / regional-platform

Commit 56c61c1101af545fd3bde776aee27962300c8a54

Authored by dongqin over 5 years ago

Exists in master and in 6 other branches

字段添加

Showing 8 changed files with 111 additions and 135 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/CervicalCancerService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IFormReportService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

1	1	package com.lyms.platform.pojo;
2	2
3	3	import java.util.Date;
	4	+import java.util.Map;
4	5
5	6	import org.springframework.data.mongodb.core.mapping.Document;
6	7
...	...	@@ -46,6 +47,7 @@
46	47	private String areaStr;
47	48	private String streetId;
48	49	private String streetStr;
	50	+ private String address;
49	51
50	52	/**
51	53	* 末次月经
...	...	@@ -65,7 +67,7 @@
65	67	/**
66	68	* 表单数据，前端同事自定义
67	69	*/
68		- private Object formData;
	70	+ private Map<String, Object> formData;
69	71
70	72	/**
71	73	* 创建人id
...	...	@@ -74,6 +76,14 @@
74	76
75	77	private Date created;
76	78
	79	+ public String getAddress() {
	80	+ return address;
	81	+ }
	82	+
	83	+ public void setAddress(String address) {
	84	+ this.address = address;
	85	+ }
	86	+
77	87	public String getCreateUser() {
78	88	return createUser;
79	89	}
...	...	@@ -230,7 +240,7 @@
230	240	return formData;
231	241	}
232	242
233		- public void setFormData(Object formData) {
	243	+ public void setFormData(Map<String, Object> formData) {
234	244	this.formData = formData;
235	245	}
236	246	}

...	...	@@ -101,14 +101,5 @@
101	101	return iPreEugenicsService.detail(param);
102	102	}
103	103
104		-
105		- @RequestMapping(value = "getPreEugenicsBase")
106		- @ResponseBody
107		- public BaseResponse getPreEugenicsBaseInfo(@RequestParam(value = "cardNo") String cardNo,
108		- @RequestParam(value = "vcCardNo") String vcCardNo, HttpServletRequest request) {
109		-
110		- return iPreEugenicsService.getPreEugenicsBaseInfo(cardNo, vcCardNo, getUserId(request));
111		- }
112		-
113	104	}

	1	+package com.lyms.platform.operate.web.result;
	2	+
	3	+import com.lyms.platform.pojo.CervicalCancerModel;
	4	+
	5	+public class CervicalCancerModelResult extends CervicalCancerModel {
	6	+
	7	+}

1	1	package com.lyms.platform.operate.web.service;
2	2
3		-import com.lyms.platform.common.result.BaseListResponse;
4		-import com.lyms.platform.common.result.BaseResponse;
5	3	import com.lyms.platform.operate.web.request.CervicalCancerListRequest;
6	4	import com.lyms.platform.operate.web.request.CervicalCancerRequest;
7	5
8		-public interface CervicalCancerService {
	6	+public interface CervicalCancerService extends IFormReportService<CervicalCancerRequest, CervicalCancerListRequest> {
9	7
10		- /**
11		- * 保存单个
12		- *
13		- * @param param
14		- * @return
15		- */
16		- BaseResponse add(CervicalCancerRequest param);
17		-
18		- /**
19		- * 编辑单个
20		- *
21		- * @param param
22		- * @return
23		- */
24		- BaseResponse edit(CervicalCancerRequest param);
25		-
26		- /**
27		- * 列表
28		- *
29		- * @param param
30		- * @return
31		- */
32		- BaseListResponse listPage(CervicalCancerListRequest param);
33		-
34		- /**
35		- * 单个查询
36		- *
37		- * @param param
38		- * @return
39		- */
40		- BaseResponse detail(CervicalCancerRequest param);
41		-
42		- /**
43		- * 根据身份证号获取对应的建档信息
44		- *
45		- * @param idCard
46		- * @return
47		- */
48		- BaseResponse getPatientInfoByIdCard(String idCard);
49	8	}

	1	+package com.lyms.platform.operate.web.service;
	2	+
	3	+import com.lyms.platform.common.dao.BaseQuery;
	4	+import com.lyms.platform.common.result.BaseListResponse;
	5	+import com.lyms.platform.common.result.BaseModel;
	6	+import com.lyms.platform.common.result.BaseResponse;
	7	+
	8	+public interface IFormReportService<Q extends BaseModel, S extends BaseQuery> {
	9	+
	10	+ /**
	11	+ * 保存单个
	12	+ *
	13	+ * @param param
	14	+ * @return
	15	+ */
	16	+ BaseResponse add(Q param);
	17	+
	18	+ /**
	19	+ * 编辑单个
	20	+ *
	21	+ * @param param
	22	+ * @return
	23	+ */
	24	+ BaseResponse edit(Q param);
	25	+
	26	+ /**
	27	+ * 列表
	28	+ *
	29	+ * @param param
	30	+ * @return
	31	+ */
	32	+ BaseListResponse listPage(S param);
	33	+
	34	+ /**
	35	+ * 单个查询
	36	+ *
	37	+ * @param param
	38	+ * @return
	39	+ */
	40	+ BaseResponse detail(Q param);
	41	+
	42	+ /**
	43	+ * 根据身份证号获取对应的信息
	44	+ *
	45	+ * @param idCard
	46	+ * @return
	47	+ */
	48	+ BaseResponse getPatientInfoByIdCard(String idCard);
	49	+}

1	1	package com.lyms.platform.operate.web.service;
2	2
3		-import com.lyms.platform.common.result.BaseListResponse;
4		-import com.lyms.platform.common.result.BaseResponse;
5	3	import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest;
6	4	import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest;
7	5
8		-public interface IPreEugenicsService extends IBaseService {
9		- /**
10		- * 通过身份证就诊卡查询孕前优生基本信息
11		- *
12		- * @param cardNo
13		- * @param vcCardNo
14		- * @return
15		- */
16		- BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId);
	6	+public interface IPreEugenicsService extends IFormReportService<PreEugenicsBaseRequest, PreEugenicsBaseListRequest> {
17	7
18		- /**
19		- * 根据身份证号获取对应的孕前优生信息
20		- *
21		- * @param idCard
22		- * @return
23		- */
24		- BaseResponse getPatientInfoByIdCard(String idCard);
25		-
26		- /**
27		- * 保存单个
28		- *
29		- * @param param
30		- * @return
31		- */
32		- BaseResponse add(PreEugenicsBaseRequest param);
33		-
34		- /**
35		- * 编辑单个
36		- *
37		- * @param param
38		- * @return
39		- */
40		- BaseResponse edit(PreEugenicsBaseRequest param);
41		-
42		- /**
43		- * 列表
44		- *
45		- * @param param
46		- * @return
47		- */
48		- BaseListResponse listPage(PreEugenicsBaseListRequest param);
49		-
50		- /**
51		- * 单个查询
52		- *
53		- * @param param
54		- * @return
55		- */
56		- BaseResponse detail(PreEugenicsBaseRequest param);
57	8	}

...	...	@@ -4,6 +4,7 @@
4	4	import java.util.List;
5	5	import java.util.Map;
6	6
	7	+import org.springframework.beans.BeanUtils;
7	8	import org.springframework.beans.factory.annotation.Autowired;
8	9	import org.springframework.data.domain.Sort;
9	10	import org.springframework.data.mongodb.core.MongoTemplate;
...	...	@@ -22,6 +23,7 @@
22	23	import com.lyms.platform.common.utils.StringUtils;
23	24	import com.lyms.platform.operate.web.request.CervicalCancerListRequest;
24	25	import com.lyms.platform.operate.web.request.CervicalCancerRequest;
	26	+import com.lyms.platform.operate.web.result.CervicalCancerModelResult;
25	27	import com.lyms.platform.operate.web.service.CervicalCancerService;
26	28	import com.lyms.platform.operate.web.utils.CollectionUtils;
27	29	import com.lyms.platform.operate.web.utils.CommonsHelper;
28	30
29	31
30	32
...	...	@@ -122,12 +124,16 @@
122	124	@Override
123	125	public BaseResponse detail(CervicalCancerRequest param) {
124	126	String id = param.getId();
125		- if (StringUtils.isNum(id)) {
	127	+ if (StringUtils.isEmpty(id)) {
126	128	return new BaseResponse();
127	129	}
	130	+ CervicalCancerModelResult result = new CervicalCancerModelResult();
128	131	CervicalCancerModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), CervicalCancerModel.class);
	132	+ if (model != null) {
	133	+ BeanUtils.copyProperties(model, result);
	134	+ }
129	135	BaseResponse baseResponse = new BaseResponse();
130		- baseResponse.setObject(model);
	136	+ baseResponse.setObject(result);
131	137	return baseResponse;
132	138	}
133	139
134	140
135	141
...	...	@@ -139,33 +145,41 @@
139	145	*/
140	146	@Override
141	147	public BaseResponse getPatientInfoByIdCard(String idCard) {
142		- List<ResidentsArchiveModel> models = mongoTemplate.find(Query.query(Criteria.where("certificateNum").is(idCard)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
143		- if (CollectionUtils.isEmpty(models)) {
144		- return new BaseResponse("查无数据，请先到妇女建档进行建档操作", ErrorCodeConstants.NO_DATA);
	148	+ CervicalCancerModel modelByIdCardNo = mongoTemplate.findOne(Query.query(Criteria.where("idCardNo").is(idCard)), CervicalCancerModel.class);
	149	+ CervicalCancerModelResult result = new CervicalCancerModelResult();
	150	+ if (modelByIdCardNo == null) {
	151	+ List<ResidentsArchiveModel> models = mongoTemplate.find(Query.query(Criteria.where("certificateNum").is(idCard)).with(new Sort(Sort.Direction.DESC, "created")), ResidentsArchiveModel.class);
	152	+ if (CollectionUtils.isEmpty(models)) {
	153	+ return new BaseResponse("查无数据，请先到妇女建档进行建档操作", ErrorCodeConstants.NO_DATA);
	154	+ }
	155	+ ResidentsArchiveModel model = models.get(0);
	156	+ String provinceId = model.getProvinceId();
	157	+ // 省市区
	158	+ result.setProvinceId(provinceId);
	159	+ result.setProvinceStr(CommonsHelper.getName1(provinceId, basicConfigService));
	160	+ String cityId = model.getCityId();
	161	+ result.setCityId(cityId);
	162	+ result.setCityStr(CommonsHelper.getName1(cityId, basicConfigService));
	163	+ String areaId = model.getAreaId();
	164	+ result.setAreaId(areaId);
	165	+ result.setAreaStr(CommonsHelper.getName1(areaId, basicConfigService));
	166	+ String streetId = model.getStreetId();
	167	+ result.setStreetId(streetId);
	168	+ result.setStreetStr(CommonsHelper.getName1(streetId, basicConfigService));
	169	+
	170	+ result.setLastMenstrual(model.getMcyj());
	171	+ result.setName(model.getUsername());
	172	+ result.setAge(model.getAge());
	173	+ result.setPhone(model.getPhone());
	174	+ result.setIdCardNo(model.getCertificateNum());
	175	+ BaseResponse baseResponse = new BaseResponse();
	176	+ baseResponse.setObject(result);
	177	+ return baseResponse;
145	178	}
146		- ResidentsArchiveModel model = models.get(0);
147		- Map<String, Object> map = MapUtil.beanToMap(model);
148		- String provinceId = model.getProvinceId();
149		- map.put("provinceId", provinceId);
150		- map.put("provinceStr", CommonsHelper.getName1(provinceId,basicConfigService));
151		- String cityId = model.getCityId();
152		- map.put("cityId", cityId);
153		- map.put("cityStr", CommonsHelper.getName1(cityId,basicConfigService));
154		- String areaId = model.getAreaId();
155		- map.put("areaId", areaId);
156		- map.put("areaStr", CommonsHelper.getName1(areaId,basicConfigService));
157		- String streetId = model.getStreetId();
158		- map.put("streetId", streetId);
159		- map.put("streetStr", CommonsHelper.getName1(streetId,basicConfigService));
160		- map.put("lastMenstrual", model.getMcyj());
161		- map.put("name", model.getUsername());
162		- map.put("age", model.getAge());
163		- map.put("phone", model.getPhone());
164		- map.put("idCardNo", model.getCertificateNum());
165	179
166		- BaseResponse baseResponse = new BaseResponse();
167		- baseResponse.setObject(map);
168		- return baseResponse;
	180	+ CervicalCancerRequest param = new CervicalCancerRequest();
	181	+ param.setId(modelByIdCardNo.getId());
	182	+ return detail(param);
169	183	}
170	184	}

...	...	@@ -44,11 +44,6 @@
44	44
45	45	@Autowired
46	46	private BasicConfigService basicConfigService;
47		-
48		- @Override
49		- public BaseResponse getPreEugenicsBaseInfo(String cardNo, String vcCardNo, Integer userId) {
50		- return null;
51		- }
52	47
53	48	/**
54	49	* 根据身份证号获取对应的孕前优生信息