jiangjiazhi / regional-platform

Commit b8adf9c61ef89a486ad02c6d5c89431c7e74b239

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

产检医生统计

Showing 2 changed files with 86 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java

...	...	@@ -93,7 +93,7 @@
93	93	}
94	94
95	95	/**
96		- * 获取随访记录
	96	+ * 编辑：获取随访记录详情
97	97	*
98	98	* @param fuId 随访记录id
99	99	* @return
100	100
...	...	@@ -115,7 +115,22 @@
115	115	fuResult.setOperation(followUp.getOperation());
116	116	fuResult.setArtifiCochlea(followUp.getArtifiCochlea());
117	117	fuResult.setGuideOpinion(followUp.getGuideOpinion());
	118	+ fuResult.setMonthAge(followUp.getMonthAge());
118	119
	120	+
	121	+ if(followUp.getAudiphone()!=null){
	122	+ //1-左耳，2-右耳，3-全部
	123	+ fuResult.setAudiphoneStr(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部");
	124	+ }
	125	+ if(followUp.getOperation()!=null){
	126	+ //1-左耳，2-右耳，3-全部
	127	+ fuResult.setOperationStr(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部");
	128	+ }
	129	+ if(followUp.getArtifiCochlea()!=null){
	130	+ //1-左耳，2-右耳，3-全部
	131	+ fuResult.setArtifiCochleaStr(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部");
	132	+ }
	133	+
119	134	if(StringUtils.isNotEmpty(followUp.getFollowDoctorId())){
120	135	fuResult.setFollowDoctorId(followUp.getFollowDoctorId());
121	136	String docotorId = followUp.getFollowDoctorId();
...	...	@@ -129,10 +144,6 @@
129	144	if(followUp.getFollowTime()!=null){
130	145	fuResult.setFollowTime(followUp.getFollowTime());
131	146	fuResult.setFollowTimeStr(DateUtil.getyyyy_MM_dd(followUp.getFollowTime()));
132		- BabyModel babyModel = babyService.getOneBabyById(followUp.getBabyId());
133		- if (babyModel != null) {
134		- fuResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), followUp.getFollowTime()));
135		- }
136	147	}
137	148	if(followUp.getMarkTime()!=null){
138	149	fuResult.setMarkTime(followUp.getMarkTime());
...	...	@@ -168,7 +179,7 @@
168	179
169	180
170	181	/**
171		- * 获取随访记录
	182	+ * 获取随访记录列表
172	183	*
173	184	* @param fur 随访记录对象
174	185	* @param request

...	...	@@ -52,15 +52,30 @@
52	52	* 助听器(0-左耳，2-右耳，3-全部)
53	53	*/
54	54	private Integer audiphone;
	55	+ private String audiphoneStr;
55	56	/**
56	57	* 手术(0-左耳，2-右耳，3-全部)
57	58	*/
58	59	private Integer operation;
	60	+ private String operationStr;
59	61	/**
60	62	* 人工耳蜗(0-左耳，2-右耳，3-全部)
61	63	*/
62	64	private Integer artifiCochlea;
	65	+ private String artifiCochleaStr;
63	66	/**
	67	+ * 是否选择助听器(0-未选择，1-选择)
	68	+ */
	69	+ private Integer isAudiphone;
	70	+ /**
	71	+ * 是否选择手术(0-未选择，1-选择)
	72	+ */
	73	+ private Integer isOperation;
	74	+ /**
	75	+ * 是否选择人工耳蜗(0-未选择，1-选择)
	76	+ */
	77	+ private Integer isArtifiCochlea;
	78	+ /**
64	79	* 指导意见
65	80	*/
66	81	private String guideOpinion;
67	82
...	...	@@ -96,9 +111,35 @@
96	111	* 医院名称
97	112	*/
98	113	private String hospitalStr;
99		- //月龄
100		- private String monthAge;
	114	+ /**
	115	+ * 月龄
	116	+ */
	117	+ private Integer monthAge;
101	118
	119	+ public String getAudiphoneStr() {
	120	+ return audiphoneStr;
	121	+ }
	122	+
	123	+ public void setAudiphoneStr(String audiphoneStr) {
	124	+ this.audiphoneStr = audiphoneStr;
	125	+ }
	126	+
	127	+ public String getOperationStr() {
	128	+ return operationStr;
	129	+ }
	130	+
	131	+ public void setOperationStr(String operationStr) {
	132	+ this.operationStr = operationStr;
	133	+ }
	134	+
	135	+ public String getArtifiCochleaStr() {
	136	+ return artifiCochleaStr;
	137	+ }
	138	+
	139	+ public void setArtifiCochleaStr(String artifiCochleaStr) {
	140	+ this.artifiCochleaStr = artifiCochleaStr;
	141	+ }
	142	+
102	143	public String getId() {
103	144	return id;
104	145	}
105	146
...	...	@@ -275,11 +316,35 @@
275	316	this.hospitalStr = hospitalStr;
276	317	}
277	318
278		- public String getMonthAge() {
	319	+ public Integer getIsAudiphone() {
	320	+ return isAudiphone;
	321	+ }
	322	+
	323	+ public void setIsAudiphone(Integer isAudiphone) {
	324	+ this.isAudiphone = isAudiphone;
	325	+ }
	326	+
	327	+ public Integer getIsOperation() {
	328	+ return isOperation;
	329	+ }
	330	+
	331	+ public void setIsOperation(Integer isOperation) {
	332	+ this.isOperation = isOperation;
	333	+ }
	334	+
	335	+ public Integer getIsArtifiCochlea() {
	336	+ return isArtifiCochlea;
	337	+ }
	338	+
	339	+ public void setIsArtifiCochlea(Integer isArtifiCochlea) {
	340	+ this.isArtifiCochlea = isArtifiCochlea;
	341	+ }
	342	+
	343	+ public Integer getMonthAge() {
279	344	return monthAge;
280	345	}
281	346
282		- public void setMonthAge(String monthAge) {
	347	+ public void setMonthAge(Integer monthAge) {
283	348	this.monthAge = monthAge;
284	349	}
285	350	}