jiangjiazhi / regional-platform

Commit df5d14d2ecf3b9591a0c2cfe5b2c1d38e05f7203

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

产筛打印

Showing 6 changed files with 104 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.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/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java

...	...	@@ -54,7 +54,10 @@
54	54	//采集医生
55	55	private String collectionDoctorId;
56	56
	57	+ //采样孕周，打印功能使用
	58	+ private String caiyangyunzhou;
57	59
	60	+
58	61	//采血日期
59	62	private Date collectionDate;
60	63
...	...	@@ -299,6 +302,14 @@
299	302	private Integer monozygous;
300	303	//孕妇筛查类型 0：一般；1：早中联合筛查孕妇
301	304	private Integer patientType;
	305	+
	306	+ public String getCaiyangyunzhou() {
	307	+ return caiyangyunzhou;
	308	+ }
	309	+
	310	+ public void setCaiyangyunzhou(String caiyangyunzhou) {
	311	+ this.caiyangyunzhou = caiyangyunzhou;
	312	+ }
302	313
303	314	public Integer getIeStatus() {
304	315	return ieStatus;

...	...	@@ -48,7 +48,11 @@
48	48
49	49	//hafp
50	50	private String hafp;
	51	+ //uE3
	52	+ private String uE3;
51	53
	54	+ //uE3Mom
	55	+ private String uE3Mom;
52	56
53	57	//hCgMomhCgMom
54	58	private String hcgMom;
...	...	@@ -80,6 +84,22 @@
80	84	* 打印次数
81	85	*/
82	86	private Integer printSize;
	87	+
	88	+ public String getuE3() {
	89	+ return uE3;
	90	+ }
	91	+
	92	+ public void setuE3(String uE3) {
	93	+ this.uE3 = uE3;
	94	+ }
	95	+
	96	+ public String getuE3Mom() {
	97	+ return uE3Mom;
	98	+ }
	99	+
	100	+ public void setuE3Mom(String uE3Mom) {
	101	+ this.uE3Mom = uE3Mom;
	102	+ }
83	103
84	104	public String getLymsSieveId() {
85	105	return lymsSieveId;

...	...	@@ -390,7 +390,11 @@
390	390	public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) {
391	391	SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
392	392
393		-
	393	+ //根据采样时间算出采样孕周，根据B超时间算出B超孕周
	394	+ if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getParentId())){
	395	+ Patients p = patientsService.findOnePatientById(sieveApplyOrderAddRequest.getParentId());
	396	+ yunZhouMth(sieveApplyOrderModel,p);
	397	+ }
394	398	String hospitalId = autoMatchFacade.getHospitalId(userId);
395	399	//修改
396	400	if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId())) {
397	401
...	...	@@ -441,11 +445,11 @@
441	445	sieveApplyOrderModel.setParentId(parentId);
442	446	sieveApplyOrderAddRequest.setParentId(parentId);
443	447	Patients p = patientsService.findOnePatientById(parentId);
444		-
445	448	//加入产筛
446	449	patientsService.validata(p);
447	450	}
448	451	}
	452	+
449	453	sieveApplyOrderModel.setCreated(new Date());
450	454	sieveApplyOrderModel.setHospitalId(hospitalId);
451	455
...	...	@@ -566,6 +570,22 @@
566	570	mongoTemplate.updateFirst(Query.query(Criteria.where("number").is(number)), Update.update("huaDaPushResult", aBoolean), SieveApplyOrderModel.class);
567	571	}
568	572	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	573	+ }
	574	+
	575	+ /**
	576	+ * 功能描述根据采样时间算出采样孕周，根据B超时间算出B超孕周
	577	+ * @author 武涛涛
	578	+ * @date 2020/6/19
	579	+ */
	580	+ private void yunZhouMth(SieveApplyOrderModel sieveApplyOrderModel, Patients p) {
	581	+ //打印需要根据采样时间算出采样孕周
	582	+ if(sieveApplyOrderModel.getCollectionDate()!=null && p.getLastMenses()!=null){
	583	+ sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate()));
	584	+ }
	585	+ // 根据B超时间算出B超孕周
	586	+ if(sieveApplyOrderModel.getBcCheckDate()!=null && p.getLastMenses()!=null){
	587	+ sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate()));
	588	+ }
569	589	}
570	590
571	591	/**

...	...	@@ -1083,6 +1083,7 @@
1083	1083	result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo());
1084	1084	result.put("sieveModel", sieveApply.getSieveModel());
1085	1085	result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
	1086	+ result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
1086	1087	result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal());
1087	1088	result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk());
1088	1089	result.put("syndrome21", sieveApply.getSyndrome21());
1089	1090
...	...	@@ -1165,12 +1166,23 @@
1165	1166	sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
1166	1167	sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
1167	1168	sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
1168		-
1169	1169	sieveResultInfo.put("lymsSieveresultId", sieveResultModel.getId());//产筛结果id
1170	1170	sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId());
1171	1171	sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId());
1172	1172	sieveResultInfo.put("hasReport", sieveResultModel.getHasReport());
1173	1173
	1174	+ sieveResultInfo.put("uE3",sieveResultModel.getuE3() != null ? sieveResultModel.getuE3() + "ng/ml" : "");
	1175	+ sieveResultInfo.put("uE3Mom",sieveResultModel.getuE3Mom() != null ? sieveResultModel.getuE3Mom() : "");
	1176	+ if(!sieveResultModel.getTszhzValue().isEmpty()){//21-三体
	1177	+ sieveResultInfo.put("tszhzValue", sieveResultModel.getTszhzValue());
	1178	+ }
	1179	+ if(!sieveResultModel.getSbstValue().isEmpty()){//18-三体
	1180	+ sieveResultInfo.put("sbstValue", sieveResultModel.getSbstValue());
	1181	+ }
	1182	+ if(!sieveResultModel.getStzhz13Value().isEmpty()){// 神经管畸形 NTD
	1183	+ sieveResultInfo.put("stzhz13Value", sieveResultModel.getStzhz13Value());
	1184	+ }
	1185	+
1174	1186	String tszhzValue = "";
1175	1187	if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
1176	1188
1177	1189
1178	1190
...	...	@@ -2757,14 +2769,21 @@
2757	2769	if (StringUtils.isNotEmpty(importResult.gethCGb浓度())) {//hCGb浓度
2758	2770	sieveAddRequest.setHcg(importResult.gethCGb浓度());
2759	2771	}
2760		- if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值
2761		- sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值());
	2772	+ if (StringUtils.isNotEmpty(importResult.gethCGb校正MOM值())) {//hCGb校正MOM值
	2773	+ sieveAddRequest.setHcgMom(importResult.gethCGb校正MOM值());
2762	2774	}
	2775	+
2763	2776	if (StringUtils.isNotEmpty(importResult.getAFP浓度())) {//AFP浓度
2764	2777	sieveAddRequest.setHafp(importResult.getAFP浓度());
2765	2778	}
2766		- if (StringUtils.isNotEmpty(importResult.gethCGb校正MOM值())) {//hCGb校正MOM值
2767		- sieveAddRequest.setHcgMom(importResult.gethCGb校正MOM值());
	2779	+ if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值
	2780	+ sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值());
	2781	+ }
	2782	+ if(StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())){ //uE3
	2783	+ sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度());
	2784	+ }
	2785	+ if(StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())){ //uE3MOM
	2786	+ sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值());
2768	2787	}
2769	2788	//sieveAddRequest.setCheckerId();
2770	2789	//sieveAddRequest.setExamineId();

...	...	@@ -45,6 +45,10 @@
45	45
46	46	//hafp
47	47	private String hafp;
	48	+ //uE3
	49	+ private String uE3;
	50	+ //uE3Mom
	51	+ private String uE3Mom;
48	52
49	53	//hCgMom
50	54	private String hcgMom;
...	...	@@ -60,6 +64,22 @@
60	64
61	65	private String reportType;
62	66
	67	+ public String getuE3() {
	68	+ return uE3;
	69	+ }
	70	+
	71	+ public void setuE3(String uE3) {
	72	+ this.uE3 = uE3;
	73	+ }
	74	+
	75	+ public String getuE3Mom() {
	76	+ return uE3Mom;
	77	+ }
	78	+
	79	+ public void setuE3Mom(String uE3Mom) {
	80	+ this.uE3Mom = uE3Mom;
	81	+ }
	82	+
63	83	public String getLymsSieveId() {
64	84	return lymsSieveId;
65	85	}
...	...	@@ -267,6 +287,8 @@
267	287	sieveModel.setHcgMom(hcgMom);
268	288	sieveModel.setHafp(hafp);
269	289	sieveModel.setHafpMom(hafpMom);
	290	+ sieveModel.setuE3Mom(uE3Mom);
	291	+ sieveModel.setuE3(uE3);
270	292	sieveModel.setExamineId(examineId);
271	293	sieveModel.setCheckerId(checkerId);
272	294	sieveModel.setReportType(reportType);

...	...	@@ -482,7 +482,11 @@
482	482	sieveApplyOrderModel.setCheckDate(checkDate == null ? sendTime : checkDate);
483	483	sieveApplyOrderModel.setGuide(guide);
484	484	sieveApplyOrderModel.setLymsSieveId(lymsSieveId);
485		- sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime));
	485	+ if(StringUtils.isEmpty(applyTime)){ //产筛打印没有产筛申请时间加的
	486	+ sieveApplyOrderModel.setApplyTime(new Date());
	487	+ }else {
	488	+ sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime));
	489	+ }
486	490	if(StringUtils.isNotEmpty(noOfFetuses)){
487	491	sieveApplyOrderModel.setNoOfFetuses(Integer.parseInt(noOfFetuses));
488	492	}