jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 110 additions and 4 deletions

...	...	@@ -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.Map;
8	9
9	10	/**
10	11	* 产后复查模型
...	...	@@ -208,6 +209,38 @@
208	209	private String cityId;
209	210	private String areaId;
210	211	private String streetId;
	212	+
	213	+ //出院时间
	214	+ private Date outDate;
	215	+ //分类
	216	+ private String classify;
	217	+
	218	+ //转诊
	219	+ private Map<String,Object> referral;
	220	+
	221	+ public Date getOutDate() {
	222	+ return outDate;
	223	+ }
	224	+
	225	+ public void setOutDate(Date outDate) {
	226	+ this.outDate = outDate;
	227	+ }
	228	+
	229	+ public String getClassify() {
	230	+ return classify;
	231	+ }
	232	+
	233	+ public void setClassify(String classify) {
	234	+ this.classify = classify;
	235	+ }
	236	+
	237	+ public Map<String, Object> getReferral() {
	238	+ return referral;
	239	+ }
	240	+
	241	+ public void setReferral(Map<String, Object> referral) {
	242	+ this.referral = referral;
	243	+ }
211	244
212	245	public String getProvinceId() {
213	246	return provinceId;

...	...	@@ -109,15 +109,15 @@
109	109	//添加
110	110	if (StringUtils.isEmpty(babyCheck.getId())) {
111	111	lhBabyEyeCheckService.add(babyCheck);
112		- operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyCheck, OptActionEnums.ADD.getId(), "添加眼健康检查");
	112	+ //operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyCheck, OptActionEnums.ADD.getId(), "添加眼健康检查");
113	113	}else {//修改
114	114	babyCheck.setOperaterId(userid+"");
115	115	babyCheck.setModified(new Date());
116	116	lhBabyEyeCheckService.update(babyCheck);
117	117	LhBabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), LhBabyEyeCheck.class);
118		- if (null!=Check) {
119		- operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查");
120		- }
	118	+// if (null!=Check) {
	119	+// operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查");
	120	+// }
121	121	}
122	122
123	123	//同步数据到儿童档案

...	...	@@ -4749,6 +4749,9 @@
4749	4749	map.put("followupDate", data.getFollowupDate());
4750	4750	map.put("name", data.getName());
4751	4751	map.put("standard", data.getStandard());
	4752	+ map.put("outDate",DateUtil.getyyyy_MM_dd( data.getOutDate()));
	4753	+ map.put("classify", data.getClassify());
	4754	+ map.put("referral", data.getReferral());
4752	4755
4753	4756	br.setErrorcode(ErrorCodeConstants.SUCCESS);
4754	4757	br.setErrormsg("成功");

...	...	@@ -201,6 +201,38 @@
201	201	//国家规范版本号
202	202	private String standard;
203	203
	204	+ //出院时间
	205	+ private String outDate;
	206	+ //分类
	207	+ private String classify;
	208	+
	209	+ //转诊
	210	+ private Map<String,Object> referral;
	211	+
	212	+ public String getOutDate() {
	213	+ return outDate;
	214	+ }
	215	+
	216	+ public void setOutDate(String outDate) {
	217	+ this.outDate = outDate;
	218	+ }
	219	+
	220	+ public String getClassify() {
	221	+ return classify;
	222	+ }
	223	+
	224	+ public void setClassify(String classify) {
	225	+ this.classify = classify;
	226	+ }
	227	+
	228	+ public Map<String, Object> getReferral() {
	229	+ return referral;
	230	+ }
	231	+
	232	+ public void setReferral(Map<String, Object> referral) {
	233	+ this.referral = referral;
	234	+ }
	235	+
204	236	public Integer getIsAppCreate() {
205	237	return isAppCreate;
206	238	}
...	...	@@ -947,6 +979,9 @@
947	979	postReviewModel.setFollowupDate(followupDate);
948	980	postReviewModel.setName(name);
949	981	postReviewModel.setStandard(standard);
	982	+ postReviewModel.setOutDate(DateUtil.parseYMD(outDate));
	983	+ postReviewModel.setClassify(classify);
	984	+ postReviewModel.setReferral(referral);
950	985	return postReviewModel;
951	986	}
952	987	}

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.pojo.PostReviewModel;
6	6
7	7	import java.io.Serializable;
	8	+import java.util.Date;
8	9	import java.util.List;
9	10	import java.util.Map;
10	11
11	12
...	...	@@ -189,7 +190,13 @@
189	190	private String followupDate;
190	191	//国家规范版本号
191	192	private String standard;
	193	+ //出院时间
	194	+ private String outDate;
	195	+ //分类
	196	+ private String classify;
192	197
	198	+ //转诊
	199	+ private Map<String,Object> referral;
193	200
194	201	public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
195	202	setZyzlState(postReviewModel.getZyzlState());
196	203
...	...	@@ -273,7 +280,35 @@
273	280	setFollowupDate(postReviewModel.getFollowupDate());
274	281	setName(postReviewModel.getName());
275	282	setStandard(postReviewModel.getStandard());
	283	+ setOutDate(DateUtil.getyyyy_MM_dd(postReviewModel.getOutDate()));
	284	+ setClassify(postReviewModel.getClassify());
	285	+ setReferral(postReviewModel.getReferral());
276	286	return this;
	287	+ }
	288	+
	289	+
	290	+ public String getOutDate() {
	291	+ return outDate;
	292	+ }
	293	+
	294	+ public void setOutDate(String outDate) {
	295	+ this.outDate = outDate;
	296	+ }
	297	+
	298	+ public String getClassify() {
	299	+ return classify;
	300	+ }
	301	+
	302	+ public void setClassify(String classify) {
	303	+ this.classify = classify;
	304	+ }
	305	+
	306	+ public Map<String, Object> getReferral() {
	307	+ return referral;
	308	+ }
	309	+
	310	+ public void setReferral(Map<String, Object> referral) {
	311	+ this.referral = referral;
277	312	}
278	313
279	314	public Integer getIsAppCreate() {