jiangjiazhi / regional-platform

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 21 additions and 50 deletions

...	...	@@ -374,26 +374,17 @@
374	374	*/
375	375	private String sieveType;
376	376
377		- private String teamIdOld;//旧医生团队
378		- private String teamIdNew;//新医生团队
	377	+ private String teamId;//医生团队
379	378	private String reason;//换团队的原因
380	379
381		- public String getTeamIdOld() {
382		- return teamIdOld;
	380	+ public String getTeamId() {
	381	+ return teamId;
383	382	}
384	383
385		- public void setTeamIdOld(String teamIdOld) {
386		- this.teamIdOld = teamIdOld;
	384	+ public void setTeamId(String teamId) {
	385	+ this.teamId = teamId;
387	386	}
388	387
389		- public String getTeamIdNew() {
390		- return teamIdNew;
391		- }
392		-
393		- public void setTeamIdNew(String teamIdNew) {
394		- this.teamIdNew = teamIdNew;
395		- }
396		-
397	388	public String getReason() {
398	389	return reason;
399	390	}
...	...	@@ -1474,9 +1465,8 @@
1474	1465	examinationModel.setSieveType(sieveType);
1475	1466
1476	1467	//产团
1477		-// examinationModel.setTeamIdOld(teamIdOld);
1478		-// examinationModel.setTeamIdNew(teamIdNew);
1479		-// examinationModel.setReason(reason);
	1468	+ examinationModel.setTeamId(teamId);
	1469	+ examinationModel.setReason(reason);
1480	1470
1481	1471	return examinationModel;
1482	1472	}

...	...	@@ -551,26 +551,17 @@
551	551	}
552	552	/************************/
553	553
554		- private String teamIdOld;//旧医生团队
555		- private String teamIdNew;//新医生团队
	554	+ private String teamId;//医生团队
556	555	private String reason;//换团队的原因
557	556
558		- public String getTeamIdOld() {
559		- return teamIdOld;
	557	+ public String getTeamId() {
	558	+ return teamId;
560	559	}
561	560
562		- public void setTeamIdOld(String teamIdOld) {
563		- this.teamIdOld = teamIdOld;
	561	+ public void setTeamId(String teamId) {
	562	+ this.teamId = teamId;
564	563	}
565	564
566		- public String getTeamIdNew() {
567		- return teamIdNew;
568		- }
569		-
570		- public void setTeamIdNew(String teamIdNew) {
571		- this.teamIdNew = teamIdNew;
572		- }
573		-
574	565	public String getReason() {
575	566	return reason;
576	567	}
...	...	@@ -1337,9 +1328,8 @@
1337	1328	if(StringUtils.isNotEmpty(destModel.getWcNt())){
1338	1329	setWcNt(destModel.getWcNt());
1339	1330	}
1340		-// setTeamIdNew(destModel.getTeamIdNew());
1341		-// setTeamIdOld(destModel.getTeamIdOld());
1342		-// setReason(destModel.getReason());
	1331	+ setTeamId(destModel.getTeamId());
	1332	+ setReason(destModel.getReason());
1343	1333	return this;
1344	1334	}
1345	1335

...	...	@@ -671,26 +671,18 @@
671	671	}
672	672	/***********************************************/
673	673
674		- private String teamIdOld;//旧医生团队
675		- private String teamIdNew;//新医生团队
	674	+ private String teamId;//医生团队
676	675	private String reason;//换团队的原因
677	676
678		- public String getTeamIdOld() {
679		- return teamIdOld;
680		- }
681	677
682		- public void setTeamIdOld(String teamIdOld) {
683		- this.teamIdOld = teamIdOld;
	678	+ public String getTeamId() {
	679	+ return teamId;
684	680	}
685	681
686		- public String getTeamIdNew() {
687		- return teamIdNew;
	682	+ public void setTeamId(String teamId) {
	683	+ this.teamId = teamId;
688	684	}
689	685
690		- public void setTeamIdNew(String teamIdNew) {
691		- this.teamIdNew = teamIdNew;
692		- }
693		-
694	686	public String getReason() {
695	687	return reason;
696	688	}
...	...	@@ -2314,9 +2306,8 @@
2314	2306	setWcNt(antExChuModel.getWcNt());
2315	2307	}
2316	2308
2317		-// setTeamIdNew(antExChuModel.getTeamIdNew());
2318		-// setTeamIdOld(antExChuModel.getTeamIdOld());
2319		-// setReason(antExChuModel.getReason());
	2309	+ setTeamId(antExChuModel.getTeamId());
	2310	+ setReason(antExChuModel.getReason());
2320	2311	}
2321	2312	return this;
2322	2313	}