jiangjiazhi / regional-platform

Commit 268cb9c048c1f38ca2cb475b88be3154518fb271

Authored by dongqin almost 6 years ago

Exists in master and in 6 other branches

华大推送结果

Showing 3 changed files with 45 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.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/result/SieveApplyOrderResult.java

...	...	@@ -245,6 +245,18 @@
245	245	*/
246	246	private String jzsInfo;
247	247
	248	+ /**
	249	+ * 推送到华大系统的结果记录
	250	+ */
	251	+ private boolean huaDaPushResult;
	252	+
	253	+ public boolean isHuaDaPushResult() {
	254	+ return huaDaPushResult;
	255	+ }
	256	+
	257	+ public void setHuaDaPushResult(boolean huaDaPushResult) {
	258	+ this.huaDaPushResult = huaDaPushResult;
	259	+ }
248	260
249	261	private String ypglx;
250	262

...	...	@@ -580,9 +580,10 @@
580	580	* @param hospitalId
581	581	*/
582	582	private void callHuaDa(SieveApplyOrderModel sieveApplyOrderModel, String hospitalId) {
583		- try{
584		- String sieveType = sieveApplyOrderModel.getSieveType();
585		- //if ("4".equals(HIS_VERSION)) {
	583	+ String sieveType = sieveApplyOrderModel.getSieveType();
	584	+ if ("4".equals(HIS_VERSION)) {
	585	+ boolean result = false;
	586	+ try{
586	587	if (StringUtils.isNotEmpty(sieveType) && "2".equals(sieveType)) {
587	588	final String productCode = "DX1331";
588	589	HuadaSieveApplyOrderAddRequest request = new HuadaSieveApplyOrderAddRequest();
589	590
590	591
...	...	@@ -710,13 +711,16 @@
710	711	request.setNativePlace(addressRegister);
711	712
712	713
713		- huadaSaveSampleInfo(request);
	714	+ result = huadaSaveSampleInfo(request);
714	715	}
715		- // }
716		- }catch (Exception e){
717		- e.printStackTrace();
718		- logger.error("调用华大接口失败", e);
	716	+ }catch (Exception e){
	717	+ e.printStackTrace();
	718	+ logger.error("调用华大接口失败", e);
	719	+ }
	720	+
	721	+
719	722	}
	723	+
720	724	}
721	725
722	726	/**
723	727
...	...	@@ -1656,12 +1660,18 @@
1656	1660	if (jsonArray.isEmpty()) {
1657	1661	return false;
1658	1662	}
1659		- return true;
	1663	+
	1664	+ Map m = (Map) jsonArray.get(0);
	1665	+ boolean result = (boolean) m.get("result");
	1666	+
	1667	+ return result;
1660	1668	} catch (Exception e) {
1661	1669	e.printStackTrace();
1662	1670	}
1663	1671	return false;
1664	1672	}
	1673	+
	1674	+
1665	1675
1666	1676	public Map huadaCallback(String syscode, String sign, String timestamp, String params) {
1667	1677	Map map = new HashMap();

...	...	@@ -48,6 +48,19 @@
48	48	//申请医生
49	49	private String applyDoctor;
50	50
	51	+ /**
	52	+ * 华大推送结果
	53	+ */
	54	+ private boolean huaDaPushResult;
	55	+
	56	+ public boolean isHuaDaPushResult() {
	57	+ return huaDaPushResult;
	58	+ }
	59	+
	60	+ public void setHuaDaPushResult(boolean huaDaPushResult) {
	61	+ this.huaDaPushResult = huaDaPushResult;
	62	+ }
	63	+
51	64	public String getApplyDoctor() {
52	65	return applyDoctor;
53	66	}
...	...	@@ -102,6 +115,7 @@
102	115	setApplyDoctor(destModel.getApplyDoctor());
103	116	setCheckDate(destModel.getCheckDate());
104	117	setGuide(destModel.getGuide());
	118	+ setHuaDaPushResult(destModel.isHuaDaPushResult());
105	119	if(StringUtils.isNotEmpty(destModel.getCheckItem())){
106	120	setCheckItem(JsonUtil.toList(destModel.getCheckItem(),List.class));
107	121	}