diff --git a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java index 09bc2ede5e69b7f2cc5a7a3977650a0fa6af4ba5..17f0a7d06ee2ba8426505be56c523e346787b08e 100644 --- a/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/seaskyocr/application/command/claimAudit/ClaimAuditCmdServiceImpl.java @@ -2540,25 +2540,29 @@ public class ClaimAuditCmdServiceImpl implements ClaimAuditCmdService { } } if (entry.getKey().equals("invoiceType")) { - if ("鍖哄潡閾剧數瀛愬彂绁�".equalsIgnoreCase(fpTitle) || "鍖哄潡閾惧彂绁�".equalsIgnoreCase(fpTitle) || "閫氱敤鏈烘墦鐢靛瓙鍙戠エ".equalsIgnoreCase(fpTitle) || "閫氱敤鏈烘墦鍙戠エ".equalsIgnoreCase(fpTitle)) { - String isDZ = ""; - if (fpTitle.contains("鐢靛瓙")) { - isDZ = "鐢靛瓙"; - } - if (fpAddress.contains("娣卞湷")) { - jsonValue = "娣卞湷" + isDZ + "鏅€氬彂绁�"; - } - if (fpAddress.contains("鍖椾含")) { - jsonValue = "鍖椾含" + isDZ + "鏅€氬彂绁�"; - } - if (fpAddress.contains("浜戝崡")) { - jsonValue = "浜戝崡" + isDZ + "鏅€氬彂绁�"; - } - if (fpAddress.contains("娴欐睙")) { - jsonValue = "娴欐睙" + isDZ + "鏅€氬彂绁�"; - } - if (fpAddress.contains("骞夸笢")) { - jsonValue = "骞夸笢" + isDZ + "鏅€氬彂绁�"; + if ("鍖哄潡閾剧數瀛愬彂绁�".equalsIgnoreCase(fpType) || "鍖哄潡閾惧彂绁�".equalsIgnoreCase(fpType) || "閫氱敤鏈烘墦鐢靛瓙鍙戠エ".equalsIgnoreCase(fpType) || "閫氱敤鏈烘墦鍙戠エ".equalsIgnoreCase(fpType)) { + if (ObjectUtil.isEmpty(fpTitle)) { + String isDZ = ""; + String isDZ2 = ""; + if (fpType.contains("鐢靛瓙")) { + isDZ = "鐢靛瓙"; + isDZ2 = "(鐢靛瓙)"; + } + if (fpAddress.contains("娣卞湷")) { + jsonValue = "娣卞湷" + isDZ + "鏅€氬彂绁�"; + } + if (fpAddress.contains("鍖椾含")) { + jsonValue = "鍖椾含" + isDZ + "鏅€氬彂绁�"; + } + if (fpAddress.contains("浜戝崡")) { + jsonValue = "浜戝崡鐪侀€氱敤" + isDZ + "鍙戠エ"; + } + if (fpAddress.contains("娴欐睙")) { + jsonValue = "娴欐睙閫氱敤" + isDZ2 + "鏅€氬彂绁�"; + } + if (fpAddress.contains("骞夸笢")) { + jsonValue = "骞夸笢閫氱敤鏈烘墦鍙戠エ" + isDZ2; + } } } }