jiangjiazhi / regional-platform

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 52 additions and 0 deletions

...	...	@@ -160,6 +160,8 @@
160	160	*/
161	161	private String ultrasonicNtVal;
162	162
	163	+ private String nf;
	164	+
163	165	/**
164	166	* 血清筛查风险 0/高风险 1/低风险 2/临界风险
165	167	*/
...	...	@@ -249,6 +251,14 @@
249	251	* 推送到华大系统的结果记录
250	252	*/
251	253	private boolean huaDaPushResult;
	254	+
	255	+ public String getNf() {
	256	+ return nf;
	257	+ }
	258	+
	259	+ public void setNf(String nf) {
	260	+ this.nf = nf;
	261	+ }
252	262
253	263	public boolean isHuaDaPushResult() {
254	264	return huaDaPushResult;

...	...	@@ -69,6 +69,32 @@
69	69
70	70	private String sampleReportId;//报告ID 示例："4F9F9DED0C9B1559E053D8E0A8C0AA9F",
71	71
	72	+ /**
	73	+ * 是否已出报告 1-是 2/null-否
	74	+ */
	75	+ private Boolean hasReport;
	76	+
	77	+ /**
	78	+ * 打印次数
	79	+ */
	80	+ private Integer printSize;
	81	+
	82	+ public Boolean getHasReport() {
	83	+ return hasReport;
	84	+ }
	85	+
	86	+ public void setHasReport(Boolean hasReport) {
	87	+ this.hasReport = hasReport;
	88	+ }
	89	+
	90	+ public Integer getPrintSize() {
	91	+ return printSize;
	92	+ }
	93	+
	94	+ public void setPrintSize(Integer printSize) {
	95	+ this.printSize = printSize;
	96	+ }
	97	+
72	98	public String getSampleInfoId() {
73	99	return sampleInfoId;
74	100	}

...	...	@@ -1766,6 +1766,8 @@
1766	1766	newModel.setParentId(patientsId);
1767	1767	newModel.setSampleInfoId(huadaCallbackModel.getSampleInfoId());
1768	1768	newModel.setSampleReportId(huadaCallbackModel.getSampleReportId());
	1769	+ newModel.setHasReport(true);
	1770	+ newModel.setPrintSize(0);
1769	1771	// 底风险0 高风险2
1770	1772	newModel.setSbst(huadaCallbackModel.getT18().contains("未检出") ? "0" : "2");
1771	1773	newModel.setStzhz13(huadaCallbackModel.getT13().contains("未检出") ? "0" : "2");

...	...	@@ -969,6 +969,9 @@
969	969	sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId());
970	970	sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId());
971	971
	972	+ // 是否已出报告 1-是 2/null-否、打印次数
	973	+ sieveResultInfo.put("hasReport", sieveResultModel.getHasReport());
	974	+ sieveResultInfo.put("printSize", sieveResultModel.getPrintSize());
972	975
973	976	String tszhzValue = "";
974	977	if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {

...	...	@@ -164,6 +164,7 @@
164	164	* nt 测定值
165	165	*/
166	166	private String ultrasonicNtVal;
	167	+ private String nf;
167	168
168	169	/**
169	170	* 血清筛查风险 1/高风险 2/低风险 3/临界风险
...	...	@@ -252,6 +253,14 @@
252	253
253	254	private String ypglx;
254	255
	256	+ public String getNf() {
	257	+ return nf;
	258	+ }
	259	+
	260	+ public void setNf(String nf) {
	261	+ this.nf = nf;
	262	+ }
	263	+
255	264	public String getYpglx() {
256	265	return ypglx;
257	266	}
...	...	@@ -321,6 +330,8 @@
321	330	sieveApplyOrderModel.setGxbzl(gxbzl);
322	331	sieveApplyOrderModel.setJzsInfo(jzsInfo);
323	332	sieveApplyOrderModel.setYpglx(ypglx);
	333	+
	334	+ sieveApplyOrderModel.setNf(nf);
324	335
325	336	return sieveApplyOrderModel;
326	337	}