diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index 51ef737..03981c4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -260,9 +260,9 @@ public class AntExRecordService { logger.info("antex find patient by id is null. parentId:" + antEx.getParentId()); return null; } - antExRecordModel.setTeamIdOld(antEx.getTeamIdOld());//产团 - antExRecordModel.setTeamIdNew(antEx.getTeamIdNew()); - antExRecordModel.setReason(antEx.getReason()); +// antExRecordModel.setTeamIdOld(antEx.getTeamIdOld());//产团 +// antExRecordModel.setTeamIdNew(antEx.getTeamIdNew()); +// antExRecordModel.setReason(antEx.getReason()); return antExRecordModel; } @@ -345,9 +345,9 @@ public class AntExRecordService { logger.info("antexc find patient by id is null. parentId:" + antExChuModel.getParentId()); return null; } - antExRecordModel.setTeamIdOld(antExChuModel.getTeamIdOld());//产团 - antExRecordModel.setTeamIdNew(antExChuModel.getTeamIdNew()); - antExRecordModel.setReason(antExChuModel.getReason()); +// antExRecordModel.setTeamIdOld(antExChuModel.getTeamIdOld());//产团 +// antExRecordModel.setTeamIdNew(antExChuModel.getTeamIdNew()); +// antExRecordModel.setReason(antExChuModel.getReason()); return antExRecordModel; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml index 6624bad..d3dfddd 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/DoctorTeamMapper.xml @@ -80,15 +80,15 @@ delete from doctor_team where id = #{id,jdbcType=INTEGER} 1 = 1 - and id = #{id,jdbcType=INTEGER} + and d.id = #{id,jdbcType=INTEGER} - and org_id = #{orgId,jdbcType=INTEGER} + and d.org_id = #{orgId,jdbcType=INTEGER} - and team_name like concat("%",#{teamName,jdbcType=VARCHAR},"%") + and d.team_name like concat("%",#{teamName,jdbcType=VARCHAR},"%") @@ -103,8 +103,8 @@ delete from doctor_team where id = #{id,jdbcType=INTEGER} @@ -120,7 +120,8 @@ delete from doctor_team where id = #{id,jdbcType=INTEGER} - 1 = 1 + u.yn=1 and u.enable=1 + and u.id = #{id,jdbcType=INTEGER} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 4036338..e2178a6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -485,24 +485,15 @@ public class AntExChuModel extends BaseModel { //孕妇NT private String wcNt; - private String teamIdOld;//旧医生团队 - private String teamIdNew;//新医生团队 + private String teamId;//医生团队 private String reason;//换团队的原因 - public String getTeamIdOld() { - return teamIdOld; + public String getTeamId() { + return teamId; } - public void setTeamIdOld(String teamIdOld) { - this.teamIdOld = teamIdOld; - } - - public String getTeamIdNew() { - return teamIdNew; - } - - public void setTeamIdNew(String teamIdNew) { - this.teamIdNew = teamIdNew; + public void setTeamId(String teamId) { + this.teamId = teamId; } public String getReason() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 77d3095..40a8894 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -389,24 +389,16 @@ public class AntenatalExaminationModel extends BaseModel { */ private String sieveType; - private String teamIdOld;//旧医生团队 - private String teamIdNew;//新医生团队 + private String teamId;//医生团队 private String reason;//换团队的原因 - public String getTeamIdOld() { - return teamIdOld; - } - - public void setTeamIdOld(String teamIdOld) { - this.teamIdOld = teamIdOld; - } - public String getTeamIdNew() { - return teamIdNew; + public String getTeamId() { + return teamId; } - public void setTeamIdNew(String teamIdNew) { - this.teamIdNew = teamIdNew; + public void setTeamId(String teamId) { + this.teamId = teamId; } public String getReason() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java index fb643c5..556ac7b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamModel.java @@ -10,7 +10,7 @@ import java.util.Date; import java.util.List; /** - * 医院团队 + * 医院团队变更记录 */ @Document(collection = "lyms_team") @Data @@ -24,6 +24,9 @@ public class TeamModel extends BaseModel { private String hospitalName; private Date modified; + /** + * 配置功能页面 + */ private Integer userId;//医生id、用户id private String name;//医生名称 private Integer oldDoctorTeamId;//变更前团队id @@ -38,6 +41,4 @@ public class TeamModel extends BaseModel { private Date created;//创建时间 - - } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java new file mode 100644 index 0000000..84502fe --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TeamRecordUpdateModel.java @@ -0,0 +1,35 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import lombok.Data; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.List; + +/** + * 孕检 变更团队记录 + */ +@Document(collection = "lyms_TeamRecordUpdateModel") +@Data +public class TeamRecordUpdateModel extends BaseModel { + + @Id + private String id; + + private String patientName;//患者姓名 + private Integer patientAge;//患者年龄 + private String patientPhone;//患者电话 + private String patientGestation;//患者孕周 + private String patientDueDate;//患者预产期 + private String doctorName;//医生名称 + private String oldTeamName;//变更前团队名称 + private String teamName;//团队名称 + private String updateCause;//变更原因 + private Date created;//创建时间 + private Date startTime;//开始时间 + private Date endTime;//开始时间 + + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java index a717c84..b89b87b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TeamController.java @@ -15,6 +15,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.TeamModel; +import com.lyms.platform.pojo.TeamRecordUpdateModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -200,4 +201,16 @@ public class TeamController extends BaseController { public BaseResponse queryUpdateRecord(TeamModel teamModel) { return teamService.queryUpdateRecord(teamModel); } + + /** + *患者更换团队记录 + * @param recordUpdateModel + * @return + */ + @RequestMapping(value = "/queryPatientUpdateRecord", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) { + return teamService.queryPatientUpdateRecord(recordUpdateModel,page,limit); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4f9c844..22ecb3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2504,12 +2504,14 @@ public class ViewFacade { //围场孕妇产检新加字段nt map.put("wcNt",data.getWcNt()); -// map.put("teamName","");// -// if(null!=data.getTeamIdNew()){ -// TeamModel teamModel=this.mongoTemplate.findOne(new Query(Criteria.where("_id").is(data.getTeamIdNew())),TeamModel.class); -// map.put("teamName",teamModel.getTeamName()); -// } - + //医生所在团队 + DoctorTeam doctorTeam=new DoctorTeam(); + doctorTeam.setId(Integer.parseInt(data.getTeamId())); + FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam); + if(null!=frontEndResult.getData()){ + doctorTeam=(DoctorTeam) frontEndResult.getData().get(0); + map.put("teamName",doctorTeam.getTeamName()); + } br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -3119,16 +3121,16 @@ public class ViewFacade { } //医生所在团队 -// BaseObjectResponse tbase=teamService.getTeamByDocId(data.getCheckDoctor()); -// if(null!=tbase.getData()){ -// TeamModel tm=(TeamModel)(tbase.getData()); -// teamName=tm.getTeamName(); -// } + DoctorTeam doctorTeam=new DoctorTeam(); + doctorTeam.setId(Integer.parseInt(data.getTeamId())); + FrontEndResult frontEndResult=teamService.queryListDoctorTeam(doctorTeam); + if(null!=frontEndResult.getData()){ + teamName=((DoctorTeam)(frontEndResult.getData().get(0))).getTeamName(); + } } map.put("checkDoctor", checkDoctor); -// map.put("team",teamName); - + map.put("teamName",teamName); String hospital = ""; Organization organization = null; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getHospitalId())) { @@ -3417,12 +3419,6 @@ public class ViewFacade { map.put("szy", szy); // 血压 map.put("yn", data.getYn()); // -// map.put("teamName","");// -// if(null!=data.getTeamIdNew()){ -// TeamModel teamModel=this.mongoTemplate.findOne(new Query(Criteria.where("_id").is(data.getTeamIdNew())),TeamModel.class); -// map.put("teamName",teamModel.getTeamName()); -// } - br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index ec8d931..27a7189 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -1474,9 +1474,9 @@ public class AntExAddRequest implements IBasicRequestConvert { } //产团 - antExChuModel.setTeamIdOld(teamIdOld); - antExChuModel.setTeamIdNew(teamIdNew); - antExChuModel.setReason(reason); +// antExChuModel.setTeamIdOld(teamIdOld); +// antExChuModel.setTeamIdNew(teamIdNew); +// antExChuModel.setReason(reason); return antExChuModel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index ed3008b..7f5c5e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -1337,9 +1337,9 @@ public class AntenatalExaminationResult implements IBasicResultConvert tLst=mongoTemplate.find(new Query(criteria).with(new Sort(new Sort.Order(Sort.Direction.DESC,"created"))),TeamModel.class); + List tLst=mongoTemplate.find(new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")),TeamModel.class); return new BaseObjectResponse() .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(tLst); } + @Override + public BaseResponse queryPatientUpdateRecord(TeamRecordUpdateModel recordUpdateModel,Integer page, Integer limit) { + Criteria criteria=new Criteria(); + if(StringUtils.isNotEmpty(recordUpdateModel.getPatientName())){ + criteria.and("patientName").regex(".*?\\" +recordUpdateModel.getPatientName()+ ".*"); + } + if(StringUtils.isNotEmpty(recordUpdateModel.getDoctorName())){ + criteria.and("doctorName").regex(".*?\\" +recordUpdateModel.getDoctorName()+ ".*"); + } + if(StringUtils.isNotEmpty(recordUpdateModel.getTeamName())){ + criteria.and("teamName").regex(".*?\\" +recordUpdateModel.getTeamName()+ ".*"); + } + if(null!=recordUpdateModel.getStartTime()){ + criteria.and("created").gte(recordUpdateModel.getStartTime()); + } + if(null!=recordUpdateModel.getEndTime()){ + criteria.and("created").lte(recordUpdateModel.getEndTime()); + } + PageResult pageResult = findMongoPage(TeamRecordUpdateModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); + return RespBuilder.buildSuccess(pageResult); + } + }