jiangjiazhi / regional-platform

Commit 92b4b21bbfb59bce289903f8193c25ed933beacf

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 7 changed files with 125 additions and 45 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/HuadaCallbackModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -405,6 +405,18 @@
405	405	// 语言
406	406	private String yuyan;
407	407
	408	+
	409	+ //色觉
	410	+ private String seJue;
	411	+
	412	+ public String getSeJue() {
	413	+ return seJue;
	414	+ }
	415	+
	416	+ public void setSeJue(String seJue) {
	417	+ this.seJue = seJue;
	418	+ }
	419	+
408	420	public String getMailNo() {
409	421	return mailNo;
410	422	}

...	...	@@ -1730,9 +1730,9 @@
1730	1730	timestamp = timestamp.replaceAll(" ", "%20");//空格替换成 %20
1731	1731	String syscode = signParams.get("syscode").toString();
1732	1732	String sign = signParams.get("sign").toString();
1733		- System.out.println("timestamp"+timestamp+" syscode="+" sign="+sign);
	1733	+ System.out.println("timestamp" + timestamp + " syscode=" + " sign=" + sign);
1734	1734
1735		- System.out.println("saveSampleInfo param="+JsonUtil.obj2JsonString(map));
	1735	+ System.out.println("saveSampleInfo param=" + JsonUtil.obj2JsonString(map));
1736	1736	String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&" + "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map);
1737	1737	System.out.println(s);
1738	1738	//{"code":"200","msg":"success","rows":{"successedList":[{"msg":"INSP190001417198 ,样例号: 18S4074733R 保存成功!","result":true,"canseqId":"2018101700007123"}],"failedList":[]}}
...	...	@@ -1954,7 +1954,6 @@
1954	1954	try {
1955	1955	Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
1956	1956	String timestamp1 = signParams.get("timestamp").toString();
1957		- timestamp1 = timestamp1.replaceAll(" ", "%20");
1958	1957	String syscode1 = signParams.get("syscode").toString();
1959	1958	String sign1 = signParams.get("sign").toString();
1960	1959	HashMap<String, String> map1 = new HashMap<>();
1961	1960
...	...	@@ -1966,10 +1965,11 @@
1966	1965	mapParams.put("syscode", syscode1);
1967	1966	mapParams.put("sign", sign1);
1968	1967	mapParams.put("timestamp", timestamp1);
1969		- data = HttpClientUtil.sendPost(HUADA_URL + "/external/downloadReport.do", map1);
	1968	+ data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/downloadReport.do", JsonUtil.obj2Str(mapParams));
1970	1969	}
1971	1970	else
1972	1971	{
	1972	+ timestamp1 = timestamp1.replaceAll(" ", "%20");
1973	1973	Map<String, Object> mapParams = new HashMap<>();
1974	1974	mapParams.put("sampleReportId", sampleReportId);
1975	1975	JSONObject jsonMapParams = new JSONObject(mapParams);
...	...	@@ -1978,7 +1978,7 @@
1978	1978	}
1979	1979	System.out.println(data);
1980	1980	JSONObject respJSON = JSON.parseObject(data);
1981		- if ("200".equals(respJSON.get("code"))) {
	1981	+ if ("200".equals(respJSON.get("code").toString())) {
1982	1982	Object rowsJSON =respJSON.get("rows");
1983	1983	if (rowsJSON != null) {
1984	1984	byte[] bytes = rowsJSON.toString().getBytes("iso8859-1");
1985	1985
1986	1986
1987	1987
1988	1988
1989	1989
1990	1990
1991	1991
...	...	@@ -2138,54 +2138,53 @@
2138	2138	return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("标本号不存在");
2139	2139	}
2140	2140
2141		- new Thread(new Runnable() {
2142		- @Override
2143		- public void run() {
2144		- //查询报告详情
2145		- Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
2146		- String timestamp = signParams.get("timestamp").toString();
2147		- //timestamp = timestamp.replaceAll(" ", "%20");//空格替换成 %20
2148		- String syscode = signParams.get("syscode").toString();
2149		- String sign = signParams.get("sign").toString();
	2141	+ //查询报告详情
	2142	+ Map<String, Object> signParams = getSignParams(SYSCODE, SECRET);
	2143	+ String timestamp = signParams.get("timestamp").toString();
	2144	+ String syscode = signParams.get("syscode").toString();
	2145	+ String sign = signParams.get("sign").toString();
2150	2146
	2147	+ HashMap<String, String> map = new HashMap<>();
	2148	+ map.put("sampleNum", sampleNum);
	2149	+ map.put("syscode", syscode);
	2150	+ map.put("sign", sign);
	2151	+ map.put("timestamp", timestamp);
	2152	+ System.out.println("query report param "+JsonUtil.obj2Str(map));
2151	2153
2152		- HashMap<String, String> map = new HashMap<>();
2153		- map.put("sampleNum", sampleNum);
2154		- map.put("syscode", syscode);
2155		- map.put("sign", sign);
2156		- map.put("timestamp", timestamp);
2157		- System.out.println("query report param "+JsonUtil.obj2Str(map));
2158		-
2159		- //重试三次
2160		- for (int i = 0; i <3 ; i++)
	2154	+ //重试三次
	2155	+ for (int i = 0; i <3 ; i++)
	2156	+ {
	2157	+ try {
	2158	+ String data = HttpClientUtil.doPostSSL(HUADA_URL + "/external/getReport.do", JsonUtil.obj2Str(map));
	2159	+ if (StringUtils.isNotEmpty(data))
2161	2160	{
2162		- try {
2163		- String data = HttpClientUtil.sendPost(HUADA_URL + "/external/getReport.do", map);
2164		- if (StringUtils.isNotEmpty(data))
2165		- {
2166		- JSONObject jsonObject = JSONObject.parseObject(data);
2167		- Object codeObj = jsonObject.get("code");
2168		- if (codeObj != null && "200".equals(codeObj.toString()))
2169		- {
2170		- dohandleResult(jsonObject.get("data"));
2171		- break;
2172		- }
2173		- }
2174		- }catch (Exception e)
	2161	+ System.out.println(data);
	2162	+ JSONObject jsonObject = JSONObject.parseObject(data);
	2163	+ Object codeObj = jsonObject.get("code");
	2164	+ if (codeObj != null && "200".equals(codeObj.toString()) && data.contains("success"))
2175	2165	{
2176		- System.out.println(e.getMessage()+"调用失败"+i);
2177		- try {
2178		- Thread.sleep(1000);
2179		- }catch (Exception e1)
2180		- {
2181		-
2182		- }
2183		- continue;
	2166	+ dohandleResult(jsonObject.get("data"));
	2167	+ break;
2184	2168	}
2185	2169	}
	2170	+ }catch (Exception e)
	2171	+ {
	2172	+ System.out.println(e.getMessage()+" getReport.do fail "+i);
	2173	+ try {
	2174	+ Thread.sleep(1000);
	2175	+ }catch (Exception e1)
	2176	+ {
2186	2177
	2178	+ }
	2179	+ if (i == 2)
	2180	+ {
	2181	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("获取报告失败");
	2182	+ }
	2183	+ continue;
	2184	+
2187	2185	}
2188		- }).start();
	2186	+ }
	2187	+
2189	2188	return baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功!");
2190	2189	}
2191	2190
...	...	@@ -2201,6 +2200,7 @@
2201	2200	Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardId)), Patients.class);
2202	2201	if (patients != null) {
2203	2202	String patientsId = patients.getId();
	2203	+ huadaCallbackModel.setSampleReportId(huadaCallbackModel.getSampleNum());
2204	2204	SieveResultModel model = getSieveResultModel(huadaCallbackModel, patientsId);
2205	2205	List<SieveResultModel> sieveResultModels = mongoTemplate.find(Query.query(Criteria.where("sampleReportId").is(model.getSampleReportId())).with(new Sort(Sort.Direction.DESC, "resultTime")), SieveResultModel.class);
2206	2206	if (CollectionUtils.isNotEmpty(sieveResultModels)) {

...	...	@@ -865,6 +865,7 @@
865	865	checkup.setTingliLeft(addRequest.getTingliLeft());
866	866	checkup.setTingliRight(addRequest.getTingliRight());
867	867	checkup.setYuyan(addRequest.getYuyan());
	868	+ checkup.setSeJue(addRequest.getSeJue());
868	869
869	870
870	871	/* 基础数据 */
...	...	@@ -2150,6 +2151,7 @@
2150	2151	checkupResult.setTingliLeft(result.getTingliLeft());
2151	2152	checkupResult.setTingliRight(result.getTingliRight());
2152	2153	checkupResult.setYuyan(result.getYuyan());
	2154	+ checkupResult.setSeJue(result.getSeJue());
2153	2155
2154	2156	return checkupResult;
2155	2157	}

1	1	package com.lyms.platform.operate.web.request;
2	2
	3	+import java.util.List;
	4	+
3	5	/**
4	6	* 产华大基因,检查结果回调参数实体
5	7	*
...	...	@@ -50,6 +52,37 @@
50	52	private String productCodes;//权限-城市 1-城市 2-客户编码 3-数据来源 4-产品线 5 产品编码示例：[]
51	53
52	54	private String reportType; //报告类型正式报告、失败报告、重取样报告
	55	+
	56	+
	57	+ private String autosomalResults;
	58	+
	59	+ private List niftyAttachList;
	60	+
	61	+ private String analyzeResult;
	62	+
	63	+ public List getNiftyAttachList() {
	64	+ return niftyAttachList;
	65	+ }
	66	+
	67	+ public void setNiftyAttachList(List niftyAttachList) {
	68	+ this.niftyAttachList = niftyAttachList;
	69	+ }
	70	+
	71	+ public String getAnalyzeResult() {
	72	+ return analyzeResult;
	73	+ }
	74	+
	75	+ public void setAnalyzeResult(String analyzeResult) {
	76	+ this.analyzeResult = analyzeResult;
	77	+ }
	78	+
	79	+ public String getAutosomalResults() {
	80	+ return autosomalResults;
	81	+ }
	82	+
	83	+ public void setAutosomalResults(String autosomalResults) {
	84	+ this.autosomalResults = autosomalResults;
	85	+ }
53	86
54	87	public String getReportType() {
55	88	return reportType;

...	...	@@ -414,6 +414,17 @@
414	414	// 语言
415	415	private String yuyan;
416	416
	417	+ //色觉
	418	+ private String seJue;
	419	+
	420	+ public String getSeJue() {
	421	+ return seJue;
	422	+ }
	423	+
	424	+ public void setSeJue(String seJue) {
	425	+ this.seJue = seJue;
	426	+ }
	427	+
417	428	public String getMailNo() {
418	429	return mailNo;
419	430	}

...	...	@@ -385,6 +385,17 @@
385	385	// 语言
386	386	private String yuyan;
387	387
	388	+ //色觉
	389	+ private String seJue;
	390	+
	391	+ public String getSeJue() {
	392	+ return seJue;
	393	+ }
	394	+
	395	+ public void setSeJue(String seJue) {
	396	+ this.seJue = seJue;
	397	+ }
	398	+
388	399	public String getMailNo() {
389	400	return mailNo;
390	401	}

...	...	@@ -390,6 +390,17 @@
390	390	// 语言
391	391	private String yuyan;
392	392
	393	+ //色觉
	394	+ private String seJue;
	395	+
	396	+ public String getSeJue() {
	397	+ return seJue;
	398	+ }
	399	+
	400	+ public void setSeJue(String seJue) {
	401	+ this.seJue = seJue;
	402	+ }
	403	+
393	404	public String getMailNo() {
394	405	return mailNo;
395	406	}