From 516277aa8071a9c04fcc1400a938ad9b8063b9a7 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 17 May 2024 14:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E5=BA=93=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedruginfo/BaseDrugInfoController.java     |  4 ++--
 .../BaseNursingInfoController.java               |  4 ++--
 .../domain/basenursinginfo/BaseNursingInfo.java  |  6 +++---
 .../basenursinginfo/BaseNursingInfoMapper.xml    | 16 ++++++++--------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basedruginfo/BaseDrugInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basedruginfo/BaseDrugInfoController.java
index 8e4fc2f2..fbd34c5e 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basedruginfo/BaseDrugInfoController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basedruginfo/BaseDrugInfoController.java
@@ -64,7 +64,7 @@ public class BaseDrugInfoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:baseDrug:add')")
     @Log(title = "药品库", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody BaseDrugInfo baseDrugInfo) {
         return toAjax(baseDrugInfoService.insertBaseDrugInfo(baseDrugInfo));
     }
@@ -74,7 +74,7 @@ public class BaseDrugInfoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:baseDrug:edit')")
     @Log(title = "药品库", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody BaseDrugInfo baseDrugInfo) {
         return toAjax(baseDrugInfoService.updateBaseDrugInfo(baseDrugInfo));
     }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basenursinginfo/BaseNursingInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basenursinginfo/BaseNursingInfoController.java
index 48f85b9b..4f319b40 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basenursinginfo/BaseNursingInfoController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/basenursinginfo/BaseNursingInfoController.java
@@ -64,7 +64,7 @@ public class BaseNursingInfoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:baseNursing:add')")
     @Log(title = "护理知识库", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody BaseNursingInfo baseNursingInfo) {
         return toAjax(baseNursingInfoService.insertBaseNursingInfo(baseNursingInfo));
     }
@@ -74,7 +74,7 @@ public class BaseNursingInfoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:baseNursing:edit')")
     @Log(title = "护理知识库", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     public AjaxResult edit(@RequestBody BaseNursingInfo baseNursingInfo) {
         return toAjax(baseNursingInfoService.updateBaseNursingInfo(baseNursingInfo));
     }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/basenursinginfo/BaseNursingInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/basenursinginfo/BaseNursingInfo.java
index 016aaa4f..f3cf5c96 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/basenursinginfo/BaseNursingInfo.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/basenursinginfo/BaseNursingInfo.java
@@ -62,8 +62,8 @@ public class BaseNursingInfo extends BaseEntity {
      * $column.columnComment
      */
     @ApiModelProperty(value = "${comment}")
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String familySecurity;
+    @Excel(name = "居家安全指导")
+    private String homeSafeguard;
 
 
     @Override
@@ -74,7 +74,7 @@ public class BaseNursingInfo extends BaseEntity {
                 .append("tobaccoWine", getTobaccoWine())
                 .append("sleep", getSleep())
                 .append("emotion", getEmotion())
-                .append("familySecurity", getFamilySecurity())
+                .append("homeSafeguard", getHomeSafeguard())
                 .append("createTime", getCreateTime())
                 .append("createBy", getCreateBy())
                 .append("updateBy", getUpdateBy())
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/basenursinginfo/BaseNursingInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/basenursinginfo/BaseNursingInfoMapper.xml
index c7d766c7..b1c01f12 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/basenursinginfo/BaseNursingInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/basenursinginfo/BaseNursingInfoMapper.xml
@@ -10,7 +10,7 @@
             <result property="tobaccoWine" column="tobacco_wine"/>
             <result property="sleep" column="sleep"/>
             <result property="emotion" column="emotion"/>
-            <result property="familySecurity" column="family_security"/>
+            <result property="homeSafeguard" column="home_safeguard"/>
             <result property="createTime" column="create_time"/>
             <result property="createBy" column="create_by"/>
             <result property="updateBy" column="update_by"/>
@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="selectBaseNursingInfoVo">
-        select id, nursing_name, tobacco_wine, sleep, emotion, family_security, create_time, create_by, update_by, update_time from base_nursing_info
+        select id, nursing_name, tobacco_wine, sleep, emotion, home_safeguard, create_time, create_by, update_by, update_time from base_nursing_info
     </sql>
 
     <select id="selectBaseNursingInfoList" parameterType="BaseNursingInfo" resultMap="BaseNursingInfoResult">
@@ -36,8 +36,8 @@
                         <if test="emotion != null  and emotion != ''">
                             and emotion = #{emotion}
                         </if>
-                        <if test="familySecurity != null  and familySecurity != ''">
-                            and family_security = #{familySecurity}
+                        <if test="homeSafeguard != null  and homeSafeguard != ''">
+                            and home_safeguard = #{homeSafeguard}
                         </if>
         </where>
     </select>
@@ -60,7 +60,7 @@
                     </if>
                     <if test="emotion != null">emotion,
                     </if>
-                    <if test="familySecurity != null">family_security,
+                    <if test="homeSafeguard != null">home_safeguard,
                     </if>
                     <if test="createTime != null">create_time,
                     </if>
@@ -80,7 +80,7 @@
                     </if>
                     <if test="emotion != null">#{emotion},
                     </if>
-                    <if test="familySecurity != null">#{familySecurity},
+                    <if test="homeSafeguard != null">#{homeSafeguard},
                     </if>
                     <if test="createTime != null">#{createTime},
                     </if>
@@ -108,8 +108,8 @@
                     <if test="emotion != null">emotion =
                         #{emotion},
                     </if>
-                    <if test="familySecurity != null">family_security =
-                        #{familySecurity},
+                    <if test="homeSafeguard != null">home_safeguard =
+                        #{homeSafeguard},
                     </if>
                     <if test="createTime != null">create_time =
                         #{createTime},