diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 90d5b50..7788ae2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -160,6 +160,8 @@ public class SieveApplyOrderModel extends BaseModel { */ private String ultrasonicNtVal; + private String nf; + /** * 血清筛查风险 0/高风险 1/低风险 2/临界风险 */ @@ -250,6 +252,14 @@ public class SieveApplyOrderModel extends BaseModel { */ private boolean huaDaPushResult; + public String getNf() { + return nf; + } + + public void setNf(String nf) { + this.nf = nf; + } + public boolean isHuaDaPushResult() { return huaDaPushResult; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index c768225..b1147ea 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -69,6 +69,32 @@ public class SieveResultModel{ private String sampleReportId;//报告ID 示例:"4F9F9DED0C9B1559E053D8E0A8C0AA9F", + /** + * 是否已出报告 1-是 2/null-否 + */ + private Boolean hasReport; + + /** + * 打印次数 + */ + private Integer printSize; + + public Boolean getHasReport() { + return hasReport; + } + + public void setHasReport(Boolean hasReport) { + this.hasReport = hasReport; + } + + public Integer getPrintSize() { + return printSize; + } + + public void setPrintSize(Integer printSize) { + this.printSize = printSize; + } + public String getSampleInfoId() { return sampleInfoId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 441f42f..f2439d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -1766,6 +1766,8 @@ public class ApplyOrderFacade { newModel.setParentId(patientsId); newModel.setSampleInfoId(huadaCallbackModel.getSampleInfoId()); newModel.setSampleReportId(huadaCallbackModel.getSampleReportId()); + newModel.setHasReport(true); + newModel.setPrintSize(0); // 底风险0 高风险2 newModel.setSbst(huadaCallbackModel.getT18().contains("未检出") ? "0" : "2"); newModel.setStzhz13(huadaCallbackModel.getT13().contains("未检出") ? "0" : "2"); 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 5988070..2ff645e 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 @@ -969,6 +969,9 @@ public class SieveFacade { sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId()); sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); + // 是否已出报告 1-是 2/null-否、打印次数 + sieveResultInfo.put("hasReport", sieveResultModel.getHasReport()); + sieveResultInfo.put("printSize", sieveResultModel.getPrintSize()); String tszhzValue = ""; if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index bd39695..b1c66fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -164,6 +164,7 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert