From 58d26b70826f00f2a6454f57a8e2fb8d76f9957c Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 16 Jun 2020 15:01:49 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 1 + .../java/com/lyms/platform/operate/web/worker/SieveWorker2.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 5c51115..803fe11 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1019,6 +1019,7 @@ public class SieveFacade { if (StringUtils.isNotEmpty(lymsSieveId)) { result.put("lymsSieveId", lymsSieveId); } + result.put("noOfFetuses", sieveApply.getNoOfFetuses()); result.put("patientID", sieveApply.getPatientID()); result.put("applicationNo", sieveApply.getApplicationNo()); result.put("smoking", sieveApply.getSmoking()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java index 1846b5e..5659510 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java @@ -130,7 +130,11 @@ public class SieveWorker2 implements Callable> { //吸烟 0：不吸烟；-1或空字符串：未知;1：吸烟；3：妊娠期间终止;2:妊娠前终止 sieveListResult.setSmoking(sieveApplyOrderModel.getSmoking()); //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠 - sieveListResult.setPatientID(sieveApplyOrderModel.getPatientID()); + String parentId = sieveApplyOrderModel.getParentId(); + if(StringUtils.isNotEmpty(parentId) && parentId.length() > 30){ + parentId=sieveApplyOrderModel.getParentId().substring(0, 30); + } + sieveListResult.setPatientID(parentId); //如果有NT，则必须有 sieveListResult.setnT(sieveApplyOrderModel.getnT()); //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠 -- 1.8.3.1