jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e12744dda4aa90b58b7a0ea7ccdf6b01aac5dd14

Authored by shiyang
1 parent 3929854384
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

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

Showing 14 changed files with 129 additions and 74 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ e12744d
... ... @@ -260,9 +260,9 @@
260 260 logger.info("antex find patient by id is null. parentId:" + antEx.getParentId());
261 261 return null;
262 262 }
263   - antExRecordModel.setTeamIdOld(antEx.getTeamIdOld());//产团
264   - antExRecordModel.setTeamIdNew(antEx.getTeamIdNew());
265   - antExRecordModel.setReason(antEx.getReason());
  263 +// antExRecordModel.setTeamIdOld(antEx.getTeamIdOld());//产团
  264 +// antExRecordModel.setTeamIdNew(antEx.getTeamIdNew());
  265 +// antExRecordModel.setReason(antEx.getReason());
266 266 return antExRecordModel;
267 267 }
268 268  
... ... @@ -345,9 +345,9 @@
345 345 logger.info("antexc find patient by id is null. parentId:" + antExChuModel.getParentId());
346 346 return null;
347 347 }
348   - antExRecordModel.setTeamIdOld(antExChuModel.getTeamIdOld());//产团
349   - antExRecordModel.setTeamIdNew(antExChuModel.getTeamIdNew());
350   - antExRecordModel.setReason(antExChuModel.getReason());
  348 +// antExRecordModel.setTeamIdOld(antExChuModel.getTeamIdOld());//产团
  349 +// antExRecordModel.setTeamIdNew(antExChuModel.getTeamIdNew());
  350 +// antExRecordModel.setReason(antExChuModel.getReason());
351 351 return antExRecordModel;
352 352 }
353 353  
platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml View file @ e12744d
... ... @@ -80,15 +80,15 @@
80 80 <where>
81 81 1 = 1
82 82 <if test="id != null and id >= 0">
83   - and id = #{id,jdbcType=INTEGER}
  83 + and d.id = #{id,jdbcType=INTEGER}
84 84 </if>
85 85  
86 86 <if test="orgId != null and orgId >= 0">
87   - and org_id = #{orgId,jdbcType=INTEGER}
  87 + and d.org_id = #{orgId,jdbcType=INTEGER}
88 88 </if>
89 89  
90 90 <if test="teamName != null and teamName != ''">
91   - and team_name like concat("%",#{teamName,jdbcType=VARCHAR},"%")
  91 + and d.team_name like concat("%",#{teamName,jdbcType=VARCHAR},"%")
92 92 </if>
93 93 </where>
94 94 </sql>
... ... @@ -103,8 +103,8 @@
103 103 </select>
104 104  
105 105 <select id="queryListDoctorTeamCount" resultType="int" parameterType="com.lyms.platform.permission.model.UsersQuery">
106   - select count(DISTINCT id)
107   - from doctor_team
  106 + select count(DISTINCT d.id)
  107 + from doctor_team d left join organization o on d.org_id=o.id
108 108 <include refid="DoctorTeamCondition"/>
109 109 </select>
110 110  
... ... @@ -120,7 +120,8 @@
120 120  
121 121 <sql id="DoctorCondition">
122 122 <where>
123   - 1 = 1
  123 + u.yn=1 and u.enable=1
  124 +
124 125 <if test="id != null and id >= 0">
125 126 and u.id = #{id,jdbcType=INTEGER}
126 127 </if>
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ e12744d
... ... @@ -485,24 +485,15 @@
485 485 //孕妇NT
486 486 private String wcNt;
487 487  
488   - private String teamIdOld;//旧医生团队
489   - private String teamIdNew;//新医生团队
  488 + private String teamId;//医生团队
490 489 private String reason;//换团队的原因
491 490  
492   - public String getTeamIdOld() {
493   - return teamIdOld;
  491 + public String getTeamId() {
  492 + return teamId;
494 493 }
495 494  
496   - public void setTeamIdOld(String teamIdOld) {
497   - this.teamIdOld = teamIdOld;
498   - }
499   -
500   - public String getTeamIdNew() {
501   - return teamIdNew;
502   - }
503   -
504   - public void setTeamIdNew(String teamIdNew) {
505   - this.teamIdNew = teamIdNew;
  495 + public void setTeamId(String teamId) {
  496 + this.teamId = teamId;
506 497 }
507 498  
508 499 public String getReason() {
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ e12744d
... ... @@ -389,24 +389,16 @@
389 389 */
390 390 private String sieveType;
391 391  
392   - private String teamIdOld;//旧医生团队
393   - private String teamIdNew;//新医生团队
  392 + private String teamId;//医生团队
394 393 private String reason;//换团队的原因
395 394  
396   - public String getTeamIdOld() {
397   - return teamIdOld;
398   - }
399 395  
400   - public void setTeamIdOld(String teamIdOld) {
401   - this.teamIdOld = teamIdOld;
  396 + public String getTeamId() {
  397 + return teamId;
402 398 }
403 399  
404   - public String getTeamIdNew() {
405   - return teamIdNew;
406   - }
407   -
408   - public void setTeamIdNew(String teamIdNew) {
409   - this.teamIdNew = teamIdNew;
  400 + public void setTeamId(String teamId) {
  401 + this.teamId = teamId;
410 402 }
411 403  
412 404 public String getReason() {
platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java View file @ e12744d
... ... @@ -10,7 +10,7 @@
10 10 import java.util.List;
11 11  
12 12 /**
13   - * 医院团队
  13 + * 医院团队变更记录
14 14 */
15 15 @Document(collection = "lyms_team")
16 16 @Data
... ... @@ -24,6 +24,9 @@
24 24 private String hospitalName;
25 25 private Date modified;
26 26  
  27 + /**
  28 + * 配置功能页面
  29 + */
27 30 private Integer userId;//医生id、用户id
28 31 private String name;//医生名称
29 32 private Integer oldDoctorTeamId;//变更前团队id
... ... @@ -36,8 +39,6 @@
36 39 private String deptName;//部门名称
37 40 private String updateCause;//变更原因
38 41 private Date created;//创建时间
39   -
40   -
41 42  
42 43  
43 44 }
platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java View file @ e12744d
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import com.lyms.platform.common.result.BaseModel;
  4 +import lombok.Data;
  5 +import org.springframework.data.annotation.Id;
  6 +import org.springframework.data.mongodb.core.mapping.Document;
  7 +
  8 +import java.util.Date;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 孕检 变更团队记录
  13 + */
  14 +@Document(collection = "lyms_TeamRecordUpdateModel")
  15 +@Data
  16 +public class TeamRecordUpdateModel extends BaseModel {
  17 +
  18 + @Id
  19 + private String id;
  20 +
  21 + private String patientName;//患者姓名
  22 + private Integer patientAge;//患者年龄
  23 + private String patientPhone;//患者电话
  24 + private String patientGestation;//患者孕周
  25 + private String patientDueDate;//患者预产期
  26 + private String doctorName;//医生名称
  27 + private String oldTeamName;//变更前团队名称
  28 + private String teamName;//团队名称
  29 + private String updateCause;//变更原因
  30 + private Date created;//创建时间
  31 + private Date startTime;//开始时间
  32 + private Date endTime;//开始时间
  33 +
  34 +
  35 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java View file @ e12744d
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.permission.model.UsersQuery;
16 16 import com.lyms.platform.permission.service.UsersService;
17 17 import com.lyms.platform.pojo.TeamModel;
  18 +import com.lyms.platform.pojo.TeamRecordUpdateModel;
18 19 import org.springframework.beans.factory.annotation.Autowired;
19 20 import org.springframework.stereotype.Controller;
20 21 import org.springframework.web.bind.annotation.*;
... ... @@ -199,6 +200,18 @@
199 200 @TokenRequired
200 201 public BaseResponse queryUpdateRecord(TeamModel teamModel) {
201 202 return teamService.queryUpdateRecord(teamModel);
  203 + }
  204 +
  205 + /**
  206 + *患者更换团队记录
  207 + * @param recordUpdateModel
  208 + * @return
  209 + */
  210 + @RequestMapping(value = "/queryPatientUpdateRecord", method = RequestMethod.GET)
  211 + @ResponseBody
  212 + @TokenRequired
  213 + public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) {
  214 + return teamService.queryPatientUpdateRecord(recordUpdateModel,page,limit);
202 215 }
203 216 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ e12744d
... ... @@ -2504,13 +2504,15 @@
2504 2504 //围场孕妇产检新加字段nt
2505 2505 map.put("wcNt",data.getWcNt());
2506 2506  
2507   -// map.put("teamName","");//
2508   -// if(null!=data.getTeamIdNew()){
2509   -// TeamModel teamModel=this.mongoTemplate.findOne(new Query(Criteria.where("_id").is(data.getTeamIdNew())),TeamModel.class);
2510   -// map.put("teamName",teamModel.getTeamName());
2511   -// }
  2507 + //医生所在团队
  2508 + DoctorTeam doctorTeam=new DoctorTeam();
  2509 + doctorTeam.setId(Integer.parseInt(data.getTeamId()));
  2510 + FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam);
  2511 + if(null!=frontEndResult.getData()){
  2512 + doctorTeam=(DoctorTeam) frontEndResult.getData().get(0);
  2513 + map.put("teamName",doctorTeam.getTeamName());
  2514 + }
2512 2515  
2513   -
2514 2516 br.setErrorcode(ErrorCodeConstants.SUCCESS);
2515 2517 br.setErrormsg("成功");
2516 2518 br.setData(map);
2517 2519  
... ... @@ -3119,16 +3121,16 @@
3119 3121 }
3120 3122  
3121 3123 //医生所在团队
3122   -// BaseObjectResponse tbase=teamService.getTeamByDocId(data.getCheckDoctor());
3123   -// if(null!=tbase.getData()){
3124   -// TeamModel tm=(TeamModel)(tbase.getData());
3125   -// teamName=tm.getTeamName();
3126   -// }
  3124 + DoctorTeam doctorTeam=new DoctorTeam();
  3125 + doctorTeam.setId(Integer.parseInt(data.getTeamId()));
  3126 + FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam);
  3127 + if(null!=frontEndResult.getData()){
  3128 + teamName=((DoctorTeam)(frontEndResult.getData().get(0))).getTeamName();
  3129 + }
3127 3130 }
3128 3131 map.put("checkDoctor", checkDoctor);
3129 3132  
3130   -// map.put("team",teamName);
3131   -
  3133 + map.put("teamName",teamName);
3132 3134 String hospital = "";
3133 3135 Organization organization = null;
3134 3136 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) {
... ... @@ -3416,12 +3418,6 @@
3416 3418 map.put("ssy", ssy); // 血压
3417 3419 map.put("szy", szy); // 血压
3418 3420 map.put("yn", data.getYn()); //
3419   -
3420   -// map.put("teamName","");//
3421   -// if(null!=data.getTeamIdNew()){
3422   -// TeamModel teamModel=this.mongoTemplate.findOne(new Query(Criteria.where("_id").is(data.getTeamIdNew())),TeamModel.class);
3423   -// map.put("teamName",teamModel.getTeamName());
3424   -// }
3425 3421  
3426 3422 br.setErrorcode(ErrorCodeConstants.SUCCESS);
3427 3423 br.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ e12744d
... ... @@ -1474,9 +1474,9 @@
1474 1474 examinationModel.setSieveType(sieveType);
1475 1475  
1476 1476 //产团
1477   - examinationModel.setTeamIdOld(teamIdOld);
1478   - examinationModel.setTeamIdNew(teamIdNew);
1479   - examinationModel.setReason(reason);
  1477 +// examinationModel.setTeamIdOld(teamIdOld);
  1478 +// examinationModel.setTeamIdNew(teamIdNew);
  1479 +// examinationModel.setReason(reason);
1480 1480  
1481 1481 return examinationModel;
1482 1482 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ e12744d
... ... @@ -2436,9 +2436,9 @@
2436 2436 }
2437 2437  
2438 2438 //产团
2439   - antExChuModel.setTeamIdOld(teamIdOld);
2440   - antExChuModel.setTeamIdNew(teamIdNew);
2441   - antExChuModel.setReason(reason);
  2439 +// antExChuModel.setTeamIdOld(teamIdOld);
  2440 +// antExChuModel.setTeamIdNew(teamIdNew);
  2441 +// antExChuModel.setReason(reason);
2442 2442  
2443 2443 return antExChuModel;
2444 2444 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ e12744d
... ... @@ -1337,9 +1337,9 @@
1337 1337 if(StringUtils.isNotEmpty(destModel.getWcNt())){
1338 1338 setWcNt(destModel.getWcNt());
1339 1339 }
1340   - setTeamIdNew(destModel.getTeamIdNew());
1341   - setTeamIdOld(destModel.getTeamIdOld());
1342   - setReason(destModel.getReason());
  1340 +// setTeamIdNew(destModel.getTeamIdNew());
  1341 +// setTeamIdOld(destModel.getTeamIdOld());
  1342 +// setReason(destModel.getReason());
1343 1343 return this;
1344 1344 }
1345 1345  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ e12744d
... ... @@ -2314,9 +2314,9 @@
2314 2314 setWcNt(antExChuModel.getWcNt());
2315 2315 }
2316 2316  
2317   - setTeamIdNew(antExChuModel.getTeamIdNew());
2318   - setTeamIdOld(antExChuModel.getTeamIdOld());
2319   - setReason(antExChuModel.getReason());
  2317 +// setTeamIdNew(antExChuModel.getTeamIdNew());
  2318 +// setTeamIdOld(antExChuModel.getTeamIdOld());
  2319 +// setReason(antExChuModel.getReason());
2320 2320 }
2321 2321 return this;
2322 2322 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TeamService.java View file @ e12744d
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.permission.model.Users;
9 9 import com.lyms.platform.permission.model.UsersQuery;
10 10 import com.lyms.platform.pojo.TeamModel;
  11 +import com.lyms.platform.pojo.TeamRecordUpdateModel;
11 12  
12 13 /**
13 14 * Created by cpf on 2021-10-15 15:25:13
... ... @@ -38,5 +39,7 @@
38 39 BaseResponse allotDoctorTeam(UsersQuery usersQuery);
39 40  
40 41 BaseResponse queryUpdateRecord(TeamModel teamModel);
  42 +
  43 + BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit);
41 44 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TeamServiceImpl.java View file @ e12744d
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.permission.model.DoctorTeam;
17 17 import com.lyms.platform.permission.service.UsersService;
18 18 import com.lyms.platform.pojo.TeamModel;
  19 +import com.lyms.platform.pojo.TeamRecordUpdateModel;
19 20 import org.apache.commons.lang3.StringUtils;
20 21 //import org.springframework.beans.BeanUtils;
21 22 import com.lyms.platform.common.utils.BeanUtils;
22 23  
... ... @@ -320,9 +321,31 @@
320 321 public BaseResponse queryUpdateRecord(TeamModel teamModel) {
321 322 Criteria criteria=new Criteria();
322 323 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 + List<TeamModel> tLst=mongoTemplate.find(new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")),TeamModel.class);
324 325 return new BaseObjectResponse()
325 326 .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(tLst);
  327 + }
  328 +
  329 + @Override
  330 + public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) {
  331 + Criteria criteria=new Criteria();
  332 + if(StringUtils.isNotEmpty(recordUpdateModel.getPatientName())){
  333 + criteria.and("patientName").regex(".*?\\" +recordUpdateModel.getPatientName()+ ".*");
  334 + }
  335 + if(StringUtils.isNotEmpty(recordUpdateModel.getDoctorName())){
  336 + criteria.and("doctorName").regex(".*?\\" +recordUpdateModel.getDoctorName()+ ".*");
  337 + }
  338 + if(StringUtils.isNotEmpty(recordUpdateModel.getTeamName())){
  339 + criteria.and("teamName").regex(".*?\\" +recordUpdateModel.getTeamName()+ ".*");
  340 + }
  341 + if(null!=recordUpdateModel.getStartTime()){
  342 + criteria.and("created").gte(recordUpdateModel.getStartTime());
  343 + }
  344 + if(null!=recordUpdateModel.getEndTime()){
  345 + criteria.and("created").lte(recordUpdateModel.getEndTime());
  346 + }
  347 + PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
  348 + return RespBuilder.buildSuccess(pageResult);
326 349 }
327 350  
328 351