From e83666f45a764e1253b47049cd7827d448339247 Mon Sep 17 00:00:00 2001 From: mengkuiliang <1464081137@qq.com> Date: Fri, 20 Oct 2023 17:08:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AE=B6=E5=8C=BB?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/fd/FDController.java | 93 +++++++++++--- .../pojo/body/SyncHospitalPersonInfoBody.java | 115 ++++++++++++++++++ .../applet/pojo/vo/DoctorDetailVo.java | 6 +- .../applet/pojo/vo/OrgDetailVo.java | 6 +- .../service/IResidentSignAppletService.java | 1 + .../impl/ResidentServiceApplyServiceImpl.java | 56 ++++----- .../impl/ResidentSignApplyServiceImpl.java | 6 +- .../domain/hospitalinfo/HospitalInfo.java | 6 + .../HospitalPersonInfo.java | 25 ++-- .../HospitalPersonInfoMapper.java | 18 +++ .../IHospitalPersonInfoService.java | 27 ++++ .../impl/HospitalPersonInfoServiceImpl.java | 37 ++++++ .../hospitalinfo/HospitalInfoMapper.xml | 15 ++- .../HospitalPersonInfoMapper.xml | 97 ++++++++++++++- 14 files changed, 437 insertions(+), 71 deletions(-) create mode 100644 xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/SyncHospitalPersonInfoBody.java diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java index acd2eb1..89003bf 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/fd/FDController.java @@ -1,9 +1,11 @@ package com.xinelu.web.controller.fd; + import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.xinelu.common.core.domain.R; import com.xinelu.familydoctor.applet.pojo.body.ApprovalBody; +import com.xinelu.familydoctor.applet.pojo.body.SyncHospitalPersonInfoBody; import com.xinelu.familydoctor.applet.pojo.query.ApplyQuery; import com.xinelu.familydoctor.applet.pojo.vo.ResidentRescindApplyVo; import com.xinelu.familydoctor.applet.pojo.vo.ResidentServiceApplyVo; @@ -11,11 +13,16 @@ import com.xinelu.familydoctor.applet.pojo.vo.ResidentSignApplyVo; import com.xinelu.familydoctor.applet.service.IResidentRescindApplyService; import com.xinelu.familydoctor.applet.service.IResidentServiceAppletService; import com.xinelu.familydoctor.applet.service.IResidentSignAppletService; +import com.xinelu.manage.domain.hospitalinfo.HospitalInfo; +import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; +import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService; +import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.vo.patientinfo.PatientInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,8 +38,12 @@ public class FDController { private IResidentSignAppletService residentSignAppletService; @Resource private IResidentServiceAppletService residentServiceAppletService; - @Resource - private IPatientInfoService patientInfoService; + @Resource + private IPatientInfoService patientInfoService; + @Resource + private IHospitalPersonInfoService hospitalPersonInfoService; + @Resource + private IHospitalInfoService hospitalInfoService; @ApiOperation("服务申请列表") @PostMapping("/performanceBooking/list") @@ -40,6 +51,7 @@ public class FDController { PageHelper.startPage(query.getPageNum(), query.getPageSize()); return R.ok(PageInfo.of(residentServiceAppletService.findList(query))); } + @ApiOperation("服务申请详情") @GetMapping("/performanceBooking/detail/{bookingNo}") public R performanceBookingDetail(@PathVariable String bookingNo) { @@ -66,13 +78,14 @@ public class FDController { @ApiOperation("解约申请列表") @PostMapping("/rescindApply/list") public R> rescindApplyList(@RequestBody ApplyQuery query) { - if(StringUtils.isBlank(query.getUserNo())) { + if (StringUtils.isBlank(query.getUserNo())) { return R.fail("医生编号不能为空"); } PageHelper.startPage(query.getPageNum(), query.getPageSize()); query.setBookingStatus("0"); return R.ok(PageInfo.of(residentRescindApplyService.findList(query))); } + @ApiOperation("解约申请详情") @GetMapping("/rescindApply/detail/{applyNo}") public R rescindApplyDetail(@PathVariable String applyNo) { @@ -92,7 +105,7 @@ public class FDController { @ApiOperation("签约申请列表") @PostMapping("/signBooking/list") public R> signBookingList(@RequestBody ApplyQuery query) { - if(StringUtils.isBlank(query.getUserNo())) { + if (StringUtils.isBlank(query.getUserNo())) { return R.fail("医生编号不能为空"); } PageHelper.startPage(query.getPageNum(), query.getPageSize()); @@ -116,15 +129,67 @@ public class FDController { return R.ok(); } - @ApiOperation("根据签约主键查询绑定编号") - @GetMapping("/signBooking/getBySignNo/{cardNo}") - public R getBySignNo(@PathVariable String cardNo) { - JSONObject retObj = new JSONObject(); + @ApiOperation("根据签约主键查询绑定编号") + @GetMapping("/signBooking/getBySignNo/{cardNo}") + public R getBySignNo(@PathVariable String cardNo) { + JSONObject retObj = new JSONObject(); PatientInfoVO patientInfo = patientInfoService.selectPatientInfoByCardNo(cardNo); - if (patientInfo != null) { - retObj.fluentPut("bindingNo", patientInfo.getPatientCode()) - .fluentPut("openid", patientInfo.getOpenid()); - } - return R.ok(retObj); - } + if (patientInfo != null) { + retObj.fluentPut("bindingNo", patientInfo.getPatientCode()) + .fluentPut("openid", patientInfo.getOpenid()); + } + return R.ok(retObj); + } + + @ApiOperation("家医医生同步科室人员信息") + @PostMapping("/synHospatialPersonInfo") + public R synHospatialPersonInfo(@RequestBody SyncHospitalPersonInfoBody body) { + if (body == null) { + return R.fail("请求参数不能为空"); + } + if (StringUtils.isBlank(body.getPersonCode())) { + return R.fail("科室人员编号不能为空"); + } + if (StringUtils.isBlank(body.getOrgCode())) { + return R.fail("家医机构编号不能为空"); + } + // 判断是否已存在 + HospitalPersonInfo hospitalPersonInfo = hospitalPersonInfoService.getByPersonCode(body.getPersonCode(), body.getStatus()); + // 根据家医机构查询医院信息 + HospitalInfo hospital = hospitalInfoService.getHosptalByOrgCode(body.getOrgCode()); + // 新增 + if (hospitalPersonInfo == null) { + hospitalPersonInfo = new HospitalPersonInfo(); + BeanUtils.copyProperties(body, hospitalPersonInfo); + hospitalPersonInfo.setCreateBy(body.getPersonCode()); + hospitalPersonInfo.setStatus("1"); + if (hospital != null) { + hospitalPersonInfo.setHospitalId(hospital.getId()); + } + hospitalPersonInfoService.insert(hospitalPersonInfo); + + // 修改 + } else { + if (!String.valueOf(hospitalPersonInfo.getPersonAccount()).equals(String.valueOf(body.getPersonAccount())) + || !String.valueOf(hospitalPersonInfo.getPersonPhone()).equals(String.valueOf(body.getPersonPhone())) + || !String.valueOf(hospitalPersonInfo.getPersonName()).equals(String.valueOf(body.getPersonName())) + || !String.valueOf(hospitalPersonInfo.getPersonIntroduce()).equals(String.valueOf(body.getPersonIntroduce())) + || !String.valueOf(hospitalPersonInfo.getCardNo()).equals(String.valueOf(body.getCardNo())) + ) { + hospitalPersonInfo.setPersonName(body.getPersonName()); + hospitalPersonInfo.setPersonPhone(body.getPersonPhone()); + hospitalPersonInfo.setPersonAddress(body.getPersonAddress()); + hospitalPersonInfo.setPersonAccount(body.getPersonAccount()); + hospitalPersonInfo.setPersonIntroduce(body.getPersonIntroduce()); + hospitalPersonInfo.setCardNo(body.getCardNo()); + if (hospital != null) { + hospitalPersonInfo.setHospitalId(hospital.getId()); + } + hospitalPersonInfo.setUpdateBy(body.getPersonCode()); + hospitalPersonInfoService.updateByPersonCode(hospitalPersonInfo); + } + } + return R.ok(); + } + } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/SyncHospitalPersonInfoBody.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/SyncHospitalPersonInfoBody.java new file mode 100644 index 0000000..4abface --- /dev/null +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/SyncHospitalPersonInfoBody.java @@ -0,0 +1,115 @@ +package com.xinelu.familydoctor.applet.pojo.body; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author mengkuiliang + * @Description 同步科室人员信息请求对象 + * @Date 2023-10-20 020 14:18 + * @Param + * @return + **/ +@Data +@ApiModel(value = "同步科室人员信息请求对象") +public class SyncHospitalPersonInfoBody { + + /** + * 所属医院id + */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalId; + + /** + * 所属部门id + */ + @ApiModelProperty(value = "所属部门id") + private Long departmentId; + + /** + * 科室人员编码 + */ + @ApiModelProperty(value = "科室人员编码") + private String personCode; + + /** + * 科室人员名称 + */ + @ApiModelProperty(value = "科室人员名称") + private String personName; + + /** + * 科室人员联系电话 + */ + @ApiModelProperty(value = "科室人员联系电话") + private String personPhone; + + /** + * 科室人员地址 + */ + @ApiModelProperty(value = "科室人员地址") + private String personAddress; + + /** + * 身份证号 + */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** + * 人员职称，主任医师：CHIEF_PHYSICIAN，副主任医师：DEPUTY_CHIEF_PHYSICIAN，主治医师：ATTENDING_DOCTOR，医师：PHYSICIAN，医士：HEALER，住院医师：RESIDENT_PHYSICIAN + */ + @ApiModelProperty(value = "人员职称，主任医师：CHIEF_PHYSICIAN，副主任医师：DEPUTY_CHIEF_PHYSICIAN，主治医师：ATTENDING_DOCTOR，医师：PHYSICIAN，医士：HEALER，住院医师：RESIDENT_PHYSICIAN") + private String academicTitle; + + /** + * 咨询费用 + */ + @ApiModelProperty(value = "咨询费用") + private BigDecimal consultingFee; + + /** + * 个人简介 + */ + @ApiModelProperty(value = "个人简介") + private String personIntroduce; + + /** + * 显示顺序 + */ + @ApiModelProperty(value = "显示顺序") + private Integer personSort; + + /** + * 科室人员头像地址 + */ + @ApiModelProperty(value = "科室人员头像地址") + private String personPictureUrl; + + /** + * 科室人员账号 + */ + @ApiModelProperty(value = "科室人员账号") + private String personAccount; + + /** + * 科室人员密码 + */ + @ApiModelProperty(value = "科室人员密码") + private String personPassword; + + /** + *1：家医医生 2：泉医医生 3：专病医生 + */ + @ApiModelProperty(value = "1：家医医生 2：泉医医生 3：专病医生") + private String status; + + /** + *1：家医机构编号 + */ + @ApiModelProperty(value = "家医机构编号") + private String orgCode; +} diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/DoctorDetailVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/DoctorDetailVo.java index 89e25e0..7f55739 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/DoctorDetailVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/DoctorDetailVo.java @@ -149,10 +149,10 @@ public class DoctorDetailVo { private String phOrgId; /** - * 公卫机构编号 + * 家医机构编号 */ - @ApiModelProperty("公卫机构编号") - private String phOrgCode; + @ApiModelProperty("家医机构编号") + private String orgCode; /** * 个人简介 diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrgDetailVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrgDetailVo.java index 36aad3d..9a1f327 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrgDetailVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrgDetailVo.java @@ -59,10 +59,10 @@ public class OrgDetailVo { private String phOrgId; /** - * 公卫机构编码 + * 家医机构编码 */ - @ApiModelProperty("公卫机构编码") - private String phOrgCode; + @ApiModelProperty("家医机构编码") + private String orgCode; /** * 机构类型（0：卫健委，1：卫健局，2：医院，3：乡镇卫生院，4：街道卫生服务中心，5：社区服务站，6：村卫生室） diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentSignAppletService.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentSignAppletService.java index 8ebf01d..dab39ae 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentSignAppletService.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentSignAppletService.java @@ -3,6 +3,7 @@ package com.xinelu.familydoctor.applet.service; import com.github.pagehelper.PageInfo; import com.xinelu.familydoctor.applet.pojo.body.ApprovalBody; import com.xinelu.familydoctor.applet.pojo.body.ResidentSignApplyBody; +import com.xinelu.familydoctor.applet.pojo.body.SyncHospitalPersonInfoBody; import com.xinelu.familydoctor.applet.pojo.query.ApplyQuery; import com.xinelu.familydoctor.applet.pojo.vo.ResidentSignApplyVo; diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java index 94f3567..47da88e 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java @@ -275,7 +275,7 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe if (signInfo == null) { throw new ServiceException("未查询到签约信息!"); } - // 获取家医个性服务包 + // 1、获取家医个性服务包 result = (String) httpService.get(SpringUtils.getFdUrl(region) + "/package/getPackageOfGX/" + identity + (!StringUtils.isBlank(projectName) ? ("?formName=" + projectName) : "?formName=null"), null, String.class); jsonObject = JSONObject.parseObject(result); if (!"1".equals(jsonObject.get("code"))) { @@ -307,41 +307,31 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe } } - // 获取签约机构下的筛查项目 - // 获取家医机构详情 - result = (String) httpService.get(SpringUtils.getFdUrl(region) + "/org/getOrgDetail/" + signInfo.getOrgNo(), null, String.class); - jsonObject = JSONObject.parseObject(result); - if ("1".equals(jsonObject.get("code"))) { - if (jsonObject.containsKey("data") && jsonObject.get("data") != null) { - OrgDetailVo org = JSONObject.parseObject(jsonObject.getJSONObject("data").toJSONString(), OrgDetailVo.class); - if (org != null && !StringUtils.isBlank(org.getPhOrgId())) { - // 根据机构编码获取筛查机构 - HospitalInfo Hospital = hospitalInfoService.getHosptalByOrgCode(org.getPhOrgId()); - if (Hospital != null) { - // 获取筛查项目 - ScreeningProject query = new ScreeningProject(); - query.setHospitalId(Hospital.getId()); - query.setProjectName(projectName); - List screeningProjectList = screeningProjectService.findList(query); - if (screeningProjectList != null && screeningProjectList.size() > 0) { - ScreeningProjectVo sp; - for (ScreeningProject project : screeningProjectList) { - sp = new ScreeningProjectVo(); - sp.setSourceType("2"); - sp.setHospitalId(String.valueOf(project.getHospitalId())); - sp.setHospitalName(project.getHospitalName()); - sp.setProjectId(project.getProjectId()); - sp.setProjectName(project.getProjectName()); - sp.setPrice(project.getPrice()); - sp.setDiscountPrice(project.getDiscountPrice()); - projectList.add(sp); - } - } - } - + // 2、获取签约机构下的筛查项目 + // 根据机构编码获取筛查机构 + HospitalInfo Hospital = hospitalInfoService.getHosptalByOrgCode(signInfo.getOrgNo()); + if (Hospital != null) { + // 获取筛查项目 + ScreeningProject query = new ScreeningProject(); + query.setHospitalId(Hospital.getId()); + query.setProjectName(projectName); + List screeningProjectList = screeningProjectService.findList(query); + if (screeningProjectList != null && screeningProjectList.size() > 0) { + ScreeningProjectVo sp; + for (ScreeningProject project : screeningProjectList) { + sp = new ScreeningProjectVo(); + sp.setSourceType("2"); + sp.setHospitalId(String.valueOf(project.getHospitalId())); + sp.setHospitalName(project.getHospitalName()); + sp.setProjectId(project.getProjectId()); + sp.setProjectName(project.getProjectName()); + sp.setPrice(project.getPrice()); + sp.setDiscountPrice(project.getDiscountPrice()); + projectList.add(sp); } } } + return projectList; } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java index c65aa18..11150a3 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentSignApplyServiceImpl.java @@ -75,7 +75,7 @@ public class ResidentSignApplyServiceImpl implements IResidentSignAppletService if (patientInfo == null) { throw new ServiceException("未查询到注册信息"); } - if(StringUtils.isBlank(body.getPatientId())) { + if (StringUtils.isBlank(body.getPatientId())) { entity.setPatientId(patientInfo.getPatientCode()); } @@ -85,10 +85,10 @@ public class ResidentSignApplyServiceImpl implements IResidentSignAppletService // 审批状态0:待批准 1:已同意 2:已拒绝 entity.setApprovalStatus("0"); entity.setBookingNo(IdUtils.simpleUUID()); - if(StringUtils.isBlank(entity.getNation())) { + if (StringUtils.isBlank(entity.getNation())) { entity.setNation("1"); } - if(entity.getSignYears() == null || entity.getSignYears() <= 0) { + if (entity.getSignYears() == null || entity.getSignYears() <= 0) { entity.setSignYears(1); } entity.setCrowdsNo(body.getCrowdList().stream().map(CrowdDto::getCrowdNo).collect(Collectors.joining(","))); diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java index b03d980..fd4d15d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalinfo/HospitalInfo.java @@ -85,6 +85,11 @@ public class HospitalInfo extends BaseDomain implements Serializable { @NotNull(message = "显示顺序不能为空", groups = {Insert.class, Update.class}) private Integer hospitalSort; + /** + * 家医机构编号 + */ + @ApiModelProperty(value = "家医机构编号") + private String orgCode; @Override public String toString() { @@ -100,6 +105,7 @@ public class HospitalInfo extends BaseDomain implements Serializable { .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) + .append("orgCode", getOrgCode()) .toString(); } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java index 10058c9..d26850c 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java @@ -6,10 +6,12 @@ import com.xinelu.common.custominterface.Insert; import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; import java.math.BigDecimal; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -64,7 +66,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable { */ @ApiModelProperty(value = "科室人员名称") @Excel(name = "科室人员名称") - @NotBlank(message = "科室人员名称不能为空！", groups = { Insert.class, Update.class}) + @NotBlank(message = "科室人员名称不能为空！", groups = {Insert.class, Update.class}) @Length(max = 50, message = "科室人员名称不能超过50位", groups = {Insert.class, Update.class}) private String personName; @@ -128,16 +130,21 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable { */ private String personPictureUrl; - /** - * 科室人员账号 - */ - private String personAccount; + /** + * 科室人员账号 + */ + private String personAccount; - /** - * 科室人员密码 - */ - private String personPassword; + /** + * 科室人员密码 + */ + private String personPassword; + /** + *1：家医医生 2：泉医医生 3：专病医生 + */ + @ApiModelProperty(value = "1：家医医生 2：泉医医生 3：专病医生") + private String status; @Override public String toString() { diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java index 1a9e9ab..8de9b62 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/hospitalpersoninfo/HospitalPersonInfoMapper.java @@ -109,4 +109,22 @@ public interface HospitalPersonInfoMapper { * @return int **/ int selectHospitalPersonInfoByIdCount(Long id); + + /** + * @Author mengkuiliang + * @Description 根据科室人员编码查询人员信息 + * @Date 2023-10-20 020 14:37 + * @Param [personCode] + * @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo + **/ + HospitalPersonInfo getByPersonCode(@Param("personCode") String personCode, @Param("status") String status); + + /** + * @Author mengkuiliang + * @Description 根据科室人员编号更新 + * @Date 2023-10-20 020 15:03 + * @Param [hospitalPersonInfo] + * @return int + **/ + int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java index f066d16..520950c 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/IHospitalPersonInfoService.java @@ -77,4 +77,31 @@ public interface IHospitalPersonInfoService { * @return */ int editHospitalPersonInfo(HospitalPersonInfoDtoo hospitalPersonInfo); + + /** + * @Author mengkuiliang + * @Description 根据科室人员编码查询人员信息 + * @Date 2023-10-20 020 14:34 + * @Param + * @return + **/ + HospitalPersonInfo getByPersonCode(String personCode, String status); + + /** + * @Author mengkuiliang + * @Description 新增 + * @Date 2023-10-20 020 14:42 + * @Param [body] + * @return void + **/ + int insert(HospitalPersonInfo body); + + /** + * @Author mengkuiliang + * @Description 根据科室人员编号更新 + * @Date 2023-10-20 020 15:02 + * @Param [hospitalPersonInfo] + * @return void + **/ + int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java index 3b2ac95..ee8ddfb 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java @@ -329,4 +329,41 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService public int editHospitalPersonInfo(HospitalPersonInfoDtoo hospitalPersonInfo) { return hospitalPersonInfoMapper.editHospitalPersonInfo(hospitalPersonInfo); } + + /** + * @Author mengkuiliang + * @Description 根据科室人员编码查询人员信息 + * @Date 2023-10-20 020 14:37 + * @Param [personCode] + * @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo + **/ + @Override + public HospitalPersonInfo getByPersonCode(String personCode, String status) { + return hospitalPersonInfoMapper.getByPersonCode(personCode, status); + } + + /** + * @Author mengkuiliang + * @Description 新增 + * @Date 2023-10-20 020 14:54 + * @Param [body] + * @return void + **/ + @Override + public int insert(HospitalPersonInfo body) { + return hospitalPersonInfoMapper.insertHospitalPersonInfo(body); + } + + /** + * @Author mengkuiliang + * @Description 根据科室人员编号更新 + * @Date 2023-10-20 020 15:02 + * @Param [hospitalPersonInfo] + * @return int + **/ + @Override + public int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo) { + return hospitalPersonInfoMapper.updateByPersonCode(hospitalPersonInfo); + } + } diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml index 6cc5dec..3a9d51c 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalinfo/HospitalInfoMapper.xml @@ -16,6 +16,7 @@ + @@ -29,7 +30,8 @@ create_by, create_time, update_by, - update_time + update_time, + org_code from hospital_info @@ -91,6 +93,9 @@ update_time, + + org_code, + #{hospitalName}, @@ -113,6 +118,9 @@ #{updateTime}, + + #{orgCode}, + @@ -149,6 +157,9 @@ update_time = #{updateTime}, + + org_code = #{orgCode}, + where id = #{id} @@ -183,6 +194,6 @@ diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml index 6ff9497..c65a246 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/hospitalpersoninfo/HospitalPersonInfoMapper.xml @@ -24,6 +24,7 @@ + @@ -46,6 +47,7 @@ + @@ -78,7 +80,8 @@ create_by, create_time, update_by, - update_time + update_time, + status from hospital_person_info @@ -104,7 +107,8 @@ hpi.create_by, hpi.create_time, hpi.update_by, - hpi.update_time + hpi.update_time, + status FROM hospital_person_info hpi LEFT JOIN hospital_department_info hdi ON hpi.department_id = hdi.id @@ -142,6 +146,9 @@ and hpi.person_sort = #{personSort} + + and hpi.status = #{status} + ORDER BY id DESC @@ -162,7 +169,8 @@ hpi.create_by, hpi.create_time, hpi.update_by, - hpi.update_time + hpi.update_time, + status FROM hospital_person_info hpi @@ -180,6 +188,9 @@ and hpi.academic_title = #{academicTitle} + + and hpi.status = #{status} + ORDER BY id DESC @@ -205,6 +216,7 @@ hpi.create_time, hpi.update_by, hpi.update_time, + hpi.status, hpc.hospital_person_id, hpc.certificate_name, hpc.certificate_code, @@ -254,6 +266,9 @@ update_time, + + status, + #{hospitalId}, @@ -290,6 +305,9 @@ #{updateTime}, + + #{status}, + @@ -346,6 +364,9 @@ update_time = #{updateTime}, + + status = #{status}, + where id = #{id} @@ -403,6 +424,9 @@ update_time = #{updateTime}, + + status = #{status}, + where id = #{id} @@ -452,7 +476,8 @@ create_by, create_time, update_by, - update_time + update_time, + status from hospital_person_info @@ -489,4 +514,68 @@ + + + + + + + update hospital_person_info + + hospital_id = + #{hospitalId}, + + department_id = + #{departmentId}, + + person_name = + #{personName}, + + + person_phone = #{personPhone}, + + person_address = + #{personAddress}, + + + card_no = #{cardNo}, + + academic_title = + #{academicTitle}, + + consulting_fee = + #{consultingFee}, + + person_introduce = + #{personIntroduce}, + + person_sort = + #{personSort}, + + person_picture_url = + #{personPictureUrl}, + + person_account = + #{personAccount}, + + person_password = + #{personPassword}, + + update_by = + #{updateBy}, + + + status = #{status}, + + update_time = now(), + + where person_code = #{personCode} +