From 43b0a22561cdd76dd060b371fefb27514c283c77 Mon Sep 17 00:00:00 2001 From: mengkuiliang <1464081137@qq.com> Date: Tue, 10 Oct 2023 11:14:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9B=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BB=A3=E7=A0=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/ResidentPatientInfoController.java | 3 ++ .../ResidentServiceApplyController.java | 2 +- .../controller/applet/SignInfoController.java | 2 +- .../src/main/resources/application.yml | 9 ++-- .../pojo/body/ResidentServiceApplyBody.java | 2 +- .../impl/ResidentServiceApplyServiceImpl.java | 12 +++--- .../ScreeningProjectController.java | 8 ++-- .../screeningproject/ScreeningProject.java | 4 +- .../ScreeningProjectMapper.java | 2 +- .../impl/ScreeningProjectServiceImpl.java | 4 +- .../ScreeningProjectMapper.xml | 42 +++++++++---------- 11 files changed, 46 insertions(+), 44 deletions(-) diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java index 323a11f..652d66b 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java @@ -66,6 +66,9 @@ public class ResidentPatientInfoController extends BaseController { @ApiOperation("注册完善信息") @PostMapping("") public R register(@Validated @RequestBody PatientInfoBody body) { + if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) { + return R.fail("请选择基础疾病"); + } try { residentPatientInfoService.register(body); return R.ok(); diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java index 97eb659..1ddc1d5 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java @@ -69,7 +69,7 @@ public class ResidentServiceApplyController extends BaseController { return R.ok(residentServiceAppletService.detail(bookingNo)); } - @ApiOperation("获取个性服务包和筛查项目") + @ApiOperation(value = "获取服务预约列表", notes = "获取家医个性服务包和筛查项目") @GetMapping("/getForm/{identity}") public R> getForm(@PathVariable String identity, @RequestHeader("region") String region) { return R.ok(residentServiceAppletService.getForm(identity, region)); diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java index e367fd6..0494d33 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java @@ -35,7 +35,7 @@ import java.util.List; public class SignInfoController extends BaseController { @Resource private HttpService httpService; - @Value("${applet.distance}") + @Value("${fd.distance}") private BigDecimal DISTANCE; @ApiOperation(value = "获取签约详情") diff --git a/xinelu-admin/src/main/resources/application.yml b/xinelu-admin/src/main/resources/application.yml index 1b7f413..08c9f45 100644 --- a/xinelu-admin/src/main/resources/application.yml +++ b/xinelu-admin/src/main/resources/application.yml @@ -233,15 +233,12 @@ xss: # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* -# 家医签约附近的机构 -applet: - # 多少公里内 - distance: 100.00 - -# 家医请求地址 +# 家医配置 fd: dy: http://192.168.124.6:8001/fd/mp dz: http://192.168.124.6:8001/fd/mp + # 签约附近的机构多少公里内 + distance: 100.00 # 腾讯云音视频 trtc: diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java index ec4d65e..31d3dbb 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/body/ResidentServiceApplyBody.java @@ -40,7 +40,7 @@ public class ResidentServiceApplyBody { /** * 预约服务方式1：家庭2：门诊3：电话99：其他 */ - @ApiModelProperty(value = "预约服务方式1：家庭2：门诊3：电话99：其他", required = true) + @ApiModelProperty(value = "预约服务方式1：家庭2：门诊3：电话99：其他", hidden = true) private String serviceWay; /** 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 b22bdf7..812f4e5 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 @@ -286,6 +286,7 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe ScreeningProjectVo sp; for (PerformanceDetailVo per : perList) { sp = new ScreeningProjectVo(); + sp.setSourceType("1"); sp.setDeptId(per.getOrgNo()); sp.setDeptName(per.getOrgName()); sp.setPackageId(per.getPackageNo()); @@ -308,20 +309,21 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe 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.getPhOrgCode())) { + if (org != null && !StringUtils.isBlank(org.getPhOrgId())) { // 根据机构编码获取筛查机构 - HospitalInfo Hospital = hospitalInfoService.getHosptalByOrgCode(org.getPhOrgCode()); + HospitalInfo Hospital = hospitalInfoService.getHosptalByOrgCode(org.getPhOrgId()); if(Hospital != null) { // 获取筛查项目 ScreeningProject query = new ScreeningProject(); - query.setDeptId(Hospital.getHospitalCode()); + query.setHospitalId(String.valueOf(Hospital.getId())); List screeningProjectList = screeningProjectService.findList(query); if(screeningProjectList != null && screeningProjectList.size() > 0) { ScreeningProjectVo sp; for(ScreeningProject project: screeningProjectList) { sp = new ScreeningProjectVo(); - sp.setDeptId(project.getDeptId()); - sp.setDeptName(project.getDeptName()); + sp.setSourceType("2"); + sp.setDeptId(project.getHospitalId()); + sp.setDeptName(project.getHospitalName()); sp.setProjectId(project.getProjectId()); sp.setProjectName(project.getProjectName()); sp.setPrice(project.getPrice()); diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java index 007b5fc..5f873f2 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java @@ -53,8 +53,8 @@ public class ScreeningProjectController extends BaseController { @ApiOperation("新增服务项目") @PostMapping("add") public R add(@RequestBody ScreeningProject project) { - if (projectService.checkSameProjectName(project.getProjectName(), project.getDeptId(), null)) { - return R.fail("【" + project.getDeptName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加"); + if (projectService.checkSameProjectName(project.getProjectName(), project.getHospitalId(), null)) { + return R.fail("【" + project.getHospitalName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加"); } //价格校验 if (Objects.isNull(project.getDiscount())) { @@ -83,8 +83,8 @@ public class ScreeningProjectController extends BaseController { @ApiOperation("修改服务项目") @PostMapping("update") public R update(@RequestBody ScreeningProject project) { - if (projectService.checkSameProjectName(project.getProjectName(), project.getDeptId(), project.getProjectId())) { - return R.fail("【" + project.getDeptName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加"); + if (projectService.checkSameProjectName(project.getProjectName(), project.getHospitalId(), project.getProjectId())) { + return R.fail("【" + project.getHospitalName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加"); } //价格校验 if (Objects.isNull(project.getDiscount())) { diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java index 3ace40c..b905545 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java @@ -60,13 +60,13 @@ public class ScreeningProject extends BaseEntity { * 医院编号 */ @ApiModelProperty("医院编号") - private String deptId; + private String hospitalId; /** * 医院名称 */ @ApiModelProperty("医院名称") - private String deptName; + private String hospitalName; /** * 删除标识（0：存在，1：已删除） diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java index 59a5e26..10f655f 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java @@ -26,6 +26,6 @@ public interface ScreeningProjectMapper { int updateByPrimaryKey(ScreeningProject record); - Integer checkSameName(@Param("projectName") String projectName, @Param("deptId") String deptId, @Param("projectId") String projectId); + Integer checkSameName(@Param("projectName") String projectName, @Param("hospitalId") String hospitalId, @Param("projectId") String projectId); } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java index 727f5a3..9f8488c 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java @@ -42,7 +42,7 @@ public class ScreeningProjectServiceImpl implements IScreeningProjectService { projectMapper.updateByPrimaryKeySelective(project); } - @Override public boolean checkSameProjectName(String projectName, String deptId, String projectId) { - return projectMapper.checkSameName(projectName, deptId, projectId) != null; + @Override public boolean checkSameProjectName(String projectName, String hospitalId, String projectId) { + return projectMapper.checkSameName(projectName, hospitalId, projectId) != null; } } diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml index a792e38..37f097d 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml @@ -13,8 +13,8 @@ - - + + @@ -26,8 +26,8 @@ id,project_id,project_name, project_type,price,discount, - discount_price,status,dept_id, - dept_name,create_by,create_time, + discount_price,status,hospital_id, + hospital_name,create_by,create_time, update_by,update_time,del_flag, remark @@ -39,8 +39,8 @@ and project_name like concat( '%' ,#{projectName}, '%') - - and dept_id = #{deptId} + + and hospital_id = #{hospitalId} and project_type = #{projectType} @@ -69,14 +69,14 @@ insert into screening_project ( id,project_id,project_name ,project_type,price,discount - ,discount_price,status,dept_id - ,dept_name,create_by,create_time + ,discount_price,status,hospital_id + ,hospital_name,create_by,create_time ,update_by,update_time,del_flag ,remark) values (#{id,jdbcType=BIGINT},#{projectId,jdbcType=VARCHAR},#{projectName,jdbcType=VARCHAR} ,#{projectType,jdbcType=CHAR},#{price,jdbcType=DECIMAL},#{discount,jdbcType=INTEGER} - ,#{discountPrice,jdbcType=VARCHAR},#{status,jdbcType=CHAR},#{deptId,jdbcType=VARCHAR} - ,#{deptName,jdbcType=VARCHAR},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=DATE} + ,#{discountPrice,jdbcType=VARCHAR},#{status,jdbcType=CHAR},#{hospitalId,jdbcType=VARCHAR} + ,#{hospitalName,jdbcType=VARCHAR},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=DATE} ,#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=DATE},#{delFlag,jdbcType=CHAR} ,#{remark,jdbcType=VARCHAR}) @@ -91,8 +91,8 @@ discount, discount_price, status, - dept_id, - dept_name, + hospital_id, + hospital_name, create_by, create_time, update_by, @@ -109,8 +109,8 @@ #{discount,jdbcType=INTEGER}, #{discountPrice,jdbcType=DECIMAL}, #{status,jdbcType=CHAR}, - #{deptId,jdbcType=VARCHAR}, - #{deptName,jdbcType=VARCHAR}, + #{hospitalId,jdbcType=VARCHAR}, + #{hospitalName,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=DATE}, #{updateBy,jdbcType=VARCHAR}, @@ -140,11 +140,11 @@ status = #{status,jdbcType=CHAR}, - - dept_id = #{deptId,jdbcType=VARCHAR}, + + hospital_id = #{hospitalId,jdbcType=VARCHAR}, - - dept_name = #{deptName,jdbcType=VARCHAR}, + + hospital_name = #{hospitalName,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR}, @@ -176,8 +176,8 @@ discount = #{discount,jdbcType=INTEGER}, discount_price = #{discountPrice,jdbcType=VARCHAR}, status = #{status,jdbcType=CHAR}, - dept_id = #{deptId,jdbcType=VARCHAR}, - dept_name = #{deptName,jdbcType=VARCHAR}, + hospital_id = #{hospitalId,jdbcType=VARCHAR}, + hospital_name = #{hospitalName,jdbcType=VARCHAR}, create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=DATE}, update_by = #{updateBy,jdbcType=VARCHAR}, @@ -187,7 +187,7 @@ where project_id = #{projectId,jdbcType=VARCHAR}