ruoyi-admin/src/main/resources/application-ls.yml
@@ -11,7 +11,7 @@ # username: smartor # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://cluster02.db.lsjky.cn:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://9.209.1.5:2883/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root@sfxx#other_cluster02 password: Y5oapyS8 driverClassName: com.mysql.cj.jdbc.Driver ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -1,5 +1,6 @@ package com.ruoyi.quartz.service.impl; import com.google.gson.Gson; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUserDept; @@ -10,6 +11,7 @@ import com.smartor.mapper.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -447,7 +449,7 @@ SysUser suerTemp = new SysUser(); //用户-机构关系-科室 List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp); //用户-机构关系-病房 //用户-机构关系-病区 List<SysUserDept> sysUserDeptBfAll = chMapper.yhybfxx(suerTemp); //用户-院区关系 List<SysUserOrg> sysUserOrgAll = chMapper.yhyyqxx(suerTemp); @@ -466,6 +468,10 @@ List<SysUserDept> sysUserDeptBf = sysUserDeptBfAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList()); //新增用户与院区 List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList()); List<String> userDepts = sysUserDept.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList()); List<String> userDeptBfs = sysUserDeptBf.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList()); if (usersTemp.size() > 0) { sysUser1.setUserId(usersTemp.get(0).getUserId()); sysUser1.setUserName(sysUser1.getHisUserId()); @@ -474,9 +480,25 @@ sysUser1.setOrgid(sysUserOrg.get(0).getOrgid()); sysUser1.setCampusid(sysUserOrg.get(0).getCampusid()); } //将部门我病区放到指定字段中 Gson gson = new Gson(); if(!userDepts.isEmpty()){ sysUser1.setDeptInfo(gson.toJson(userDepts)); } if(!userDeptBfs.isEmpty()){ sysUser1.setHospInfo(gson.toJson(userDeptBfs)); } sysUser2Mapper.updateUser(sysUser1); } else { sysUser1.setUserName(sysUser1.getHisUserId()); //将部门我病区放到指定字段中 Gson gson = new Gson(); if(!userDepts.isEmpty()){ sysUser1.setDeptInfo(gson.toJson(userDepts)); } if(!userDeptBfs.isEmpty()){ sysUser1.setHospInfo(gson.toJson(userDeptBfs)); } sysUser2Mapper.insertUser(sysUser1); //对应 SysUserServiceImpl selectUserByUserName2 191行 if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) { ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -385,6 +385,7 @@ FROM healthy_user_dept where 1=1 and user_id != 'admin' and dept_type = '1' <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> @@ -393,9 +394,10 @@ <select id="yhybfxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult"> select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid FROM healthy_user_dept_bf FROM healthy_user_dept where 1=1 and user_id != 'admin' and dept_type = '2' <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -122,7 +122,7 @@ u.job_phone, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.orgid,u,campusid, u.orgid,u.campusid, d.dept_name from sys_user u left join sys_user_dept d on u.user_id = d.user_id smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java
@@ -198,6 +198,12 @@ @ApiModelProperty(value = "年龄") private String age; /** * 性别 */ @ApiModelProperty(value = "性别") private Long sex; /** * 手机号 smartor/src/main/java/com/smartor/service/impl/PatMedOuthospServiceImpl.java
@@ -82,7 +82,9 @@ patArchive.setAgeUnit(map.get("ageUnit")); patArchive.setAge2(ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null); patArchive.setAgeUnit2(map.get("ageUnit2")); patMedOuthosp1.setAge(patArchive.getAge() + patArchive.getAgeUnit() + patArchive.getAge2() + patArchive.getAgeUnit2()); patMedOuthosp1.setSex(patArchive.getSex()); patMedOuthosp1.setTelcode(patArchive.getTelcode()); patMedOuthosp1.setIdcardno(patArchive.getIdcardno()); } smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -938,6 +938,7 @@ pa.setAge2(ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null); pa.setAgeUnit2(map.get("ageUnit2")); patMedOuthosp1.setAge(pa.getAge() + pa.getAgeUnit() + pa.getAge2() + pa.getAgeUnit2()); patMedOuthosp1.setSex(patArchive.getSex()); patMedOuthosp1.setTelcode(patArchive.getTelcode()); patMedOuthosp1.setIdcardno(patArchive.getIdcardno()); } smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
@@ -230,19 +230,19 @@ </trim> where 1=1 <if test="subid != null">and subid = #{subid}, #{subid} </if> <if test="taskid != null">and taskid = #{taskid}, #{taskid} </if> <if test="preachform != null">and preachform = #{preachform}, #{preachform} </if> <if test="remark != null">and remark = #{remark}, #{remark} </if> <if test="orgid != null">and orgid = #{orgid}, #{orgid} </if> </update>
