jiangjiazhi / regional-platform

Authored by litao@lymsh.com over 8 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 61 additions and 4 deletions

...	...	@@ -17,6 +17,15 @@
17	17	public class BabyModel extends BaseModel {
18	18
19	19	private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid();
	20	+
	21	+ // 儿童高危因素标记
	22	+ private List<String> babyHighRiskReason;
	23	+ public List<String> getBabyHighRiskReason() {
	24	+ return babyHighRiskReason;
	25	+ }
	26	+ public void setBabyHighRiskReason(List<String> babyHighRiskReason) {
	27	+ this.babyHighRiskReason = babyHighRiskReason;
	28	+ }
20	29	// 母亲高危因素
21	30	List<String> mHighRiskReason;
22	31

...	...	@@ -1041,6 +1041,7 @@
1041	1041	private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) {
1042	1042	// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1043	1043	BabyModel bm = new BabyModel();
	1044	+ bm.setBabyHighRiskReason(b.getBabyHighRiskReason());
1044	1045	bm.setmHighRiskReason(b.getmHighRiskReason());
1045	1046	bm.setYn(YnEnums.YES.getId());
1046	1047
1047	1048
...	...	@@ -1219,9 +1220,8 @@
1219	1220	*/
1220	1221	private BabyBuildResult getBabyBuildResult(BabyModel model) {
1221	1222	BabyBuildResult result = new BabyBuildResult();
1222		-// result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
1223		-
1224	1223	result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
	1224	+ result.setBabyHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
1225	1225
1226	1226	result.setId(model.getId());
1227	1227	result.setPid(model.getPid());

...	...	@@ -1079,6 +1079,7 @@
1079	1079	return map;
1080	1080	}
1081	1081
	1082	+
1082	1083	/**
1083	1084	* 初诊查询
1084	1085	*
...	...	@@ -1118,8 +1119,10 @@
1118	1119
1119	1120	Map<String, Object> map = new HashMap<>();
1120	1121
1121		- map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1122		- map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
	1122	+// map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
	1123	+// map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
	1124	+ map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
	1125	+ map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
1123	1126	map.put("quickenRemark",data.getQuickenRemark());
1124	1127
1125	1128	/* 基本信息 */
...	...	@@ -2843,6 +2846,7 @@
2843	2846
2844	2847	result = result.convertToResult(model);
2845	2848	result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
	2849	+ result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason()));
2846	2850
2847	2851	String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
2848	2852	model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);

...	...	@@ -13,6 +13,16 @@
13	13	@Form
14	14	public class BabyBookbuildingAddRequest {
15	15	/*********母亲基本信息*********/
	16	+ // 儿童高危因素标记
	17	+ private List<String> babyHighRiskReason;
	18	+
	19	+ public List<String> getBabyHighRiskReason() {
	20	+ return babyHighRiskReason;
	21	+ }
	22	+
	23	+ public void setBabyHighRiskReason(List<String> babyHighRiskReason) {
	24	+ this.babyHighRiskReason = babyHighRiskReason;
	25	+ }
16	26
17	27	// 母亲高危因素
18	28	private List<String> mHighRiskReason;

...	...	@@ -9,6 +9,16 @@
9	9	public class BabyBuildResult {
10	10	// 母亲高危因素
11	11	private List<Map<String, Object>> mHighRiskReason;
	12	+ // 儿童高危因素标记
	13	+ private List<Map<String, Object>> babyHighRiskReason;
	14	+
	15	+ public List<Map<String, Object>> getBabyHighRiskReason() {
	16	+ return babyHighRiskReason;
	17	+ }
	18	+
	19	+ public void setBabyHighRiskReason(List<Map<String, Object>> babyHighRiskReason) {
	20	+ this.babyHighRiskReason = babyHighRiskReason;
	21	+ }
12	22
13	23	private List mHighRiskReason2;
14	24

...	...	@@ -20,6 +20,15 @@
20	20	*/
21	21	public class BabyPageResult implements IBasicResultConvert<BabyPageResult,BabyModel> {
22	22
	23	+ // 儿童高危因素标记
	24	+ private List<String> babyHighRiskReason;
	25	+ public List<String> getBabyHighRiskReason() {
	26	+ return babyHighRiskReason;
	27	+ }
	28	+ public void setBabyHighRiskReason(List<String> babyHighRiskReason) {
	29	+ this.babyHighRiskReason = babyHighRiskReason;
	30	+ }
	31	+
23	32	// 母亲高危因素
24	33	List<String> mHighRiskReason;
25	34

...	...	@@ -359,6 +359,21 @@
359	359	return plantformConfig.getValue();
360	360	}
361	361
	362	+ public List<String> findPlatList2(Map<String, List<String>> ids) {
	363	+ List<String> list = new ArrayList<>();
	364	+ if(MapUtils.isEmpty(ids)) {
	365	+ return list;
	366	+ }
	367	+ Iterator<Map.Entry<String, List<String>>> iterator = ids.entrySet().iterator();
	368	+ while (iterator.hasNext()) {
	369	+ Map.Entry<String, List<String>> next = iterator.next();
	370	+ StringBuilder sb = new StringBuilder();
	371	+ sb.append(next.getKey()).append(": ").append(org.apache.commons.lang.StringUtils.join(next.getValue().toArray(), ","));
	372	+ list.add(sb.toString());
	373	+ }
	374	+ return list;
	375	+ }
	376	+
362	377	public List<String> findPlatList(Map<String, List<String>> ids) {
363	378	List<String> list = new ArrayList<>();
364	379	if(MapUtils.isEmpty(ids)) {