完善

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/DgController.java

@@ -45,6 +45,7 @@ public class DgController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据id查询")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:dg:query')")
     @GetMapping(value = "/detail/{id}")
@@ -52,6 +53,7 @@ public class DgController extends BaseController {
         return AjaxResult.success(dgService.getById(id));
     }
 
+    @ApiOperation(value = "添加诊断信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:dg:add')")
     @Log(title = "诊断", businessType = BusinessType.INSERT)
@@ -60,6 +62,7 @@ public class DgController extends BaseController {
         return toAjax(dgService.save(dg));
     }
 
+    @ApiOperation(value = "修改诊断信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:dg:edit')")
     @Log(title = "诊断", businessType = BusinessType.UPDATE)
@@ -68,6 +71,7 @@ public class DgController extends BaseController {
         return toAjax(dgService.updateById(dg));
     }
 
+    @ApiOperation(value = "删除诊断信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:dg:remove')")
     @Log(title = "诊断", businessType = BusinessType.DELETE)

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NkController.java

@@ -0,0 +1,83 @@
+package com.ruoyi.web.work.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.ruoyi.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.work.domain.Nk;
+import com.ruoyi.web.work.service.INkService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 亲属关系
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Api(tags = "亲属关系管理")
+@Anonymous
+@RestController
+@RequestMapping("/work/nk")
+public class NkController extends BaseController {
+    @Autowired
+    private INkService nkService;
+
+    @ApiOperation(value = "获取亲属信息列表")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:nk:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(Nk nk){
+        startPage();
+        List<Nk> list = nkService.selectList(nk);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "根据id查询亲属信息")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:nk:query')")
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id){
+        return AjaxResult.success(nkService.getById(id));
+    }
+
+    @ApiOperation(value = "添加亲属信息")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:nk:add')")
+    @Log(title = "亲属关系", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody Nk nk){
+        return toAjax(nkService.save(nk));
+    }
+
+    @ApiOperation(value = "修改亲属信息")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:nk:edit')")
+    @Log(title = "亲属关系", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody Nk nk){
+        return toAjax(nkService.updateById(nk));
+    }
+
+    @ApiOperation(value = "删除亲属信息")
+    @Anonymous
+    //@PreAuthorize("@ss.hasPermi('work:nk:remove')")
+    @Log(title = "亲属关系", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids){
+        return toAjax(nkService.removeByIds(Arrays.asList(ids)));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv1Controller.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-19
  */
+@Api(tags = "住院信息管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/pv1")
@@ -32,6 +35,7 @@ public class Pv1Controller extends BaseController {
     @Autowired
     private IPv1Service pv1Service;
 
+    @ApiOperation(value = "获取住院信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:list')")
     @GetMapping("/list")
@@ -41,6 +45,7 @@ public class Pv1Controller extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据id查询住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:query')")
     @GetMapping(value = "/detail/{id}")
@@ -48,6 +53,7 @@ public class Pv1Controller extends BaseController {
         return AjaxResult.success(pv1Service.getById(id));
     }
 
+    @ApiOperation(value = "添加住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:add')")
     @Log(title = "住院信息", businessType = BusinessType.INSERT)
@@ -56,6 +62,7 @@ public class Pv1Controller extends BaseController {
         return toAjax(pv1Service.save(pv1));
     }
 
+    @ApiOperation(value = "修改住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:edit')")
     @Log(title = "住院信息", businessType = BusinessType.UPDATE)
@@ -64,6 +71,7 @@ public class Pv1Controller extends BaseController {
         return toAjax(pv1Service.updateById(pv1));
     }
 
+    @ApiOperation(value = "删除住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv1:remove')")
     @Log(title = "住院信息", businessType = BusinessType.DELETE)

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/Pv2Controller.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-19
  */
+@Api(tags = "住院信息管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/pv2")
@@ -32,6 +35,7 @@ public class Pv2Controller extends BaseController {
     @Autowired
     private IPv2Service pv2Service;
 
+    @ApiOperation(value = "获取住院信息列表")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv2:list')")
     @GetMapping("/list")
@@ -41,6 +45,7 @@ public class Pv2Controller extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据id查询住院信息")
     @Anonymous
    // @PreAuthorize("@ss.hasPermi('work:pv2:query')")
     @GetMapping(value = "/detail/{id}")
@@ -48,6 +53,7 @@ public class Pv2Controller extends BaseController {
         return AjaxResult.success(pv2Service.getById(id));
     }
 
+    @ApiOperation(value = "添加住院信息")
     @Anonymous
    // @PreAuthorize("@ss.hasPermi('work:pv2:add')")
     @Log(title = "住院信息2", businessType = BusinessType.INSERT)
@@ -56,6 +62,7 @@ public class Pv2Controller extends BaseController {
         return toAjax(pv2Service.save(pv2));
     }
 
+    @ApiOperation(value = "修改住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv2:edit')")
     @Log(title = "住院信息2", businessType = BusinessType.UPDATE)
@@ -64,6 +71,7 @@ public class Pv2Controller extends BaseController {
         return toAjax(pv2Service.updateById(pv2));
     }
 
+    @ApiOperation(value = "删除住院信息")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:pv2:remove')")
     @Log(title = "住院信息2", businessType = BusinessType.DELETE)

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/UserController.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author lsw
  * @date 2024-07-19
  */
+@Api(tags = "小程序用户管理")
 @Anonymous
 @RestController
 @RequestMapping("/work/user")
@@ -32,6 +35,7 @@ public class UserController extends BaseController {
     @Autowired
     private IUserService userService;
 
+    @ApiOperation(value = "获取小程序用户")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:user:list')")
     @GetMapping("/list")
@@ -41,6 +45,7 @@ public class UserController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "根据id查询小程序用户")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:user:query')")
     @GetMapping(value = "/detail/{id}")
@@ -48,6 +53,7 @@ public class UserController extends BaseController {
         return AjaxResult.success(userService.getById(id));
     }
 
+    @ApiOperation(value = "添加小程序用户")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:user:add')")
     @Log(title = "小程序用户", businessType = BusinessType.INSERT)
@@ -56,6 +62,7 @@ public class UserController extends BaseController {
         return toAjax(userService.save(user));
     }
 
+    @ApiOperation(value = "修改小程序用户")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:user:edit')")
     @Log(title = "小程序用户", businessType = BusinessType.UPDATE)
@@ -64,6 +71,7 @@ public class UserController extends BaseController {
         return toAjax(userService.updateById(user));
     }
 
+    @ApiOperation(value = "删除小程序用户")
     @Anonymous
     //@PreAuthorize("@ss.hasPermi('work:user:remove')")
     @Log(title = "小程序用户", businessType = BusinessType.DELETE)

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Nk.java

@@ -0,0 +1,62 @@
+package com.ruoyi.web.work.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Data
+@TableName(value = "tb_nk")
+@Accessors(chain = true)
+public class Nk{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty(value = "近亲姓名")
+    private String name;
+
+    @ApiModelProperty(value = "患者id")
+    private Long patientId;
+
+    @ApiModelProperty(value = "NK1 序号，自增长")
+    private Long nkNumber;
+
+    @ApiModelProperty(value = "近亲关系 SEL 自己 SPO 配偶 CHD 孩子 MTH 母亲 FTH 父亲 SIB 同胞 BRO 兄弟 SIS 姐妹 FND 朋友 EMR 雇主 OTH 其他")
+    private String kinship;
+
+    @ApiModelProperty(value = "近亲地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+
+    @ApiModelProperty(value = "工作名称")
+    private String workName;
+
+    @ApiModelProperty(value = "工作类别")
+    private String workCode;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/NkMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.mapper;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Nk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface NkMapper extends BaseMapper<Nk> {
+    List<Nk> selectList(Nk nk);
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/INkService.java

@@ -0,0 +1,13 @@
+package com.ruoyi.web.work.service;
+
+import java.util.List;
+import com.ruoyi.web.work.domain.Nk;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+public interface INkService extends IService<Nk>{
+    List<Nk> selectList(Nk nk);
+}

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/NkServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.work.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.web.work.mapper.NkMapper;
+import com.ruoyi.web.work.domain.Nk;
+import com.ruoyi.web.work.service.INkService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @author lsw
+ * @date 2024-07-19
+ */
+@Service
+public class NkServiceImpl extends ServiceImpl<NkMapper, Nk> implements INkService {
+    @Autowired
+    private NkMapper nkMapper;
+
+    @Override
+    public List<Nk> selectList(Nk nk) {
+        return nkMapper.selectList(nk);
+    }
+}

ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9999
+  port: 9191
   servlet:
     # 应用的访问路径
     context-path: /