From ca314f0a83245033ee81023abdd715b024c23693 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 20 Jan 2026 10:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/config/shiro/ShiroConfig.java   |   1 +
 .../elderinfo/mapper/xml/ElderInfoMapper.xml  |   3 +-
 .../impl/NuInvoicingCgdMainServiceImpl.java   |   2 +-
 .../entity/NuConfigSuppliersApply.java        |   1 +
 .../entity/ConfigSuppliersInfo.java           |   3 +
 .../care/entity/CareDirectivePlanInstant.java | 144 +++++++++---------
 .../impl/CareDirectivePlanServiceImpl.java    |  84 +++++-----
 7 files changed, 122 insertions(+), 116 deletions(-)

diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index c53f4964..d3a9c712 100644
--- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -94,6 +94,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/api/pad/invoicing/getShareInfoByCgdId", "anon"); //查询采购单信息（分享接口使用）
         filterChainDefinitionMap.put("/api/pad/invoicing/getCgdListByGysId", "anon"); //查询采购单列表信息（小程序使用）
         filterChainDefinitionMap.put("/api/pad/invoicing/getCgdInfoByCgdId", "anon"); //查询采购单列表详细信息（小程序使用）
+//        filterChainDefinitionMap.put("/api/pad/baseInfo/queryPadPageList", "anon"); //查询采购单列表详细信息（小程序使用）
 //        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单
 //        filterChainDefinitionMap.put("/api/employessInfo/**", "anon"); //测试员工接口
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
index 4031bb60..e9d8485d 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
@@ -17,7 +17,8 @@
         select a.*
         from nu_biz_nu_care_directive_plan a
         where a.nu_id = #{params.nuId}
-          and a.elder_id = #{params.id}
+
+
     </select>
     <select id="selectInfoById" resultType="com.nu.modules.elderinfo.entity.ElderInfo">
         select elder.*,
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index 40e56329..264cd45f 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -1482,7 +1482,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         Map<String, Object> map = new HashMap<>();
         map.put("cgdNo",cgdMain.getCgdNo());
         map.put("qgDate",cgdMain.getQgDate());
-        map.put("status_dictText",dictUtils.translateDictValue("cgd_status",cgdMain.getStatus()));
+        map.put("cgdType_dictText",dictUtils.translateDictValue("cgd_type",cgdMain.getCgdType()));
         map.put("departName",departName);
         map.put("qgBy",cgdMain.getQgBy());
         map.put("createBy",cgdMain.getCreateBy());
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/entity/NuConfigSuppliersApply.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/entity/NuConfigSuppliersApply.java
index 4bdc848f..9db0ad8b 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/entity/NuConfigSuppliersApply.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/entity/NuConfigSuppliersApply.java
@@ -100,4 +100,5 @@ public class NuConfigSuppliersApply implements Serializable {
     private java.lang.String applyContent;
     private java.lang.String applyId;
     private String suppliersId;
+    private java.lang.String sourceType;
 }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
index 7d58b57e..79608c3f 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
@@ -106,4 +106,7 @@ public class ConfigSuppliersInfo implements Serializable {
     @Dict(dicCode = "iz_enabled")
     @ApiModelProperty(value = "是否启用 Y启用 N未启用")
     private java.lang.String izEnabled;
+    /**来源 1平台新增  2小程序注册*/
+    @ApiModelProperty(value = "来源 1平台新增  2小程序注册")
+    private java.lang.String sourceType;
 }
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlanInstant.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlanInstant.java
index 71c23cc2..49aeac5a 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlanInstant.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlanInstant.java
@@ -37,78 +37,78 @@ public class CareDirectivePlanInstant implements Serializable {
 	@Excel(name = "护理单元id", width = 15)
     @ApiModelProperty(value = "护理单元id")
     private String nuId;
-    /**护理单元名称*/
-    @Excel(name = "护理单元名称", width = 15)
-    @ApiModelProperty(value = "护理单元名称")
-    private String nuName;
-    /**长者id*/
-    private String elderId;
-    /**长者姓名*/
-    private String elderName;
-	/**服务类别id*/
-	@Excel(name = "服务类别id", width = 15)
-    @ApiModelProperty(value = "服务类别id")
-    private String categoryId;
-    /**服务类别名称*/
-    @Excel(name = "服务类别名称", width = 15)
-    @ApiModelProperty(value = "服务类别名称")
-    private String categoryName;
-	/**服务类型id*/
-	@Excel(name = "服务类型id", width = 15)
-    @ApiModelProperty(value = "服务类型id")
-    private String typeId;
-    /**服务类型名称*/
-    @Excel(name = "服务类型名称", width = 15)
-    @ApiModelProperty(value = "服务类型名称")
-    private String typeName;
-	/**服务指令id*/
-	@Excel(name = "服务指令id", width = 15)
-    @ApiModelProperty(value = "服务指令id")
-    private String directiveId;
-	/**服务指令名称*/
-	@Excel(name = "服务指令名称", width = 15)
-    @ApiModelProperty(value = "服务指令名称")
-    private String directiveName;
-    /**即时指令图标*/
-    @ApiModelProperty(value = "即时指令图标")
-    private String immediateFile;
-    /**即时指令图标*/
-    @ApiModelProperty(value = "即时指令图标")
-    private String netImmediateFile;
-    /**即时指令焦点图标*/
-    @ApiModelProperty(value = "即时指令图标")
-    private String immediateFileFocus;
-    /**即时指令焦点图标*/
-    @ApiModelProperty(value = "即时指令图标")
-    private String netImmediateFileFocus;
-    /**服务指令图片大图*/
-    @ApiModelProperty(value = "服务指令图片大图")
-    private String previewFile;
-    /**服务指令图片大图*/
-    @ApiModelProperty(value = "服务指令图片大图")
-    private String netPreviewFile;
-    /**服务指令图片小图*/
-    @ApiModelProperty(value = "服务指令图片小图")
-    private String previewFileSmall;
-    /**服务指令图片小图*/
-    @ApiModelProperty(value = "服务指令图片小图")
-    private String netPreviewFileSmall;
-    /**指令音频文件*/
-    @ApiModelProperty(value = "指令音频文件")
-    private String mp3File;
-    /**指令音频文件-网络地址*/
-    @ApiModelProperty(value = "指令音频文件")
-    private String netMp3File;
-    /**指令视频文件*/
-    @ApiModelProperty(value = "指令视频文件")
-    private String mp4File;
-    /**指令视频文件-网络地址*/
-    @ApiModelProperty(value = "指令视频文件")
-    private String netMp4File;
-    /**服务时长（分钟）*/
-    private String serviceDuration;
-    /**服务描述*/
-    private String serviceContent;
+//    /**护理单元名称*/
+//    @Excel(name = "护理单元名称", width = 15)
+//    @ApiModelProperty(value = "护理单元名称")
+//    private String nuName;
+//    /**长者id*/
+//    private String elderId;
+//    /**长者姓名*/
+//    private String elderName;
+//	/**服务类别id*/
+//	@Excel(name = "服务类别id", width = 15)
+//    @ApiModelProperty(value = "服务类别id")
+//    private String categoryId;
+//    /**服务类别名称*/
+//    @Excel(name = "服务类别名称", width = 15)
+//    @ApiModelProperty(value = "服务类别名称")
+//    private String categoryName;
+//	/**服务类型id*/
+//	@Excel(name = "服务类型id", width = 15)
+//    @ApiModelProperty(value = "服务类型id")
+//    private String typeId;
+//    /**服务类型名称*/
+//    @Excel(name = "服务类型名称", width = 15)
+//    @ApiModelProperty(value = "服务类型名称")
+//    private String typeName;
+//	/**服务指令id*/
+//	@Excel(name = "服务指令id", width = 15)
+//    @ApiModelProperty(value = "服务指令id")
+//    private String directiveId;
+//	/**服务指令名称*/
+//	@Excel(name = "服务指令名称", width = 15)
+//    @ApiModelProperty(value = "服务指令名称")
+//    private String directiveName;
+//    /**即时指令图标*/
+//    @ApiModelProperty(value = "即时指令图标")
+//    private String immediateFile;
+//    /**即时指令图标*/
+//    @ApiModelProperty(value = "即时指令图标")
+//    private String netImmediateFile;
+//    /**即时指令焦点图标*/
+//    @ApiModelProperty(value = "即时指令图标")
+//    private String immediateFileFocus;
+//    /**即时指令焦点图标*/
+//    @ApiModelProperty(value = "即时指令图标")
+//    private String netImmediateFileFocus;
+//    /**服务指令图片大图*/
+//    @ApiModelProperty(value = "服务指令图片大图")
+//    private String previewFile;
+//    /**服务指令图片大图*/
+//    @ApiModelProperty(value = "服务指令图片大图")
+//    private String netPreviewFile;
+//    /**服务指令图片小图*/
+//    @ApiModelProperty(value = "服务指令图片小图")
+//    private String previewFileSmall;
+//    /**服务指令图片小图*/
+//    @ApiModelProperty(value = "服务指令图片小图")
+//    private String netPreviewFileSmall;
+//    /**指令音频文件*/
+//    @ApiModelProperty(value = "指令音频文件")
+//    private String mp3File;
+//    /**指令音频文件-网络地址*/
+//    @ApiModelProperty(value = "指令音频文件")
+//    private String netMp3File;
+//    /**指令视频文件*/
+//    @ApiModelProperty(value = "指令视频文件")
+//    private String mp4File;
+//    /**指令视频文件-网络地址*/
+//    @ApiModelProperty(value = "指令视频文件")
+//    private String netMp4File;
+//    /**服务时长（分钟）*/
+//    private String serviceDuration;
+//    /**服务描述*/
+//    private String serviceContent;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
index cdefabcb..9763d611 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
@@ -183,48 +183,48 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
     }
 
     private CareDirectivePlanInstant getInstantNetImages(CareDirectivePlanInstant par) {
-        if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
-            String immediateFile = getImageNetUrl(par.getImmediateFile());
-            par.setNetImmediateFile(immediateFile);
-        } else {
-            par.setImmediateFile("");
-            par.setNetImmediateFile("");
-        }
-        if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
-            String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
-            par.setNetImmediateFileFocus(immediateFileFocus);
-        } else {
-            par.setImmediateFileFocus("");
-            par.setNetImmediateFileFocus("");
-        }
-        if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
-            String previewFile = getImageNetUrl(par.getPreviewFile());
-            par.setNetPreviewFile(previewFile);
-        } else {
-            par.setPreviewFile("");
-            par.setNetPreviewFile("");
-        }
-        if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
-            String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
-            par.setNetPreviewFileSmall(previewFileSmall);
-        } else {
-            par.setPreviewFileSmall("");
-            par.setNetPreviewFileSmall("");
-        }
-        if (par.getMp3File() != null && !par.getMp3File().equals("")) {
-            String netMp3File = getImageNetUrl(par.getMp3File());
-            par.setNetMp3File(netMp3File);
-        } else {
-            par.setMp3File("");
-            par.setNetMp3File("");
-        }
-        if (par.getMp4File() != null && !par.getMp4File().equals("")) {
-            String netMp4File = getImageNetUrl(par.getMp4File());
-            par.setNetMp4File(netMp4File);
-        } else {
-            par.setMp4File("");
-            par.setNetMp4File("");
-        }
+//        if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
+//            String immediateFile = getImageNetUrl(par.getImmediateFile());
+//            par.setNetImmediateFile(immediateFile);
+//        } else {
+//            par.setImmediateFile("");
+//            par.setNetImmediateFile("");
+//        }
+//        if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
+//            String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
+//            par.setNetImmediateFileFocus(immediateFileFocus);
+//        } else {
+//            par.setImmediateFileFocus("");
+//            par.setNetImmediateFileFocus("");
+//        }
+//        if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
+//            String previewFile = getImageNetUrl(par.getPreviewFile());
+//            par.setNetPreviewFile(previewFile);
+//        } else {
+//            par.setPreviewFile("");
+//            par.setNetPreviewFile("");
+//        }
+//        if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
+//            String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
+//            par.setNetPreviewFileSmall(previewFileSmall);
+//        } else {
+//            par.setPreviewFileSmall("");
+//            par.setNetPreviewFileSmall("");
+//        }
+//        if (par.getMp3File() != null && !par.getMp3File().equals("")) {
+//            String netMp3File = getImageNetUrl(par.getMp3File());
+//            par.setNetMp3File(netMp3File);
+//        } else {
+//            par.setMp3File("");
+//            par.setNetMp3File("");
+//        }
+//        if (par.getMp4File() != null && !par.getMp4File().equals("")) {
+//            String netMp4File = getImageNetUrl(par.getMp4File());
+//            par.setNetMp4File(netMp4File);
+//        } else {
+//            par.setMp4File("");
+//            par.setNetMp4File("");
+//        }
         return par;
     }