jiangjiazhi / regional-platform

Commit 39298543845b21f14003ac92be6384cd49a85144

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

医生分配医生团队和查询变更记录

Showing 7 changed files with 94 additions and 15 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/DoctorTeamMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TeamService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java

...	...	@@ -24,6 +24,6 @@
24	24
25	25	List<UsersQuery> queryListDoctor(UsersQuery usersQuery);
26	26
27		- int allotDoctorTeam(Users users);
	27	+ int allotDoctorTeam(UsersQuery usersQuery);
28	28	}

...	...	@@ -45,6 +45,43 @@
45	45	private String teamName;
46	46	private String orgName;
47	47	private String deptName;
	48	+ //变更原因
	49	+ private String updateCause;
	50	+ private Integer userId;
	51	+ private Integer oldDoctorTeamId;//变更前团队id
	52	+ private String oldTeamName;//变更前团队名称
	53	+
	54	+ public Integer getOldDoctorTeamId() {
	55	+ return oldDoctorTeamId;
	56	+ }
	57	+
	58	+ public void setOldDoctorTeamId(Integer oldDoctorTeamId) {
	59	+ this.oldDoctorTeamId = oldDoctorTeamId;
	60	+ }
	61	+
	62	+ public String getOldTeamName() {
	63	+ return oldTeamName;
	64	+ }
	65	+
	66	+ public void setOldTeamName(String oldTeamName) {
	67	+ this.oldTeamName = oldTeamName;
	68	+ }
	69	+
	70	+ public Integer getUserId() {
	71	+ return userId;
	72	+ }
	73	+
	74	+ public void setUserId(Integer userId) {
	75	+ this.userId = userId;
	76	+ }
	77	+
	78	+ public String getUpdateCause() {
	79	+ return updateCause;
	80	+ }
	81	+
	82	+ public void setUpdateCause(String updateCause) {
	83	+ this.updateCause = updateCause;
	84	+ }
48	85
49	86	public Integer getDoctorTeamId() {
50	87	return doctorTeamId;

...	...	@@ -88,7 +88,7 @@
88	88	</if>
89	89
90	90	<if test="teamName != null and teamName != ''">
91		- and team_name = #{teamName,jdbcType=VARCHAR}
	91	+ and team_name like concat("%",#{teamName,jdbcType=VARCHAR},"%")
92	92	</if>
93	93	</where>
94	94	</sql>
...	...	@@ -130,7 +130,7 @@
130	130	</if>
131	131
132	132	<if test="name != null and name != ''">
133		- and u.name = #{teamName,jdbcType=VARCHAR}
	133	+ and u.name like concat("%",#{name,jdbcType=VARCHAR},"%")
134	134	</if>
135	135
136	136	<if test="deptId != null and deptId >= 0">
...	...	@@ -164,7 +164,7 @@
164	164	<include refid="DoctorCondition"/>
165	165	</select>
166	166
167		- <update id="allotDoctorTeam" parameterType="com.lyms.platform.permission.model.Users">
	167	+ <update id="allotDoctorTeam" parameterType="com.lyms.platform.permission.model.UsersQuery">
168	168	update users
169	169	<set>
170	170	<if test="doctorTeamId != null and doctorTeamId >=0 ">

...	...	@@ -18,15 +18,25 @@
18	18
19	19	@Id
20	20	private String id;
21		-
22		- private String teamName;//团队名称
23	21	//团队包含的医生
24	22	private List<String> doctorIdArr;
25	23	private String hospitalId;
26	24	private String hospitalName;
27		-
28		- private Date created;
29	25	private Date modified;
	26	+
	27	+ private Integer userId;//医生id、用户id
	28	+ private String name;//医生名称
	29	+ private Integer oldDoctorTeamId;//变更前团队id
	30	+ private String oldTeamName;//变更前团队名称
	31	+ private Integer doctorTeamId;//团队id
	32	+ private String teamName;//团队名称
	33	+ private Integer orgId;//机构id
	34	+ private String orgName;//机构名称
	35	+ private Integer deptId;//部门id
	36	+ private String deptName;//部门名称
	37	+ private String updateCause;//变更原因
	38	+ private Date created;//创建时间
	39	+
30	40
31	41
32	42

...	...	@@ -14,6 +14,7 @@
14	14	import com.lyms.platform.permission.model.Users;
15	15	import com.lyms.platform.permission.model.UsersQuery;
16	16	import com.lyms.platform.permission.service.UsersService;
	17	+import com.lyms.platform.pojo.TeamModel;
17	18	import org.springframework.beans.factory.annotation.Autowired;
18	19	import org.springframework.stereotype.Controller;
19	20	import org.springframework.web.bind.annotation.*;
20	21
21	22
...	...	@@ -182,10 +183,22 @@
182	183	@RequestMapping(value = "/allotDoctorTeam", method = RequestMethod.POST)
183	184	@ResponseBody
184	185	@TokenRequired
185		- public BaseResponse allotDoctorTeam(@RequestBody Users users, HttpServletRequest request, HttpServletResponse response) {
	186	+ public BaseResponse allotDoctorTeam(@RequestBody UsersQuery usersQuery, HttpServletRequest request, HttpServletResponse response) {
186	187	BaseResponse baseResponse=new BaseResponse();
187		- baseResponse=teamService.allotDoctorTeam(users);
	188	+ baseResponse=teamService.allotDoctorTeam(usersQuery);
188	189	return baseResponse;
	190	+ }
	191	+
	192	+ /**
	193	+ *变更记录
	194	+ * @param teamModel
	195	+ * @return
	196	+ */
	197	+ @RequestMapping(value = "/queryUpdateRecord", method = RequestMethod.GET)
	198	+ @ResponseBody
	199	+ @TokenRequired
	200	+ public BaseResponse queryUpdateRecord(TeamModel teamModel) {
	201	+ return teamService.queryUpdateRecord(teamModel);
189	202	}
190	203	}

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.permission.model.DoctorTeam;
8	8	import com.lyms.platform.permission.model.Users;
9	9	import com.lyms.platform.permission.model.UsersQuery;
	10	+import com.lyms.platform.pojo.TeamModel;
10	11
11	12	/**
12	13	* Created by cpf on 2021-10-15 15:25:13
...	...	@@ -34,6 +35,8 @@
34	35
35	36	FrontEndResult queryListDoctor(UsersQuery usersQuery);
36	37
37		- BaseResponse allotDoctorTeam(Users users);
	38	+ BaseResponse allotDoctorTeam(UsersQuery usersQuery);
	39	+
	40	+ BaseResponse queryUpdateRecord(TeamModel teamModel);
38	41	}

...	...	@@ -17,7 +17,8 @@
17	17	import com.lyms.platform.permission.service.UsersService;
18	18	import com.lyms.platform.pojo.TeamModel;
19	19	import org.apache.commons.lang3.StringUtils;
20		-import org.springframework.beans.BeanUtils;
	20	+//import org.springframework.beans.BeanUtils;
	21	+import com.lyms.platform.common.utils.BeanUtils;
21	22	import org.springframework.beans.factory.annotation.Autowired;
22	23	import org.springframework.data.domain.Sort;
23	24	import org.springframework.data.mongodb.core.MongoTemplate;
...	...	@@ -106,7 +107,7 @@
106	107	@Override
107	108	public BaseResponse addTeam(TeamModelRequest teamReq) {
108	109	TeamModel teamModel=new TeamModel();
109		- BeanUtils.copyProperties(teamReq,teamModel);
	110	+ BeanUtils.copy(teamReq,teamModel);
110	111	teamModel.setCreated(new Date());
111	112	// List<String> doctorIdArr=new ArrayList<>();
112	113	// Collections.copy(doctorIdArr,teamModel.getDoctorIdArr());
113	114
114	115
...	...	@@ -296,17 +297,32 @@
296	297	}
297	298
298	299	@Override
299		- public BaseResponse allotDoctorTeam(Users users) {
	300	+ public BaseResponse allotDoctorTeam(UsersQuery usersQuery) {
300	301	BaseResponse baseResponse=new BaseResponse();
301	302	int result= 0;
302	303	try {
303		- result = doctorTeamMapper.allotDoctorTeam(users);
	304	+ if(StringUtils.isNotEmpty(usersQuery.getUpdateCause())){
	305	+ TeamModel teamModel=new TeamModel();
	306	+ BeanUtils.copy(usersQuery, teamModel);
	307	+ teamModel.setUserId(usersQuery.getId());
	308	+ mongoTemplate.save(teamModel);
	309	+ }
	310	+ result = doctorTeamMapper.allotDoctorTeam(usersQuery);
304	311	baseResponse.setErrormsg("成功").setErrorcode(result);
305	312	} catch (Exception e) {
306	313	e.printStackTrace();
307	314	baseResponse.setErrormsg("失败").setErrorcode(result).setObject(e.getMessage());
308	315	}
309	316	return baseResponse;
	317	+ }
	318	+
	319	+ @Override
	320	+ public BaseResponse queryUpdateRecord(TeamModel teamModel) {
	321	+ Criteria criteria=new Criteria();
	322	+ criteria.and("userId").is(teamModel.getUserId());
	323	+ List<TeamModel> tLst=mongoTemplate.find(new Query(criteria).with(new Sort(new Sort.Order(Sort.Direction.DESC,"created"))),TeamModel.class);
	324	+ return new BaseObjectResponse()
	325	+ .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(tLst);
310	326	}
311	327
312	328