兽医人员库

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/controller/BizMedicalResourceController.java

@@ -55,6 +55,13 @@ public class BizMedicalResourceController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:list')")
+    @GetMapping("/townOptions")
+    public AjaxResult townOptions()
+    {
+        return success(bizMedicalResourceService.listTownOptions());
+    }
+
     @PreAuthorize("@ss.hasPermi('diseaseTreatment:medicalResource:query')")
     @GetMapping("/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/domain/BizMedicalResource.java

@@ -31,6 +31,12 @@ public class BizMedicalResource extends BaseEntity
 
     private String affiliatedUnit;
 
+    /** 所属乡镇部门 ID（仅兽医人员，非必填） */
+    private Long townDeptId;
+
+    /** 所属乡镇名称冗余 */
+    private String townName;
+
     private String detailAddress;
 
     /** 库字段：逗号分隔 */
@@ -193,6 +199,26 @@ public class BizMedicalResource extends BaseEntity
         this.affiliatedUnit = affiliatedUnit;
     }
 
+    public Long getTownDeptId()
+    {
+        return townDeptId;
+    }
+
+    public void setTownDeptId(Long townDeptId)
+    {
+        this.townDeptId = townDeptId;
+    }
+
+    public String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
     public String getDetailAddress()
     {
         return detailAddress;

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/service/IBizMedicalResourceService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.diagnosis.service;
 
 import java.util.List;
+import java.util.Map;
 import com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource;
 
 /**
@@ -32,4 +33,7 @@ public interface IBizMedicalResourceService
 
     /** 批量分配账号；已分配账号的记录跳过，其余按单条规则处理 */
     int assignAccountByIds(Long[] ids, String operator);
+
+    /** 填报乡镇下拉（兽医人员所属乡镇） */
+    List<Map<String, Object>> listTownOptions();
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImpl.java

@@ -4,11 +4,13 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
@@ -23,6 +25,7 @@ import com.ruoyi.web.modules.diagnosis.support.MedicalResourceReferenceChecker;
 import com.ruoyi.web.modules.diagnosis.support.MedicalResourceRules;
 import com.ruoyi.web.modules.diagnosis.support.MedicalResourceTypeValidator;
 import com.ruoyi.web.modules.diagnosis.support.MedicalResourceValidation;
+import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
 
 /**
  * 畜牧医疗资源服务实现。
@@ -42,6 +45,9 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
     @Autowired
     private MedicalResourceTypeValidator medicalResourceTypeValidator;
 
+    @Autowired
+    private TownDeptSupport townDeptSupport;
+
     @Override
     public BizMedicalResource selectBizMedicalResourceById(Long id)
     {
@@ -71,6 +77,7 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
     {
         medicalResourceTypeValidator.assertAllowed(row.getResourceType());
         MedicalResourceValidation.validateRowForSave(row);
+        applyTownDept(row);
         row.setPublishStatus(MedicalResourceRules.PUBLISH_STATUS_DRAFT);
         row.setPublishTime(null);
         row.setOfflineTime(null);
@@ -95,6 +102,7 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         row.setResourceType(db.getResourceType());
         medicalResourceTypeValidator.assertAllowed(row.getResourceType());
         MedicalResourceValidation.validateRowForSave(row);
+        applyTownDept(row);
 
         String oldPhotoPath = db.getPhotoFilePath();
         row.setPublishStatus(db.getPublishStatus());
@@ -106,9 +114,13 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         row.setDelFlag(db.getDelFlag());
 
         int n = bizMedicalResourceMapper.updateBizMedicalResource(row);
-        if (n > 0 && !StringUtils.equals(StringUtils.nvl(oldPhotoPath, ""), StringUtils.nvl(row.getPhotoFilePath(), "")))
+        if (n > 0)
         {
-            deleteDiskFile(oldPhotoPath);
+            accountAssigner.syncLinkedUserDept(row);
+            if (!StringUtils.equals(StringUtils.nvl(oldPhotoPath, ""), StringUtils.nvl(row.getPhotoFilePath(), "")))
+            {
+                deleteDiskFile(oldPhotoPath);
+            }
         }
         return n;
     }
@@ -272,6 +284,40 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         return row;
     }
 
+    /**
+     * 兽医人员可选所属乡镇：校验部门并冗余乡镇名；非兽医清空。
+     */
+    private void applyTownDept(BizMedicalResource row)
+    {
+        if (row == null)
+        {
+            return;
+        }
+        if (!MedicalResourceRules.RESOURCE_TYPE_VET.equals(row.getResourceType()))
+        {
+            row.setTownDeptId(null);
+            row.setTownName(null);
+            return;
+        }
+        if (row.getTownDeptId() == null)
+        {
+            row.setTownName(null);
+            return;
+        }
+        SysDept town = townDeptSupport.requireReportTown(row.getTownDeptId());
+        if (town == null)
+        {
+            throw new ServiceException("所属乡镇无效");
+        }
+        row.setTownName(town.getDeptName());
+    }
+
+    @Override
+    public List<Map<String, Object>> listTownOptions()
+    {
+        return townDeptSupport.toOptionList();
+    }
+
     private static List<Long> cleanIds(Long[] ids)
     {
         List<Long> cleaned = new ArrayList<>();

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceAccountAssigner.java

@@ -46,6 +46,10 @@ public class MedicalResourceAccountAssigner
         user.setUserName(loginName);
         user.setNickName(resource.getResourceName());
         user.setPhonenumber(resource.getContactPhone());
+        if (resource.getTownDeptId() != null)
+        {
+            user.setDeptId(resource.getTownDeptId());
+        }
         user.setPassword(SecurityUtils.encryptPassword(initPwd));
         user.setStatus("0");
         user.setCreateBy(operator);
@@ -58,6 +62,24 @@ public class MedicalResourceAccountAssigner
         return user;
     }
 
+    /**
+     * 已分配账号时，将所属乡镇同步到 sys_user.dept_id（可为空以清空）。
+     */
+    public void syncLinkedUserDept(BizMedicalResource resource)
+    {
+        if (resource == null
+                || resource.getAccountAssigned() == null
+                || resource.getAccountAssigned() != MedicalResourceRules.ACCOUNT_ASSIGNED_YES
+                || resource.getSysUserId() == null)
+        {
+            return;
+        }
+        SysUser user = new SysUser();
+        user.setUserId(resource.getSysUserId());
+        user.setDeptId(resource.getTownDeptId());
+        sysUserService.updateUserProfile(user);
+    }
+
     /**
      * 逻辑删除资源时，若已分配平台账号则一并删除（草稿 §10）。
      */

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceValidation.java

@@ -429,14 +429,17 @@ public final class MedicalResourceValidation
         }
         else if (MedicalResourceRules.RESOURCE_TYPE_TEAM.equals(type))
         {
+            clearTownFields(row);
             validateTeamFields(row);
         }
         else if (MedicalResourceRules.RESOURCE_TYPE_ORG.equals(type))
         {
+            clearTownFields(row);
             validateOrgFields(row);
         }
         else if (MedicalResourceRules.RESOURCE_TYPE_EQUIPMENT.equals(type))
         {
+            clearTownFields(row);
             validateEquipmentFields(row);
         }
         else
@@ -445,6 +448,12 @@ public final class MedicalResourceValidation
         }
     }
 
+    private static void clearTownFields(BizMedicalResource row)
+    {
+        row.setTownDeptId(null);
+        row.setTownName(null);
+    }
+
     private static void validateVetFields(BizMedicalResource row)
     {
         validateContactPhone(row.getContactPhone(), false);

baqing-admin/src/main/resources/mapper/diagnosis/BizMedicalResourceMapper.xml

@@ -11,6 +11,8 @@
         <result property="introduction"          column="introduction"/>
         <result property="contactPhone"          column="contact_phone"/>
         <result property="affiliatedUnit"        column="affiliated_unit"/>
+        <result property="townDeptId"            column="town_dept_id"/>
+        <result property="townName"              column="town_name"/>
         <result property="detailAddress"         column="detail_address"/>
         <result property="consultModes"          column="consult_modes"/>
         <result property="serviceArea"           column="service_area"/>
@@ -43,7 +45,7 @@
 
     <sql id="selectVo">
         select id, resource_type, resource_name, photo_file_url, photo_file_path, introduction,
-               contact_phone, affiliated_unit, detail_address, consult_modes, service_area,
+               contact_phone, affiliated_unit, town_dept_id, town_name, detail_address, consult_modes, service_area,
                fee_standard, service_start_time, service_end_time, service_weekdays,
                max_daily_appointments, establish_date, team_size, team_members, person_in_charge,
                org_level, equipment_model, longitude, latitude,
@@ -98,6 +100,9 @@
             <if test="resourceName != null and resourceName != ''">
                 and resource_name like concat('%', #{resourceName}, '%')
             </if>
+            <if test="townDeptId != null">
+                and town_dept_id = #{townDeptId}
+            </if>
             <if test="queryPublishStatus != null and queryPublishStatus == 0">
                 and publish_status = 0 and offline_time is null
             </if>
@@ -114,7 +119,7 @@
     <insert id="insertBizMedicalResource" parameterType="com.ruoyi.web.modules.diagnosis.domain.BizMedicalResource" useGeneratedKeys="true" keyProperty="id">
         insert into biz_medical_resource (
             resource_type, resource_name, photo_file_url, photo_file_path, introduction,
-            contact_phone, affiliated_unit, detail_address, consult_modes, service_area,
+            contact_phone, affiliated_unit, town_dept_id, town_name, detail_address, consult_modes, service_area,
             fee_standard, service_start_time, service_end_time, service_weekdays,
             max_daily_appointments, establish_date, team_size, team_members, person_in_charge,
             org_level, equipment_model, longitude, latitude,
@@ -123,7 +128,7 @@
             create_by, create_time, remark
         ) values (
             #{resourceType}, #{resourceName}, #{photoFileUrl}, #{photoFilePath}, #{introduction},
-            #{contactPhone}, #{affiliatedUnit}, #{detailAddress}, #{consultModes}, #{serviceArea},
+            #{contactPhone}, #{affiliatedUnit}, #{townDeptId}, #{townName}, #{detailAddress}, #{consultModes}, #{serviceArea},
             #{feeStandard}, #{serviceStartTime}, #{serviceEndTime}, #{serviceWeekdays},
             #{maxDailyAppointments}, #{establishDate}, #{teamSize}, #{teamMembers}, #{personInCharge},
             #{orgLevel}, #{equipmentModel}, #{longitude}, #{latitude},
@@ -141,6 +146,8 @@
             introduction = #{introduction},
             contact_phone = #{contactPhone},
             affiliated_unit = #{affiliatedUnit},
+            town_dept_id = #{townDeptId},
+            town_name = #{townName},
             detail_address = #{detailAddress},
             consult_modes = #{consultModes},
             service_area = #{serviceArea},

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/mapper/BizMedicalResourceMapperXmlTest.java

@@ -21,6 +21,7 @@ class BizMedicalResourceMapperXmlTest
         assertTrue(xml.contains("resource_type = '004001'"));
         assertTrue(xml.contains("resource_type = '004003'"));
         assertTrue(xml.contains("resource_name like concat('%', #{resourceName}, '%')"));
+        assertTrue(xml.contains("town_dept_id = #{townDeptId}"));
         assertTrue(xml.contains("offline_time is null"));
         assertTrue(xml.contains("offline_time is not null"));
         assertTrue(xml.contains("order by create_time desc, id desc"));
@@ -30,6 +31,8 @@ class BizMedicalResourceMapperXmlTest
         assertTrue(xml.contains("account_assigned = 1"));
         assertTrue(xml.contains("countBySysUserId"));
         assertTrue(xml.contains("from biz_medical_resource"));
+        assertTrue(xml.contains("town_dept_id"));
+        assertTrue(xml.contains("town_name"));
     }
 
     private static String readMapperXml()

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImplTest.java

@@ -43,6 +43,9 @@ class BizMedicalResourceServiceImplTest
     @Mock
     private MedicalResourceTypeValidator medicalResourceTypeValidator;
 
+    @Mock
+    private com.ruoyi.web.modules.industryservice.support.TownDeptSupport townDeptSupport;
+
     @InjectMocks
     private BizMedicalResourceServiceImpl service;
 
@@ -167,6 +170,34 @@ class BizMedicalResourceServiceImplTest
         verify(mapper, times(2)).updateBizMedicalResource(any());
     }
 
+    @Test
+    @DisplayName("修改兽医且已分配账号时同步用户部门")
+    void updateSyncsLinkedUserDept()
+    {
+        BizMedicalResource db = MedicalResourceTestSamples.sampleVetDraft();
+        db.setId(1L);
+        db.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
+        db.setSysUserId(88L);
+        db.setConsultModes("1,2,3");
+        when(mapper.selectBizMedicalResourceById(1L)).thenReturn(db);
+        when(mapper.updateBizMedicalResource(any())).thenReturn(1);
+        com.ruoyi.common.core.domain.entity.SysDept town = new com.ruoyi.common.core.domain.entity.SysDept();
+        town.setDeptId(201L);
+        town.setDeptName("雅安镇");
+        when(townDeptSupport.requireReportTown(201L)).thenReturn(town);
+        doNothing().when(accountAssigner).syncLinkedUserDept(any());
+
+        BizMedicalResource in = MedicalResourceTestSamples.sampleVetDraft();
+        in.setId(1L);
+        in.setTownDeptId(201L);
+        in.setConsultModesList(java.util.Arrays.asList(1, 2, 3));
+        assertEquals(1, service.updateBizMedicalResource(in));
+        verify(accountAssigner).syncLinkedUserDept(argThat(r ->
+                Long.valueOf(201L).equals(r.getTownDeptId())
+                        && "雅安镇".equals(r.getTownName())
+                        && Long.valueOf(88L).equals(r.getSysUserId())));
+    }
+
     @Test
     @DisplayName("分配账号")
     void assignAccount()

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/support/MedicalResourceAccountAssignerTest.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.modules.diagnosis.support;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -44,6 +45,7 @@ class MedicalResourceAccountAssignerTest
         BizMedicalResource resource = MedicalResourceTestSamples.sampleVetDraft();
         resource.setId(12L);
         resource.setResourceName("张兽医");
+        resource.setTownDeptId(201L);
         SysRole role = new SysRole();
         role.setRoleId(100L);
         when(sysRoleMapper.checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET)).thenReturn(role);
@@ -58,6 +60,44 @@ class MedicalResourceAccountAssignerTest
         SysUser user = assigner.createAccount(resource, "admin");
         assertEquals("zsy12", user.getUserName());
         verify(sysRoleMapper).checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET);
+        verify(sysUserService).insertUser(argThat(u -> Long.valueOf(201L).equals(u.getDeptId())));
+    }
+
+    @Test
+    @DisplayName("兽医无乡镇时不写 deptId")
+    void createAccountVetWithoutTown()
+    {
+        BizMedicalResource resource = MedicalResourceTestSamples.sampleVetDraft();
+        resource.setId(12L);
+        resource.setResourceName("张兽医");
+        resource.setTownDeptId(null);
+        SysRole role = new SysRole();
+        role.setRoleId(100L);
+        when(sysRoleMapper.checkRoleKeyUnique(MedicalResourceRules.ROLE_KEY_VET)).thenReturn(role);
+        when(sysUserService.checkUserNameUnique(any())).thenReturn(true);
+        when(configService.selectConfigByKey("sys.user.initPassword")).thenReturn("123456");
+        when(sysUserService.insertUser(any())).thenAnswer(inv -> {
+            SysUser u = inv.getArgument(0);
+            u.setUserId(1L);
+            return 1;
+        });
+
+        assigner.createAccount(resource, "admin");
+        verify(sysUserService).insertUser(argThat(u -> u.getDeptId() == null));
+    }
+
+    @Test
+    @DisplayName("已分配时同步更新用户部门")
+    void syncLinkedUserDept()
+    {
+        BizMedicalResource resource = MedicalResourceTestSamples.sampleVetDraft();
+        resource.setAccountAssigned(MedicalResourceRules.ACCOUNT_ASSIGNED_YES);
+        resource.setSysUserId(9L);
+        resource.setTownDeptId(202L);
+        when(sysUserService.updateUserProfile(any())).thenReturn(1);
+        assigner.syncLinkedUserDept(resource);
+        verify(sysUserService).updateUserProfile(argThat(u ->
+                Long.valueOf(9L).equals(u.getUserId()) && Long.valueOf(202L).equals(u.getDeptId())));
     }
 
     @Test

doc/牧业疫病诊疗服务/畜牧医疗资源管理/畜牧医疗资源管理功能需求.md

@@ -206,6 +206,7 @@ flowchart TD
 | 兽医介绍 | **选填**；若有内容 **≤500** 字 |
 | 联系方式 | **选填**；若填写须为大陆手机号 |
 | 隶属单位 | **选填**；若有内容 **≤20** 字 |
+| 所属乡镇 | **选填**；下拉选择填报乡镇（`sys_dept`）；有值时分配账号写入关联用户 `dept_id`，编辑保存时同步更新 |
 | 详细地址 | **选填**；若有内容 **≤100** 字 |
 | 接诊方式 | **必填**；**多选**至少一项：定点接诊、上门接诊、在线接诊 |
 | 服务区域 | **选填**；若有内容 **≤100** 字 |
@@ -309,6 +310,7 @@ flowchart TD
 | 次数 | **每条仅成功一次**；已分配则不可重复 |
 | 默认登录名 | **展示名称汉语拼音（全拼、无空格、小写）** + **该条资源唯一业务编号** |
 | 默认角色 | **兽医** → 预置兽医端角色（草稿：**编号 100**）。**机构** → 预置机构端角色（草稿：**编号 102**）。以系统角色配置为准 |
+| 部门同步 | **兽医**：若已填「所属乡镇」，创建用户时写入 `sys_user.dept_id`；编辑资源且已分配账号时同步更新 `dept_id` |
 | 与发布 | **默认未发布可分配**；**已发布不可新分配** |
 | 失败 | 明确原因；**不**记为已分配，可重试（仍仅一次成功） |
 

doc/牧业疫病诊疗服务/畜牧医疗资源管理/畜牧医疗资源管理技术方案.md

@@ -50,6 +50,8 @@
 | `introduction` | `varchar(500)` | Y | — | 介绍，需求 1～500 字 |
 | `contact_phone` | `varchar(20)` | N | NULL | 联系电话；类型 1/2/3 由应用层必填 |
 | `affiliated_unit` | `varchar(64)` | N | NULL | 隶属单位 |
+| `town_dept_id` | `bigint(20)` | N | NULL | 所属乡镇部门 ID（**仅兽医人员**，选填）；有值时分配账号写入 `sys_user.dept_id`，修改时同步 |
+| `town_name` | `varchar(64)` | N | NULL | 所属乡镇名称冗余 |
 | `detail_address` | `varchar(200)` | N | NULL | 详细地址（兽医、机构） |
 | `consult_modes` | `varchar(32)` | N | NULL | 接诊方式，逗号分隔 **1**定点 **2**上门 **3**在线 |
 | `service_area` | `varchar(200)` | N | NULL | 服务区域（兽医） |

sql/biz_medical_resource.sql

@@ -10,6 +10,8 @@ CREATE TABLE IF NOT EXISTS `biz_medical_resource` (
   `introduction` varchar(500) DEFAULT NULL COMMENT '介绍',
   `contact_phone` varchar(20) DEFAULT NULL COMMENT '联系电话',
   `affiliated_unit` varchar(64) DEFAULT NULL COMMENT '隶属单位',
+  `town_dept_id` bigint(20) DEFAULT NULL COMMENT '所属乡镇部门ID(仅兽医人员，可选)',
+  `town_name` varchar(64) DEFAULT NULL COMMENT '所属乡镇名称冗余',
   `detail_address` varchar(200) DEFAULT NULL COMMENT '详细地址',
   `consult_modes` varchar(32) DEFAULT NULL COMMENT '接诊方式1,2,3',
   `service_area` varchar(200) DEFAULT NULL COMMENT '服务区域',