jiangjiazhi / regional-platform

Commit f70cc41bb239033670f7c127bb9b1f7883ebb8b6

Authored by liquanyu almost 6 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 96 additions and 15 deletions

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/request/HuadaSieveApplyOrderAddRequest.java

...	...	@@ -528,20 +528,12 @@
528	528	sieveService.updateOneChanQianDiaSieve(sieveModel);
529	529	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), sieveModels.get(0), sieveModel, OptActionEnums.UPDATE.getId(), "增加产前筛查");
530	530	}
531		- // 调用华大接口
532		- System.out.println("debug=========>开始调用华大接口");
	531	+ // 调用华大接口
533	532	Boolean aBoolean = callHuaDa(sieveApplyOrderModel, hospitalId);
534	533	String number = sieveApplyOrderModel.getNumber();
535	534	if (aBoolean != null && StringUtils.isNotEmpty(number)) {
536	535	mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class);
537	536	}
538		- System.out.println("debug=========>结束调用华大接口");
539		- // } else {
540		- // return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛");
541		- // }
542		-
543		-
544		-
545	537	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
546	538	}
547	539
...	...	@@ -718,6 +710,69 @@
718	710
719	711	request.setNativePlace(addressRegister);
720	712
	713	+
	714	+
	715	+
	716	+
	717	+ if (StringUtils.isNotEmpty(sieveApplyOrderModel.getUltrasonicNtWeek()))
	718	+ {
	719	+ //nt测定孕周
	720	+ request.setNtGestationalWeeks(sieveApplyOrderModel.getUltrasonicNtWeek().replace("周","w").replace("天",""));
	721	+ }
	722	+
	723	+
	724	+ request.setGravidity(sieveApplyOrderModel.getYunSize());
	725	+ request.setParity(sieveApplyOrderModel.getChanSize());
	726	+ request.setBirthDate(DateUtil.getyyyy_MM_dd(patients.getBirth()));
	727	+ request.setNtValue(sieveApplyOrderModel.getUltrasonicNtVal());
	728	+ //0/高风险 1/低风险 2/临界风险
	729	+ String srisk = sieveApplyOrderModel.getSerumScreeningRisk();
	730	+ if (StringUtils.isNotEmpty(srisk))
	731	+ {
	732	+ int week = DateUtil.getWeek(patients.getLastMenses(),new Date());
	733	+ if (week < 13)
	734	+ {
	735	+ //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险
	736	+ request.setMotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1"));
	737	+ //早期
	738	+ request.setTrisomy21(sieveApplyOrderModel.getSyndrome21());
	739	+ request.setTrisomy18(sieveApplyOrderModel.getSyndrome18());
	740	+ }
	741	+ else
	742	+ {
	743	+ //0：母血清筛查风险率‐高风险 1：母血清筛查风险率‐临界风险 2：母血清筛查风险率‐低风险
	744	+ request.setMmotherSerumRisk("0".equals(srisk) ? "0" : ("1".equals(srisk) ? "2" : "1"));
	745	+ //中期
	746	+ request.setMtrisomy21(sieveApplyOrderModel.getSyndrome21());
	747	+ request.setMtrisomy18(sieveApplyOrderModel.getSyndrome18());
	748	+ }
	749	+
	750	+ }
	751	+
	752	+ //居住地
	753	+ String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
	754	+ patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService);
	755	+ //联系地址
	756	+ request.setSampleRecipientEmail(liveAddress);
	757	+
	758	+ request.setHusbandPhoneNum(patients.getHusbandPhone());
	759	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(sieveApplyOrderModel.getApplyDoctor())) {
	760	+ if (NumberUtils.isNumber(sieveApplyOrderModel.getApplyDoctor())) {
	761	+ Users users = usersService.getUsers(NumberUtils.toInt(sieveApplyOrderModel.getApplyDoctor()));
	762	+ if (null != users) {
	763	+ request.setDoctorName(users.getName());
	764	+ }
	765	+ }
	766	+ }
	767	+ //家族史
	768	+ request.setFamilyProduce(sieveApplyOrderModel.getJzsInfo());
	769	+ //不良孕产史
	770	+ request.setAbnormalPregnancyHistory(sieveApplyOrderModel.getBadMaternalHistory());
	771	+
	772	+
	773	+// request.put("pcountry", getBasicConfig(patients.getPcountryId()));
	774	+// map.put("pnation", getBasicConfig(patients.getPnationId()));
	775	+
721	776	if ("4".equals(HIS_VERSION))
722	777	{
723	778	result = huadaSaveSampleInfo(request);
...	...	@@ -1739,7 +1794,7 @@
1739	1794	return true;
1740	1795	}
1741	1796	} catch (Exception e) {
1742		- e.printStackTrace();
	1797	+ ExceptionUtils.catchException(e,"error");
1743	1798	}
1744	1799	return false;
1745	1800	}

...	...	@@ -45,15 +45,14 @@
45	45	private String sampleRecipientEmail;
46	46	private String pregnancy; //0：本次妊娠方式-自然受孕 1：本次妊娠方式-促排卵 2：本次妊娠方式-宫内人工受精
47	47	private String adosculation;//是否是否体外受精-胚胎移植（IVF） 0：是否IVF-否 1：是否IVF-是
48		- private String gravidity;
49		- private String parity;
	48	+
50	49	private String familyProduce;
51	50	private String abnormalPregnancyHistory;
52	51	private String naturalAbortionNum;
53	52	private String stillbirthNum;
54	53	private String neonatalDeathNum;
55	54	private String oafNum;
56		- private String ntd;
	55	+ private String ntd;//0：神经管缺陷筛查‐未做 1：神经管缺陷筛查‐已做（高风险） 2：神经管缺陷筛查‐已做（低风险）
57	56	private String gravidaKaryotype;
58	57	private String husbandKaryotype;
59	58	private String allogeneticTransfusion;// 既往史: 一年内异体输血 0：既往史: 一年内异体输血-无 1：既往史: 一年内异体输血-有（不接受）
60	59
61	60
...	...	@@ -64,17 +63,44 @@
64	63	private String btypeUltrasonic;//辅助检查(B超结果)
65	64	private String ultrasonography;
66	65	private String screeningModel;//其他辅助筛查，页面传入什么输入
67		- private String motherSerumRisk;
	66	+ private String motherSerumRisk;//早期
	67	+ private String mmotherSerumRisk;//中期
68	68	private String mtrisomy21;
69	69	private String mtrisomy18;
70	70	private String trisomy21;
71	71	private String trisomy18;
72		- private String ntGestationalWeeks;
	72	+
73	73	private String ntValue;
74	74	private String bscanRemark;
75	75	private String intervenTional;
76	76	private String intervenTionalOtherDesc;
77	77	private String nativePlace;// 户籍地址
	78	+
	79	+ //生日
	80	+ private String birthDate;
	81	+ //孕‐次
	82	+ private String gravidity;
	83	+ //产‐次
	84	+ private String parity;
	85	+ //nt测定孕周
	86	+ private String ntGestationalWeeks;
	87	+
	88	+
	89	+ public String getMmotherSerumRisk() {
	90	+ return mmotherSerumRisk;
	91	+ }
	92	+
	93	+ public void setMmotherSerumRisk(String mmotherSerumRisk) {
	94	+ this.mmotherSerumRisk = mmotherSerumRisk;
	95	+ }
	96	+
	97	+ public String getBirthDate() {
	98	+ return birthDate;
	99	+ }
	100	+
	101	+ public void setBirthDate(String birthDate) {
	102	+ this.birthDate = birthDate;
	103	+ }
78	104
79	105	public String getNativePlace() {
80	106	return nativePlace;