jiangjiazhi / regional-platform

Authored by wtt about 5 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 75 additions and 6 deletions

...	...	@@ -66,7 +66,7 @@
66	66	* 访视类型
67	67	*/
68	68	public enum TypeEnum {
69		- SMFS(1, "上门访视"), DHFS(2, "电话访视"),WJTS(3, "问卷访视");
	69	+ SMFS(1, "上门访视"), DHFS(2, "电话访视"),WJTS(3, "问卷访视"),WXFS(4, "微信访视");
70	70	private int id;
71	71	private String name;
72	72

...	...	@@ -184,6 +184,23 @@
184	184	antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
185	185	}
186	186	}
	187	+ /滦平 start 20201105 /
	188	+ //初诊时间是产检时间+type=2
	189	+ if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCzTime())){
	190	+ String nextDateStr = antExManagerQueryRequest.getCzTime();
	191	+ String[] dates = nextDateStr.split(" - ");
	192	+
	193	+ antExRecordQuery.setCheckTimeStart(DateUtil.parseYMD(dates[0]));
	194	+ if (dates.length == 2) {
	195	+ antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1]));
	196	+ }
	197	+ antExRecordQuery.setType(2);
	198	+ }
	199	+ //产检医生
	200	+ if(StringUtils.isNotEmpty(antExManagerQueryRequest.getCheckDoctor())){
	201	+ antExRecordQuery.setcId(antExManagerQueryRequest.getCheckDoctor());
	202	+ }
	203	+ /滦平 end /
187	204
188	205	//预约产检日期
189	206	if (StringUtils.isNotEmpty(antExManagerQueryRequest.getNextTime())) {

...	...	@@ -2314,6 +2314,9 @@
2314	2314	if (contactReason != null) {
2315	2315	contactReasonStr = PostpartumFollowMakeEnums.ContactReasonEnum.getTitle(contactReason);
2316	2316	}
	2317	+ //访视医生
	2318	+ matdeliverFollowListResult.setVisitDoctor(CommonsHelper.getUserName(model.getVisitDoctor(), usersService));
	2319	+ ;
2317	2320	}
2318	2321	matdeliverFollowListResult.setCauseFailure(contactReasonStr);
2319	2322	}

...	...	@@ -576,9 +576,11 @@
576	576	// cnames.put("visitAffirm", "产妇确认");
577	577	cnames.put("makeType", "访视类型");
578	578	cnames.put("visitResult", "访视结果");
	579	+ cnames.put("visitDoctor", "访视医生");
579	580	cnames.put("nextVisitDate", "下次随访");
580	581
581	582	List<Map<String, Object>> results = new ArrayList<>();
	583	+ results.add(new HashMap <String, Object>());
582	584	if (object != null) {
583	585	Map m = (Map) object;
584	586	Object res = m.get("matdeliverFollowListResults");
...	...	@@ -604,6 +606,7 @@
604	606	// result.put("visitAffirm", mf.getVisitAffirm());
605	607	result.put("makeType", mf.getMakeType());
606	608	result.put("visitResult", mf.getVisitResult());
	609	+ result.put("visitDoctor", mf.getVisitDoctor());//20201105 滦平新增访视医生，都会加上
607	610	result.put("nextVisitDate", mf.getNextVisitDate());
608	611	results.add(result);
609	612	}

...	...	@@ -3077,9 +3077,14 @@
3077	3077	data.put("NT", sive.getnT()); //2020-09-30 医生反馈两边单位保持mm
3078	3078	}
3079	3079	data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院)
3080		- data.put("T21", sive.getT21());//既往T21
3081		- data.put("T18", sive.getT18());//既往T18
3082		- data.put("NTD", sive.getnTD());//既往NTD
	3080	+// data.put("T21", sive.getT21());//既往T21
	3081	+// data.put("T18", sive.getT18());//既往T18
	3082	+// data.put("NTD", sive.getnTD());//既往NTD
	3083	+
	3084	+ data.put("T21","");//既往T21
	3085	+ data.put("T18","");//既往T18
	3086	+ data.put("NTD","");//既往NTD
	3087	+
3083	3088	data.put("ARMethod", sive.getaRMethod());//辅助生殖方法
3084	3089	data.put("ExtractionDate", sive.getExtractionDate());//辅助生殖之提取日期
3085	3090	data.put("TransferDate", sive.getTransferDate());//辅助生殖之移植日期

...	...	@@ -5,6 +5,8 @@
5	5	import com.lyms.platform.common.utils.StringUtils;
6	6	import org.apache.commons.lang.math.NumberUtils;
7	7
	8	+import java.util.Date;
	9	+
8	10	/**
9	11	*
10	12	* 产检管理查询
...	...	@@ -13,6 +15,14 @@
13	15	*/
14	16	@Form
15	17	public class AntExManagerQueryRequest extends BasePageQueryRequest {
	18	+ /滦平 start 20201105 /
	19	+ //产检医生
	20	+ private String checkDoctor;
	21	+ //产检日期(初诊时间)
	22	+ private String czTime;
	23	+
	24	+ /滦平 end /
	25	+
16	26	//中药治疗 yes no，空或者no都是no
17	27	private String zyzlState;
18	28	//中医外治治疗
...	...	@@ -129,6 +139,26 @@
129	139
130	140	public String getZyzlState() {
131	141	return zyzlState;
	142	+ }
	143	+
	144	+ public String getCheckDoctor() {
	145	+ return checkDoctor;
	146	+ }
	147	+
	148	+ public void setCheckDoctor(String checkDoctor) {
	149	+ this.checkDoctor = checkDoctor;
	150	+ }
	151	+
	152	+ public String getCzTime() {
	153	+ return czTime;
	154	+ }
	155	+
	156	+ public void setCzTime(String czTime) {
	157	+ this.czTime = czTime;
	158	+ }
	159	+
	160	+ public void setCurrent(boolean current) {
	161	+ isCurrent = current;
132	162	}
133	163
134	164	public void setZyzlState(String zyzlState) {

...	...	@@ -42,7 +42,7 @@
42	42	*/
43	43	private Integer contactResult;
44	44	/**
45		- * 预约访视类型（1-上门访视、2-电话访视）
	45	+ * 预约访视类型（1-上门访视、2-电话访视 3 问卷访视 4 微信访视）
46	46	*/
47	47	private Integer makeType;
48	48	/**

...	...	@@ -9,8 +9,11 @@
9	9	* @discription 产后随访列表返回对象
10	10	*/
11	11	public class MatdeliverFollowListResult {
12		-
13	12	/**
	13	+ * 访视医生
	14	+ */
	15	+ private String visitDoctor;
	16	+ /**
14	17	* 分娩记录主键id
15	18	*/
16	19	private String id;
...	...	@@ -254,6 +257,14 @@
254	257
255	258	public void setHighRiskFactors(List<Map<String, Object>> highRiskFactors) {
256	259	this.highRiskFactors = highRiskFactors;
	260	+ }
	261	+
	262	+ public String getVisitDoctor() {
	263	+ return visitDoctor;
	264	+ }
	265	+
	266	+ public void setVisitDoctor(String visitDoctor) {
	267	+ this.visitDoctor = visitDoctor;
257	268	}
258	269
259	270	public String getHujiAddress() {