From 5f43a7277d4497d9aa54f7240f99b21155da3cb8 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 11:20:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8D=95=EF=BC=8C=E6=9C=AA=E6=94=B9=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/system/domain/dto/RmsDto.java | 6 ++--- .../com/ccsens/system/domain/vo/RmsVo.java | 25 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java index a903baa..42dada4 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java @@ -256,10 +256,10 @@ public class RmsDto { @ApiModel("导出历史报告单-DTO") @Data public static class ReportPDF{ - @ApiModelProperty("患者的就诊流水号") + @ApiModelProperty("患者的唯一标识") private String patientNo; - @ApiModelProperty("医护人员工号") - private String emplCode; + @ApiModelProperty("就诊流水号") + private String visit_no; } } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java index 60f71f6..6952758 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java @@ -1148,4 +1148,29 @@ public class RmsVo { private Integer optionNum; } + @ApiModel("导出历史报告单（对接）-VO") + @Data + public static class ReportPDF{ + @ApiModelProperty("患者名称") + private String patientName; + @ApiModelProperty("性别") + private Byte sex; + @ApiModelProperty("年龄") + private int Age; + @ApiModelProperty("就诊号") + private String visitNo; + @ApiModelProperty("报告单") + private List reportList; + } + + @Data + public static class ReportPdfInfo{ + @ApiModelProperty("评估人") + private String assessor; + @ApiModelProperty("评估时间") + private String assessTime; + @ApiModelProperty("报告单文件路径") + private String url; + } + } diff --git a/ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml b/ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml index 035d10c..533a6cd 100644 --- a/ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml +++ b/ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml @@ -11,7 +11,7 @@ spring: # password: po3OynBO[M3579p6L7)o url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: q7510327 + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 From 1aedacea300d5f5c13dc0fc637c6b3462c7147fd Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 14:19:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E7=9A=84=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=B9=E6=8E=A5=E8=BF=94=E5=9B=9E=E7=9A=84pdf?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/system/domain/dto/RmsDto.java | 4 +- .../com/ccsens/system/domain/vo/RmsVo.java | 6 -- .../system/persist/mapper/SysUserMapper.java | 2 + .../system/service/impl/DockServiceImpl.java | 56 +++++++++++++++++-- .../resources/mapper/system/SysUserMapper.xml | 16 +++++- .../admin/controller/ReportPdfController.java | 14 ++++- .../com/ccsens/admin/persist/dao/RmsDao.java | 4 ++ .../com/ccsens/admin/service/IRmsService.java | 2 +- .../admin/service/impl/RmsServiceImpl.java | 20 ++----- .../src/main/resources/mapper/dao/RmsDao.xml | 48 ++++++++++++++++ .../scheduled/SyncHospitalData.java | 6 +- 11 files changed, 142 insertions(+), 36 deletions(-) diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java index 42dada4..9bc666b 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/RmsDto.java @@ -256,10 +256,10 @@ public class RmsDto { @ApiModel("导出历史报告单-DTO") @Data public static class ReportPDF{ - @ApiModelProperty("患者的唯一标识") + @ApiModelProperty("患者唯一标识") private String patientNo; @ApiModelProperty("就诊流水号") - private String visit_no; + private String visitNo; } } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java index 6952758..6696d17 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/vo/RmsVo.java @@ -1159,12 +1159,6 @@ public class RmsVo { private int Age; @ApiModelProperty("就诊号") private String visitNo; - @ApiModelProperty("报告单") - private List reportList; - } - - @Data - public static class ReportPdfInfo{ @ApiModelProperty("评估人") private String assessor; @ApiModelProperty("评估时间") diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/SysUserMapper.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/SysUserMapper.java index 7771d1e..b193b24 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/SysUserMapper.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/persist/mapper/SysUserMapper.java @@ -152,4 +152,6 @@ public interface SysUserMapper { * @return */ List selectUserByRoleKey(@Param("roleKey") String roleKey); + + List getZcpsByHospitalId(@Param("hospitalId")Long hospitalId); } diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java index 5ee88e6..3dab2d4 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.ccsens.common.annotation.DataSource; import com.ccsens.common.constant.ErrorConstant; @@ -430,6 +431,10 @@ public class DockServiceImpl implements DockService { private void syncPmsPatient() { + //查找医院下第一个总测评师 + List sysUserList = sysUserMapper.getZcpsByHospitalId(hospitalId); + + DockPatientBaseInfoExample dockPatientBaseInfoExample = new DockPatientBaseInfoExample(); dockPatientBaseInfoExample.createCriteria().andSyncEqualTo("0").andDelFlagEqualTo((byte) 0); List dockPatientBaseInfos = dockPatientBaseInfoMapper.selectByExample(dockPatientBaseInfoExample); @@ -443,18 +448,22 @@ public class DockServiceImpl implements DockService { //根据患者患者唯一编号查询业务表内患者信息 PmsPatient pmsPatient; PmsPatientExample pmsPatientExample = new PmsPatientExample(); - pmsPatientExample.createCriteria().andIdcardEqualTo(dockPatientBaseInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); + pmsPatientExample.createCriteria().andPatientNoEqualTo(dockPatientBaseInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); List pmsPatients = pmsPatientMapper.selectByExample(pmsPatientExample); if (CollUtil.isNotEmpty(pmsPatients)) { //存在就更新 pmsPatient = pmsPatients.get(0); disposePmsPatient(dockPatientBaseInfo, pmsPatient); + pmsPatient.setHospitalId(hospitalId); + pmsPatient.setUserId(CollUtil.isEmpty(sysUserList) ? null : sysUserList.get(0).getUserId()); pmsPatientMapper.updateByPrimaryKeySelective(pmsPatient); } else { //不存在则插入 pmsPatient = new PmsPatient(); pmsPatient.setId(IdUtil.getSnowflake().nextId()); disposePmsPatient(dockPatientBaseInfo, pmsPatient); + pmsPatient.setHospitalId(hospitalId); + pmsPatient.setUserId(CollUtil.isEmpty(sysUserList) ? null : sysUserList.get(0).getUserId()); pmsPatientMapper.insertSelective(pmsPatient); } //修改同步表数据的状态 @@ -480,21 +489,52 @@ public class DockServiceImpl implements DockService { } private PmsPatientBody savePatientBady(DockPatientVisitInfo dockPatientVisitInfo) { + //根据医生和部门信息查找业务表内对应的医生账号和部门id + String doctorName = ""; + Long deptId = null; + //医生用户名 + String doctor = dockPatientVisitInfo.getDoctor(); + if (StrUtil.isNotEmpty(doctor)) { + String[] split = doctor.split("/"); + if (split.length > 1) { + SysUser sysUser = new SysUser(); + sysUser.setEmplCode(split[1]); + List sysUsers = sysUserMapper.selectUserList(sysUser); + if (CollUtil.isNotEmpty(sysUsers)) { + doctorName = sysUsers.get(0).getUserName(); + } + } + } + //部门id + if (StrUtil.isNotEmpty(dockPatientVisitInfo.getDepartment())) { + SysDept sysDept = new SysDept(); + sysDept.setDeptName(dockPatientVisitInfo.getDepartment()); + List sysDepts = sysDeptMapper.selectDeptList(sysDept); + if (CollUtil.isNotEmpty(sysDepts)) { + deptId = sysDepts.get(0).getDeptId(); + } + } + //根据患者唯一编号查找业务表内患者信息 PmsPatient pmsPatient; PmsPatientExample pmsPatientExample = new PmsPatientExample(); - pmsPatientExample.createCriteria().andIdcardEqualTo(dockPatientVisitInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); + pmsPatientExample.createCriteria().andPatientNoEqualTo(dockPatientVisitInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); List pmsPatients = pmsPatientMapper.selectByExample(pmsPatientExample); if (CollUtil.isEmpty(pmsPatients)) { //根据患者唯一编号查找同步表的患者信息 DockPatientBaseInfoExample dockPatientBaseInfoExample = new DockPatientBaseInfoExample(); - dockPatientBaseInfoExample.createCriteria().andIdCardEqualTo(dockPatientVisitInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); + dockPatientBaseInfoExample.createCriteria().andPatientNoEqualTo(dockPatientVisitInfo.getPatientNo()).andDelFlagEqualTo((byte) 0); List dockPatientBaseInfos = dockPatientBaseInfoMapper.selectByExample(dockPatientBaseInfoExample); if (CollUtil.isNotEmpty(dockPatientBaseInfos)) { //存在则更新 pmsPatient = new PmsPatient(); pmsPatient.setId(IdUtil.getSnowflake().nextId()); disposePmsPatient(dockPatientBaseInfos.get(0), pmsPatient); + //更新患者所属的部门和创建者信息，暂不考虑其他，每次都更新 + pmsPatient.setHospitalId(ObjectUtil.isNull(deptId) ? hospitalId : deptId); + if (StrUtil.isNotEmpty(doctorName)) { + pmsPatient.setCreateBy(doctorName); + } pmsPatientMapper.insertSelective(pmsPatient); } else { //不存在表示患者确实不存在，直接跳过这个就诊信息 @@ -502,6 +542,12 @@ public class DockServiceImpl implements DockService { } } else { pmsPatient = pmsPatients.get(0); + //更新患者所属的部门和创建者信息，暂不考虑其他，每次都更新 + pmsPatient.setHospitalId(ObjectUtil.isNull(deptId) ? hospitalId : deptId); + if (StrUtil.isNotEmpty(doctorName)) { + pmsPatient.setCreateBy(doctorName); + } + pmsPatientMapper.updateByPrimaryKeySelective(pmsPatient); } //根据就诊流水号查询业务表内患者就诊信息 PmsPatientBody pmsPatientBody; @@ -568,7 +614,7 @@ public class DockServiceImpl implements DockService { pmsPatientDiagnosis.setPatientId(pmsPatientBody.getPatientId()); pmsPatientDiagnosis.setVisitNo(dockPatientDiagnosis.getVisitNo()); pmsPatientDiagnosis.setDiagnosisType(dockPatientDiagnosis.getDiagnosisType()); - pmsPatientDiagnosis.setIsMainDiagnosis(dockPatientDiagnosis.getIsMainDiagnosis().toString()); + pmsPatientDiagnosis.setIsMainDiagnosis(ObjectUtil.isNull(dockPatientDiagnosis.getIsMainDiagnosis()) ? "0" : dockPatientDiagnosis.getIsMainDiagnosis().toString()); pmsPatientDiagnosis.setDiagnosisCode(dockPatientDiagnosis.getDiagnosisCode()); pmsPatientDiagnosis.setDiagnosisName(dockPatientDiagnosis.getDiagnosisName()); pmsPatientDiagnosis.setDiagnosisDate(DateUtil.format(dockPatientDiagnosis.getDiagnosisDate(), "yyyy-MM-dd HH:mm:ss")); @@ -623,7 +669,7 @@ public class DockServiceImpl implements DockService { pmsPatientParentIllness.setPatientId(pmsPatientBody.getPatientId()); pmsPatientParentIllness.setVisitNo(dockPatientMedicationInfo.getVisitNo()); pmsPatientParentIllness.setDrugName(dockPatientMedicationInfo.getDrugName()); - pmsPatientParentIllness.setDose(dockPatientMedicationInfo.getDose().toString()); + pmsPatientParentIllness.setDose(ObjectUtil.isNull(dockPatientMedicationInfo.getDose()) ? "" : dockPatientMedicationInfo.getDose().toString()); pmsPatientParentIllness.setUnit(dockPatientMedicationInfo.getUnit()); pmsPatientParentIllness.setFrequency(dockPatientMedicationInfo.getFrequency()); pmsPatientParentIllnessMapper.insertSelective(pmsPatientParentIllness); diff --git a/ruisi_java/ruisi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruisi_java/ruisi-system/src/main/resources/mapper/system/SysUserMapper.xml index 69b1035..98efb30 100644 --- a/ruisi_java/ruisi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruisi_java/ruisi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -229,8 +229,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and u.del_flag = 0 and r.del_flag = 0 + - + insert into ums_user( user_id, dept_id, diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java index 256eabe..f944859 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/ReportPdfController.java @@ -2,13 +2,17 @@ package com.ccsens.admin.controller; import com.ccsens.admin.service.IRmsService; import com.ccsens.common.annotation.Anonymous; +import com.ccsens.common.core.domain.BaseDto; import com.ccsens.common.core.domain.JsonResponse; +import com.ccsens.system.domain.dto.PmsPatientDto; import com.ccsens.system.domain.dto.RmsDto; import com.ccsens.system.domain.vo.RmsVo; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +20,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; + +import static com.github.pagehelper.page.PageMethod.startPage; /** * @author zy @@ -32,9 +39,10 @@ public class ReportPdfController { @Anonymous @ApiOperation(value = "通过就诊号查询患者的评估报告单",notes = "") @PostMapping(value="/reportPDF") - public JsonResponse generate(@RequestBody @ApiParam @Valid RmsDto.ReportPDF dto){ + public JsonResponse> generate(@RequestBody @Validated BaseDto dto){ log.info("通过就诊号查询患者的评估报告单：{}", dto); - String url = rmsService.viewReportPDF(dto); - return JsonResponse.ok(url); + startPage(dto); + List list = rmsService.viewReportPDF(dto.getParam()); + return JsonResponse.ok(new PageInfo<>(list)); } } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java index 32ef17a..ae85805 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/RmsDao.java @@ -88,4 +88,8 @@ public interface RmsDao { * @return */ List queryRecord(@Param("evaluationId")Long evaluationId, @Param("questionId")Long questionId); + + List viewReportPdfByVisitNo(@Param("visitNo")String visitNo); + + List viewReportPdfByPatientNo(@Param("patientNo")String patientNo); } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java index 1dc72dc..be562d5 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IRmsService.java @@ -38,7 +38,7 @@ public interface IRmsService { Workbook exportAnalyse(List ids); - String viewReportPDF(RmsDto.ReportPDF dto); + List viewReportPDF(RmsDto.ReportPDF dto); } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java index bbd736b..4143d14 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/RmsServiceImpl.java @@ -930,22 +930,12 @@ public class RmsServiceImpl implements IRmsService { } @Override - public String viewReportPDF(RmsDto.ReportPDF dto) { - if(StrUtil.isBlank(dto.getPatientNo())){ - throw new ServiceException("患者就诊号不能为空"); + public List viewReportPDF(RmsDto.ReportPDF dto) { + if(StrUtil.isNotBlank(dto.getVisitNo())){ + return rmsDao.viewReportPdfByVisitNo(dto.getVisitNo()); + }else{ + return rmsDao.viewReportPdfByPatientNo(dto.getPatientNo()); } - //根据就诊流水号查询患者的 - RmsReport report; - RmsReportExample example = new RmsReportExample(); - example.createCriteria().andVisitNoEqualTo(dto.getPatientNo()).andDelFlagEqualTo((byte) 0); - List reports = rmsReportMapper.selectByExample(example); - if (CollectionUtil.isNotEmpty(reports)) { - report = reports.get(0); - if(ObjectUtil.isNotNull(report)){ - return report.getUrl(); - } - } - return null; } private void dealMMSEScored(List analyses) { diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml index 38611e3..3ce2c63 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/RmsDao.xml @@ -1183,4 +1183,52 @@ order by r.sort + + + + \ No newline at end of file diff --git a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/scheduled/SyncHospitalData.java b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/scheduled/SyncHospitalData.java index 98388b6..0d63ca7 100644 --- a/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/scheduled/SyncHospitalData.java +++ b/ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/scheduled/SyncHospitalData.java @@ -24,13 +24,13 @@ public class SyncHospitalData { private DockService dockService; @DataSource(value = DataSourceType.SLAVE) - @Scheduled(cron = "0 */2 * * * ?") + @Scheduled(cron = "0 */1 * * * ?") public void syncHospitalData() { dockService.syncHospitalData(); } @DataSource(value = DataSourceType.SLAVE) - @Scheduled(cron = "*/30 * * * * ?") + @Scheduled(cron = "0 */1 * * * ?") public void syncDeptData() { try { List sysDepts = dockService.syncUmsDeptSlave(); @@ -48,7 +48,7 @@ public class SyncHospitalData { @DataSource(value = DataSourceType.SLAVE) - @Scheduled(cron = "*/30 * * * * ?") + @Scheduled(cron = "0 */1 * * * ?") public void syncUserData() { try { List sysUsers = dockService.syncUmsUserSlave(); From ac9ea3ac11d8e57aa194e7020c0e541ed1c8d1c7 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 15:23:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E7=9A=84=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruisi-web-admin/src/main/resources/application-stage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml b/ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml index a5b27ce..155a08f 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml @@ -88,7 +88,7 @@ app: # 资源访问路径前缀 示例（/profile） profileUrl: /profile # 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profilePath: /home/ruisiCga/server/profile + profilePath: D:/Projects/ruisi_cga/server/profile/ # 分布式ID-WorkID workerId: 1 # 分布式ID-DataCenterID From 15a7514f345f6871b8f39577d1459edcb11fbae8 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Tue, 3 Mar 2026 16:03:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=97=B6=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/system/service/impl/DockServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java index 3dab2d4..066acd5 100644 --- a/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java +++ b/ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java @@ -724,6 +724,7 @@ public class DockServiceImpl implements DockService { // 证件信息 pmsPatient.setIdcard(dockPatientBaseInfo.getIdCard()); pmsPatient.setPhone(dockPatientBaseInfo.getPhone()); + pmsPatient.setMobile(dockPatientBaseInfo.getPhone()); // 性别转换：将"男"/"女"转换为 0/1 String sex = dockPatientBaseInfo.getSex();