jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 127 additions and 8 deletions

...	...	@@ -147,18 +147,48 @@
147	147	private String checkDoctor;
148	148	//体检日期
149	149	private Date checkDate;
150		- //隆化-编号
151		- private String code;
152		-
153	150	/**
154	151	* 隆化儿保需求问题2022.1.4
155	152	*/
	153	+ //隆化-编号
	154	+ private String code;
	155	+
156	156	//轻度贫血
157	157	private Map<String,String> mildAnaemia;
158	158	//中度贫血
159	159	private Map<String,String> moderateAnaemia;
160	160	//心脏杂音
161	161	private Map<String,String> heartMurmur;
	162	+ //其他
	163	+ private String other;
	164	+ //医生电子签名
	165	+ private String doctorSign;
	166	+ //高危因素
	167	+ private List<String> highRisk;
	168	+
	169	+ public List<String> getHighRisk() {
	170	+ return highRisk;
	171	+ }
	172	+
	173	+ public void setHighRisk(List<String> highRisk) {
	174	+ this.highRisk = highRisk;
	175	+ }
	176	+
	177	+ public String getDoctorSign() {
	178	+ return doctorSign;
	179	+ }
	180	+
	181	+ public void setDoctorSign(String doctorSign) {
	182	+ this.doctorSign = doctorSign;
	183	+ }
	184	+
	185	+ public String getOther() {
	186	+ return other;
	187	+ }
	188	+
	189	+ public void setOther(String other) {
	190	+ this.other = other;
	191	+ }
162	192
163	193	public Map<String, String> getMildAnaemia() {
164	194	return mildAnaemia;

...	...	@@ -51,8 +51,17 @@
51	51
52	52
53	53	private String sort;
	54	+ //高危因素
	55	+ private List<String> highRisk;
54	56
	57	+ public List<String> getHighRisk() {
	58	+ return highRisk;
	59	+ }
55	60
	61	+ public void setHighRisk(List<String> highRisk) {
	62	+ this.highRisk = highRisk;
	63	+ }
	64	+
56	65	//电话
57	66	private String phon;
58	67
...	...	@@ -242,6 +251,9 @@
242	251	}
243	252	if (StringUtils.isNotEmpty(phon)) {
244	253	condition = condition.and("phon", phon, MongoOper.IS);
	254	+ }
	255	+ if (CollectionUtils.isNotEmpty(highRisk)) {
	256	+ condition = condition.and("highRisk", highRisk, MongoOper.IN);
245	257	}
246	258	Criteria c = null;
247	259	//月龄

...	...	@@ -133,11 +133,18 @@
133	133	model.setYsyj(request.getYsyj());
134	134	model.setCheckDoctor(request.getCheckDoctor());
135	135	model.setCheckDate(DateUtil.parseYMD(request.getCheckDate()));
	136	+ //隆化-编号
136	137	model.setCode(request.getCode());
137	138	//隆化需求-贫血轻度中度，心脏杂音
138	139	model.setMildAnaemia(request.getMildAnaemia());
139	140	model.setModerateAnaemia(request.getModerateAnaemia());
140	141	model.setHeartMurmur(request.getHeartMurmur());
	142	+ //隆化-其他
	143	+ model.setOther(request.getOther());
	144	+ //隆化-电子签名
	145	+ model.setDoctorSign(request.getDoctorSign());
	146	+ //高危因素
	147	+ model.setHighRisk(request.getHighRisk());
141	148
142	149	return model;
143	150	}
...	...	@@ -476,6 +483,10 @@
476	483	}
477	484	if (babyQuery.getBirthEnd() != null) {
478	485	babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd()));
	486	+ }
	487	+ //高危筛选
	488	+ if (CollectionUtils.isNotEmpty(babyQuery.getHighRisk())) {
	489	+ babyQuery.setHighRisk(babyQuery.getHighRisk());
479	490	}
480	491
481	492	babyKindergartenCheckModelList = babyKindergartenCheckService.queryAll(babyQuery);

...	...	@@ -157,17 +157,51 @@
157	157	private String checkDoctor;
158	158	//体检日期
159	159	private String checkDate;
160		- //隆化-编号
161		- private String code;
162	160	/**
163	161	* 隆化儿保需求问题2022.1.4
164	162	*/
	163	+ //隆化-编号
	164	+ private String code;
	165	+
165	166	//轻度贫血
166	167	private Map<String,String> mildAnaemia;
167	168	//中度贫血
168	169	private Map<String,String> moderateAnaemia;
169	170	//心脏杂音
170	171	private Map<String,String> heartMurmur;
	172	+
	173	+ //其他
	174	+ private String other;
	175	+
	176	+ //医生电子签名
	177	+ private String doctorSign;
	178	+
	179	+ //高危因素
	180	+ private List<String> highRisk;
	181	+
	182	+ public List<String> getHighRisk() {
	183	+ return highRisk;
	184	+ }
	185	+
	186	+ public void setHighRisk(List<String> highRisk) {
	187	+ this.highRisk = highRisk;
	188	+ }
	189	+
	190	+ public String getDoctorSign() {
	191	+ return doctorSign;
	192	+ }
	193	+
	194	+ public void setDoctorSign(String doctorSign) {
	195	+ this.doctorSign = doctorSign;
	196	+ }
	197	+
	198	+ public String getOther() {
	199	+ return other;
	200	+ }
	201	+
	202	+ public void setOther(String other) {
	203	+ this.other = other;
	204	+ }
171	205
172	206	public Map<String, String> getMildAnaemia() {
173	207	return mildAnaemia;

...	...	@@ -155,18 +155,50 @@
155	155	private String checkDoctor;
156	156	//体检日期
157	157	private String checkDate;
158		- //隆化-编号
159		- private String code;
160		-
161	158	/**
162	159	* 隆化儿保需求问题2022.1.4
163	160	*/
	161	+ //隆化-编号
	162	+ private String code;
164	163	//轻度贫血
165	164	private Map<String,String> mildAnaemia;
166	165	//中度贫血
167	166	private Map<String,String> moderateAnaemia;
168	167	//心脏杂音
169	168	private Map<String,String> heartMurmur;
	169	+
	170	+ //其他
	171	+ private String other;
	172	+
	173	+ //医生电子签名
	174	+ private String doctorSign;
	175	+
	176	+ //高危因素
	177	+ private List<String> highRisk;
	178	+
	179	+ public List<String> getHighRisk() {
	180	+ return highRisk;
	181	+ }
	182	+
	183	+ public void setHighRisk(List<String> highRisk) {
	184	+ this.highRisk = highRisk;
	185	+ }
	186	+
	187	+ public String getDoctorSign() {
	188	+ return doctorSign;
	189	+ }
	190	+
	191	+ public void setDoctorSign(String doctorSign) {
	192	+ this.doctorSign = doctorSign;
	193	+ }
	194	+
	195	+ public String getOther() {
	196	+ return other;
	197	+ }
	198	+
	199	+ public void setOther(String other) {
	200	+ this.other = other;
	201	+ }
170	202
171	203	public Map<String, String> getMildAnaemia() {
172	204	return mildAnaemia;