yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改字段错误的问题

This commit is contained in:
yangjun 2026-01-20 10:05:03 +08:00
parent cce3d0531d
commit ca314f0a83
7 changed files with 122 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -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"); //测试进销存对应的接口

3
nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
View File

@ -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.*,

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -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());

1
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/entity/NuConfigSuppliersApply.java
View File

@ -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;
}

3
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java
View File

@ -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;
}

144
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlanInstant.java
View File

@ -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;

84
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
View File

@ -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;
}