jiangjiazhi / regional-platform

Commit 279367c043dafc067f86a131ada3e0e863e4e96f

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 158 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java

...	...	@@ -5,6 +5,7 @@
5	5	import org.springframework.data.mongodb.core.mapping.Document;
6	6
7	7	import java.util.Date;
	8	+import java.util.List;
8	9	import java.util.Map;
9	10
10	11	/**
11	12
...	...	@@ -25,7 +26,12 @@
25	26	private Date createDate;
26	27	private Date modifyDate;
27	28	private String hospitalId;
	29	+ //备注
	30	+ private String mremark;
	31	+ // 母亲高危因素
	32	+ List<String> mHighRiskReason;
28	33
	34	+
29	35	/母亲信息/
30	36	//母亲姓名
31	37	private String mname;
32	38
33	39
34	40
...	...	@@ -577,8 +583,20 @@
577	583	}
578	584
579	585
	586	+ public String getMremark() {
	587	+ return mremark;
	588	+ }
580	589
	590	+ public void setMremark(String mremark) {
	591	+ this.mremark = mremark;
	592	+ }
581	593
	594	+ public List<String> getmHighRiskReason() {
	595	+ return mHighRiskReason;
	596	+ }
582	597
	598	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	599	+ this.mHighRiskReason = mHighRiskReason;
	600	+ }
583	601	}

...	...	@@ -5,6 +5,7 @@
5	5	import org.springframework.data.mongodb.core.mapping.Document;
6	6
7	7	import java.util.Date;
	8	+import java.util.List;
8	9
9	10	/**
10	11	* 心理专科检查实体类
11	12
...	...	@@ -24,7 +25,12 @@
24	25	private Date createDate;
25	26	private Date modifyDate;
26	27	private String hospitalId;
	28	+ //备注
	29	+ private String mremark;
	30	+ // 母亲高危因素
	31	+ List<String> mHighRiskReason;
27	32
	33	+
28	34	/母亲信息/
29	35	//母亲姓名
30	36	private String mname;
31	37
...	...	@@ -170,7 +176,21 @@
170	176	//处理意见
171	177	private String handlingOpinions;
172	178
	179	+ public String getMremark() {
	180	+ return mremark;
	181	+ }
173	182
	183	+ public void setMremark(String mremark) {
	184	+ this.mremark = mremark;
	185	+ }
	186	+
	187	+ public List<String> getmHighRiskReason() {
	188	+ return mHighRiskReason;
	189	+ }
	190	+
	191	+ public void setmHighRiskReason(List<String> mHighRiskReason) {
	192	+ this.mHighRiskReason = mHighRiskReason;
	193	+ }
174	194
175	195	public String getId() {
176	196	return id;

...	...	@@ -13,7 +13,9 @@
13	13	import com.lyms.platform.operate.web.request.BabyNutritionSpecialtyRequest;
14	14	import com.lyms.platform.operate.web.result.BabyNutritionSpecialtyResult;
15	15	import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
	16	+import com.lyms.platform.operate.web.utils.CollectionUtils;
16	17	import com.lyms.platform.operate.web.utils.CommonsHelper;
	18	+import com.lyms.platform.operate.web.utils.MongoUtil;
17	19	import com.lyms.platform.permission.model.Users;
18	20	import com.lyms.platform.permission.service.OrganizationService;
19	21	import com.lyms.platform.permission.service.UsersService;
20	22
...	...	@@ -39,8 +41,9 @@
39	41
40	42	@Autowired
41	43	private BabyBabyNutritionSpecialtyService babyBabyNSService;
42		-
43	44	@Autowired
	45	+ private MongoUtil mongoUtil;
	46	+ @Autowired
44	47	private BabyBookbuildingService babyBookbuildingService;
45	48	@Autowired
46	49	private AutoMatchFacade autoMatchFacade;
...	...	@@ -86,6 +89,9 @@
86	89	model.setsINCard(babyModel.getsINCard());
87	90	model.setBirthday(babyModel.getBirth());
88	91	model.setModifyDate(new Date());
	92	+ model.setMremark(babyModel.getMremark());
	93	+ model.setmHighRiskReason(babyModel.getmHighRiskReason());
	94	+
89	95	//createDate,hospitalId调用外添加赋值
90	96	}
91	97	/新增页面，公共内容/
...	...	@@ -218,7 +224,10 @@
218	224	if(StringUtils.isNotEmpty(id)){
219	225	BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyBabyNSService.queryById(id);
220	226	BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult();
221		- babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel);
	227	+ babyNutritionSpecialtyResult.convertToShowResult(babyNutritionSpecialtyModel);
	228	+ if(CollectionUtils.isNotEmpty(babyNutritionSpecialtyModel.getmHighRiskReason())){
	229	+ babyNutritionSpecialtyResult.setmHighRiskReason(mongoUtil.findColor(babyNutritionSpecialtyModel.getmHighRiskReason()));
	230	+ }
222	231
223	232	if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())){
224	233	Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor()));

...	...	@@ -14,7 +14,9 @@
14	14	import com.lyms.platform.operate.web.request.BabyPsychologistRequest;
15	15	import com.lyms.platform.operate.web.result.BabyPsychologistResult;
16	16	import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
	17	+import com.lyms.platform.operate.web.utils.CollectionUtils;
17	18	import com.lyms.platform.operate.web.utils.CommonsHelper;
	19	+import com.lyms.platform.operate.web.utils.MongoUtil;
18	20	import com.lyms.platform.permission.model.Users;
19	21	import com.lyms.platform.permission.service.OrganizationService;
20	22	import com.lyms.platform.permission.service.UsersService;
21	23
...	...	@@ -41,8 +43,9 @@
41	43
42	44	@Autowired
43	45	private BabyPsychologistService babyPsychologistService;
44		-
45	46	@Autowired
	47	+ private MongoUtil mongoUtil;
	48	+ @Autowired
46	49	private BabyBookbuildingService babyBookbuildingService;
47	50	@Autowired
48	51	private AutoMatchFacade autoMatchFacade;
...	...	@@ -94,6 +97,9 @@
94	97	model.setsINCard(babyModel.getsINCard());
95	98	model.setBirthday(babyModel.getBirth());
96	99	model.setModifyDate(new Date());
	100	+ model.setMremark(babyModel.getMremark());
	101	+ model.setmHighRiskReason(babyModel.getmHighRiskReason());
	102	+
97	103	//createDate,hospitalId调用外添加赋值
98	104	}
99	105	/新增页面，公共内容/
...	...	@@ -246,6 +252,9 @@
246	252	BabyPsychologistModel babyPsychologistModel = babyPsychologistService.queryBabyPsychologistById(id);
247	253	BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult();
248	254	babyPsychologistResult.convertToResult(babyPsychologistModel);
	255	+ if(CollectionUtils.isNotEmpty(babyPsychologistModel.getmHighRiskReason())){
	256	+ babyPsychologistResult.setmHighRiskReason(mongoUtil.findColor(babyPsychologistModel.getmHighRiskReason()));
	257	+ }
249	258	if(StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())){
250	259	Users users = usersService.getUsers(NumberUtils.toInt(babyPsychologistModel.getCheckDoctor()));
251	260	if(users!=null && StringUtils.isNotEmpty(users.getName())){

...	...	@@ -3,7 +3,6 @@
3	3	import com.lyms.platform.common.core.annotation.form.FormParam;
4	4	import org.hibernate.validator.constraints.NotEmpty;
5	5
6		-import java.util.Date;
7	6	import java.util.Map;
8	7
9	8	/**

...	...	@@ -3,10 +3,12 @@
3	3
4	4	import com.lyms.platform.common.base.IBasicResultConvert;
5	5	import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.common.utils.StringUtils;
6	7	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
7	8	import com.lyms.platform.pojo.BabyNutritionSpecialtyModel;
8	9
9	10	import java.util.Date;
	11	+import java.util.List;
10	12	import java.util.Map;
11	13
12	14	public class BabyNutritionSpecialtyResult implements IBasicResultConvert<BabyNutritionSpecialtyResult, BabyNutritionSpecialtyModel> {
...	...	@@ -21,7 +23,10 @@
21	23	private Date modifyDate;
22	24	private String hospitalId;
23	25	private String hospitalName;
24		-
	26	+ //备注
	27	+ private String mremark;
	28	+ // 母亲高危因素
	29	+ List<Map<String, Object>> mHighRiskReason;
25	30	/母亲信息/
26	31	//母亲姓名
27	32	private String mname;
...	...	@@ -48,6 +53,7 @@
48	53	/新增页面，公共内容/
49	54	//营养专科项目
50	55	private String yyProject;
	56	+ private String yyProjectName;
51	57	//检查日期
52	58	private String checkDate;
53	59	//检查月龄 2月龄28天
...	...	@@ -134,6 +140,14 @@
134	140	//VitD治疗（品名、剂量）
135	141	private String vitdzl;
136	142
	143	+ public String getYyProjectName() {
	144	+ return yyProjectName;
	145	+ }
	146	+
	147	+ public void setYyProjectName(String yyProjectName) {
	148	+ this.yyProjectName = yyProjectName;
	149	+ }
	150	+
137	151	public String getXgCheck() {
138	152	return xgCheck;
139	153	}
...	...	@@ -638,6 +652,21 @@
638	652	this.nextDate = nextDate;
639	653	}
640	654
	655	+ public String getMremark() {
	656	+ return mremark;
	657	+ }
	658	+
	659	+ public void setMremark(String mremark) {
	660	+ this.mremark = mremark;
	661	+ }
	662	+
	663	+ public List<Map<String, Object>> getmHighRiskReason() {
	664	+ return mHighRiskReason;
	665	+ }
	666	+
	667	+ public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
	668	+ this.mHighRiskReason = mHighRiskReason;
	669	+ }
641	670	/新增页面 4个页面内容/
642	671
643	672
...	...	@@ -712,6 +741,8 @@
712	741	setPid(destModel.getPid());
713	742	//createDate modifyDate
714	743	setHospitalId(destModel.getHospitalId());
	744	+ setMremark(destModel.getMremark());
	745	+
715	746	setMname(destModel.getMname());
716	747	setMcertNo(destModel.getMcertNo());
717	748	setMphone(destModel.getMphone());
...	...	@@ -730,6 +761,18 @@
730	761	setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday()));
731	762
732	763	setYyProject(destModel.getYyProject());
	764	+
	765	+ if(StringUtils.isNotEmpty(destModel.getYyProject())){
	766	+ if("dbznl".equals(destModel.getYyProject())){
	767	+ setYyProjectName("蛋白质-能量营养不良儿童检查");
	768	+ }else if ("pxet".equals(destModel.getYyProject())){
	769	+ setYyProjectName("贫血儿童检查");
	770	+ }else if ("jlbet".equals(destModel.getYyProject())){
	771	+ setYyProjectName("佝偻病儿童检查");
	772	+ }else if ("fpetjc".equals(destModel.getYyProject())){
	773	+ setYyProjectName("肥胖儿童检查");
	774	+ }
	775	+ }
733	776	setCheckDate(DateUtil.getYyyyMmDd(destModel.getCheckDate()));
734	777	setCheckMonth(destModel.getCheckMonth());
735	778	//checkDoctor

...	...	@@ -5,9 +5,10 @@
5	5	import com.lyms.platform.common.utils.DateUtil;
6	6	import com.lyms.platform.common.utils.StringUtils;
7	7	import com.lyms.platform.pojo.BabyPsychologistModel;
8		-import com.lyms.platform.pojo.BabySpecialDiseaseClinicModel;
9	8
10	9	import java.util.Date;
	10	+import java.util.List;
	11	+import java.util.Map;
11	12
12	13	public class BabyPsychologistResult implements IBasicResultConvert<BabyPsychologistResult, BabyPsychologistModel> {
13	14
...	...	@@ -21,6 +22,10 @@
21	22	private Date modifyDate;
22	23	private String hospitalId;
23	24	private String hospitalName;
	25	+ //备注
	26	+ private String mremark;
	27	+ // 母亲高危因素
	28	+ private List<Map<String, Object>> mHighRiskReason;
24	29
25	30	/母亲信息/
26	31	//母亲姓名
...	...	@@ -48,6 +53,7 @@
48	53	/新增页面，公共内容/
49	54	//心理专科项目
50	55	private String xlzkProject;
	56	+ private String xlzkProjectName;
51	57	//检查日期
52	58	private String checkDate;
53	59	//检查月龄 2月龄28天
...	...	@@ -165,6 +171,14 @@
165	171	//处理意见
166	172	private String handlingOpinions;
167	173
	174	+ public String getXlzkProjectName() {
	175	+ return xlzkProjectName;
	176	+ }
	177	+
	178	+ public void setXlzkProjectName(String xlzkProjectName) {
	179	+ this.xlzkProjectName = xlzkProjectName;
	180	+ }
	181	+
168	182	public String getId() {
169	183	return id;
170	184	}
...	...	@@ -733,6 +747,22 @@
733	747	this.pdyyjl = pdyyjl;
734	748	}
735	749
	750	+ public String getMremark() {
	751	+ return mremark;
	752	+ }
	753	+
	754	+ public void setMremark(String mremark) {
	755	+ this.mremark = mremark;
	756	+ }
	757	+
	758	+ public List<Map<String, Object>> getmHighRiskReason() {
	759	+ return mHighRiskReason;
	760	+ }
	761	+
	762	+ public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
	763	+ this.mHighRiskReason = mHighRiskReason;
	764	+ }
	765	+
736	766	@Override
737	767	public BabyPsychologistResult convertToResult(BabyPsychologistModel destModel) {
738	768
...	...	@@ -741,6 +771,8 @@
741	771	setPid(destModel.getPid());
742	772	//createDate modifyDate
743	773	setHospitalId(destModel.getHospitalId());
	774	+ setMremark(destModel.getMremark());
	775	+
744	776	setMname(destModel.getMname());
745	777	setMcertNo(destModel.getMcertNo());
746	778	setMphone(destModel.getMphone());
...	...	@@ -759,6 +791,28 @@
759	791	setBirthday(DateUtil.getYyyyMmDd(destModel.getBirthday()));
760	792
761	793	setXlzkProject(destModel.getXlzkProject());
	794	+ if(StringUtils.isNotEmpty(destModel.getXlzkProject())){
	795	+ if("zlza".equals(destModel.getXlzkProject())){
	796	+ setXlzkProjectName("智力障碍病历模板");
	797	+ }else if ("gdzpxza".equals(destModel.getXlzkProject())){
	798	+ setXlzkProjectName("孤独症谱系障碍病历模板");
	799	+ }else if ("yyza".equals(destModel.getXlzkProject())){
	800	+ setXlzkProjectName("语言障碍病历模板");
	801	+ }else if ("gyza".equals(destModel.getXlzkProject())){
	802	+ setXlzkProjectName("构音障碍病历模板");
	803	+ }else if ("zylqxddza".equals(destModel.getXlzkProject())){
	804	+ setXlzkProjectName("注意力缺陷多动障碍病历模板");
	805	+ }else if ("cdza".equals(destModel.getXlzkProject())){
	806	+ setXlzkProjectName("抽动障碍病历模板");
	807	+ }else if ("smza".equals(destModel.getXlzkProject())){
	808	+ setXlzkProjectName("睡眠障碍病历模板");
	809	+ }else if ("ynz".equals(destModel.getXlzkProject())){
	810	+ setXlzkProjectName("遗尿症病历模板");
	811	+ }else if ("wtxw".equals(destModel.getXlzkProject())){
	812	+ setXlzkProjectName("问题行为病历模板");
	813	+ }
	814	+ }
	815	+
762	816	setCheckDate(DateUtil.getYyyyMmDd(destModel.getCheckDate()));
763	817	setCheckMonth(destModel.getCheckMonth());
764	818	//checkDoctor