liquanyu / regional-platform

Commit 440bab610bdb392125feb8ed4a7a2aa0570c9863

Authored by wtt almost 6 years ago

update

Showing 6 changed files with 450 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.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

...	...	@@ -254,6 +254,195 @@
254	254	*/
255	255	private boolean huaDaPushResult;
256	256
	257	+ //iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入
	258	+ //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠
	259	+ private String PatientID;
	260	+ //申请单号
	261	+ private String ApplicationNo;
	262	+ //吸烟 0：不吸烟；-1或空字符串：未知;1：吸烟；3：妊娠期间终止;2:妊娠前终止
	263	+ private Integer Smoking;
	264	+ //I-型糖尿病 <空>：未知；0：无;1:有
	265	+ private Integer Insulin;
	266	+ private Integer HC;
	267	+ //B超孕天如果7W2D，此处应填5
	268	+ private Integer MannualEntry;
	269	+ //如果有NT，则必须有
	270	+ private Integer NT;
	271	+ //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠
	272	+ private String ResponsibleCode;
	273	+ //既往T21 <空>：未知；0：无;1:有
	274	+ private Integer T21;
	275	+ //既往T18 <空>：未知；0：无;1:有
	276	+ private Integer T18;
	277	+ //既往NTD <空>：未知；0：无;1:有
	278	+ private Integer NTD;
	279	+ //辅助生殖方法 <空>：未知；
	280	+ //3：克罗米芬治疗；//1：配子输卵管内移植；
	281	+ //4：捐赠卵子； //6：卵细胞浆内单精子注射；
	282	+ //5：捐赠受精；//0：体外受精；
	283	+ //7：其他；//2：合子输卵管内移植
	284	+ private Integer ARMethod;
	285	+ //辅助生殖之提取日期若输入了ARMethod，此项必填
	286	+ private Date ExtractionDate;
	287	+ // 辅助生殖之移植日期若输入了ARMethod，此项必填
	288	+ private Date TransferDate;
	289	+ //辅助生殖之捐赠者生日若输入了ARMethod，此项必填
	290	+ private Date DonorBirthDate;
	291	+ //鼻骨 <空>：未知；1：未显;2:显示
	292	+ private Integer NasalBone;
	293	+ //单卵 0：否;1：是
	294	+ private Integer Monozygous;
	295	+ //孕妇筛查类型 0：一般；1：早中联合筛查孕妇
	296	+ private Integer PatientType;
	297	+
	298	+ public static long getSerialVersionUID() {
	299	+ return serialVersionUID;
	300	+ }
	301	+
	302	+ public String getPatientID() {
	303	+ return PatientID;
	304	+ }
	305	+
	306	+ public void setPatientID(String patientID) {
	307	+ PatientID = patientID;
	308	+ }
	309	+
	310	+ public String getApplicationNo() {
	311	+ return ApplicationNo;
	312	+ }
	313	+
	314	+ public void setApplicationNo(String applicationNo) {
	315	+ ApplicationNo = applicationNo;
	316	+ }
	317	+
	318	+ public Integer getSmoking() {
	319	+ return Smoking;
	320	+ }
	321	+
	322	+ public void setSmoking(Integer smoking) {
	323	+ Smoking = smoking;
	324	+ }
	325	+
	326	+ public Integer getInsulin() {
	327	+ return Insulin;
	328	+ }
	329	+
	330	+ public void setInsulin(Integer insulin) {
	331	+ Insulin = insulin;
	332	+ }
	333	+
	334	+ public Integer getHC() {
	335	+ return HC;
	336	+ }
	337	+
	338	+ public void setHC(Integer HC) {
	339	+ this.HC = HC;
	340	+ }
	341	+
	342	+ public Integer getMannualEntry() {
	343	+ return MannualEntry;
	344	+ }
	345	+
	346	+ public void setMannualEntry(Integer mannualEntry) {
	347	+ MannualEntry = mannualEntry;
	348	+ }
	349	+
	350	+ public Integer getNT() {
	351	+ return NT;
	352	+ }
	353	+
	354	+ public void setNT(Integer NT) {
	355	+ this.NT = NT;
	356	+ }
	357	+
	358	+ public String getResponsibleCode() {
	359	+ return ResponsibleCode;
	360	+ }
	361	+
	362	+ public void setResponsibleCode(String responsibleCode) {
	363	+ ResponsibleCode = responsibleCode;
	364	+ }
	365	+
	366	+ public Integer getT21() {
	367	+ return T21;
	368	+ }
	369	+
	370	+ public void setT21(Integer t21) {
	371	+ T21 = t21;
	372	+ }
	373	+
	374	+ public Integer getT18() {
	375	+ return T18;
	376	+ }
	377	+
	378	+ public void setT18(Integer t18) {
	379	+ T18 = t18;
	380	+ }
	381	+
	382	+ public Integer getNTD() {
	383	+ return NTD;
	384	+ }
	385	+
	386	+ public void setNTD(Integer NTD) {
	387	+ this.NTD = NTD;
	388	+ }
	389	+
	390	+ public Integer getARMethod() {
	391	+ return ARMethod;
	392	+ }
	393	+
	394	+ public void setARMethod(Integer ARMethod) {
	395	+ this.ARMethod = ARMethod;
	396	+ }
	397	+
	398	+ public Date getExtractionDate() {
	399	+ return ExtractionDate;
	400	+ }
	401	+
	402	+ public void setExtractionDate(Date extractionDate) {
	403	+ ExtractionDate = extractionDate;
	404	+ }
	405	+
	406	+ public Date getTransferDate() {
	407	+ return TransferDate;
	408	+ }
	409	+
	410	+ public void setTransferDate(Date transferDate) {
	411	+ TransferDate = transferDate;
	412	+ }
	413	+
	414	+ public Date getDonorBirthDate() {
	415	+ return DonorBirthDate;
	416	+ }
	417	+
	418	+ public void setDonorBirthDate(Date donorBirthDate) {
	419	+ DonorBirthDate = donorBirthDate;
	420	+ }
	421	+
	422	+ public Integer getNasalBone() {
	423	+ return NasalBone;
	424	+ }
	425	+
	426	+ public void setNasalBone(Integer nasalBone) {
	427	+ NasalBone = nasalBone;
	428	+ }
	429	+
	430	+ public Integer getMonozygous() {
	431	+ return Monozygous;
	432	+ }
	433	+
	434	+ public void setMonozygous(Integer monozygous) {
	435	+ Monozygous = monozygous;
	436	+ }
	437	+
	438	+ public Integer getPatientType() {
	439	+ return PatientType;
	440	+ }
	441	+
	442	+ public void setPatientType(Integer patientType) {
	443	+ PatientType = patientType;
	444	+ }
	445	+
257	446	public String getRedundancy() {
258	447	return redundancy;
259	448	}

...	...	@@ -103,6 +103,7 @@
103	103	* <p>
104	104	* type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询
105	105	*
	106	+ * @param id == cqsieves 列表中的id
106	107	* @param parentId
107	108	* @param request
108	109	* @return
109	110
...	...	@@ -110,9 +111,9 @@
110	111	@ResponseBody
111	112	@TokenRequired
112	113	@RequestMapping(value = "/getSieveApplyInfo", method = RequestMethod.GET)
113		- public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId, @RequestParam(required = true) Integer type, HttpServletRequest request) {
	114	+ public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String id, @RequestParam(required = true)Integer type, HttpServletRequest request) {
114	115	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
115		- return sieveFacade.getSieveApplyInfo(parentId, loginState.getId(), type);
	116	+ return sieveFacade.getSieveApplyInfo(parentId, id,loginState.getId(), type);
116	117	}
117	118
118	119

...	...	@@ -400,6 +400,9 @@
400	400	SieveQuery sieveQuery = new SieveQuery();
401	401	sieveQuery.setYn(YnEnums.YES.getId());
402	402	sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
	403	+ if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getRedundancy())){
	404	+ sieveQuery.setId(sieveApplyOrderAddRequest.getRedundancy());
	405	+ }
403	406	List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
404	407	if (CollectionUtils.isNotEmpty(sieveModels)) {
405	408	SieveModel sieveModel = sieveModels.get(0);

...	...	@@ -145,6 +145,9 @@
145	145	public void addOrUpdateSieveModel(SieveAddRequest sieveAddRequest, Integer userId, SieveResultModel sieveResultModel) {
146	146	SieveQuery sieveQuery = new SieveQuery();
147	147	sieveQuery.setParentId(sieveAddRequest.getParentId());
	148	+ if(StringUtils.isNotEmpty(sieveAddRequest.getRedundancy())){
	149	+ sieveQuery.setId(sieveAddRequest.getRedundancy());
	150	+ }
148	151	sieveQuery.setYn(YnEnums.YES.getId());
149	152	List<SieveModel> list = sieveService.queryList(sieveQuery);
150	153
...	...	@@ -777,7 +780,7 @@
777	780	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
778	781	}
779	782
780		- public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) {
	783	+ public BaseResponse getSieveApplyInfo(String parentId,String id, Integer userId, Integer type) {
781	784
782	785	Map<String, Object> map = new HashMap<>();
783	786	//String hospitalId = autoMatchFacade.getHospitalId(userId);
...	...	@@ -790,7 +793,9 @@
790	793
791	794	SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
792	795	sieveApplyOrderQuery1.setParentId(parentId);
793		-
	796	+ if(StringUtils.isNotEmpty(id)){
	797	+ sieveApplyOrderQuery1.setRedundancy(id);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个
	798	+ }
794	799	sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
795	800
796	801	if (CollectionUtils.isNotEmpty(localPatients)) {
797	802
...	...	@@ -849,9 +854,29 @@
849	854	Map<String, Object> viewInfo = new HashMap<>();
850	855	SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
851	856
	857	+ //iAssistantl数据传输格式说明,导出excel自动不足添加在此处
	858	+ result.put("PatientID", sieveApply.getPatientID());
	859	+ result.put("ApplicationNo", sieveApply.getApplicationNo());
	860	+ result.put("Smoking", sieveApply.getSmoking());
	861	+ result.put("Insulin", sieveApply.getInsulin());
	862	+ result.put("HC", sieveApply.getHC());
	863	+ result.put("MannualEntry", sieveApply.getMannualEntry());
	864	+ result.put("NT", sieveApply.getNT());
	865	+ result.put("ResponsibleCode", sieveApply.getResponsibleCode());
	866	+ result.put("T21", sieveApply.getT21());
	867	+ result.put("T18", sieveApply.getT18());
	868	+ result.put("NTD", sieveApply.getNTD());
	869	+ result.put("ARMethod", sieveApply.getARMethod());
	870	+ result.put("ExtractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate()));
	871	+ result.put("TransferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate()));
	872	+ result.put("DonorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate()));
	873	+ result.put("NasalBone", sieveApply.getNasalBone());
	874	+ result.put("Monozygous", sieveApply.getMonozygous());
	875	+ result.put("PatientType", sieveApply.getPatientType());
	876	+
	877	+
852	878	result.put("id", sieveApply.getId());
853	879	result.put("parentId", sieveApply.getParentId());
854		-
855	880	result.put("check", sieveApply.getCheckItem());
856	881	result.put("guide", sieveApply.getGuide());
857	882	result.put("checkDate", sieveApply.getCheckDate());
...	...	@@ -910,7 +935,9 @@
910	935	result.put("gxbzl", sieveApply.getGxbzl());
911	936	result.put("jzsInfo", sieveApply.getJzsInfo());
912	937	result.put("ypglx", sieveApply.getYpglx());
913		-
	938	+ if(StringUtils.isNotEmpty(id)){
	939	+ result.put("redundancy", id);
	940	+ }
914	941	result.put("nf", sieveApply.getNf());
915	942
916	943	if (type == 1) {

...	...	@@ -20,6 +20,7 @@
20	20
21	21	private String id;
22	22	private String parentId;
	23	+ private String redundancy;
23	24
24	25	private String tszhz;// 唐氏综合症 21-三体
25	26	private String sjgjx;// 神经管畸形 NTD
...	...	@@ -57,6 +58,14 @@
57	58	private String checkerId;
58	59
59	60	private String reportType;
	61	+
	62	+ public String getRedundancy() {
	63	+ return redundancy;
	64	+ }
	65	+
	66	+ public void setRedundancy(String redundancy) {
	67	+ this.redundancy = redundancy;
	68	+ }
60	69
61	70	public String getReportType() {
62	71	return reportType;

...	...	@@ -88,6 +88,8 @@
88	88
89	89	private Integer couponType;
90	90
	91	+ //冗余lyms_sieve表id
	92	+ private String redundancy;
91	93
92	94	/**
93	95	* null/1 血清学筛查 2/无创基因筛查
94	96
...	...	@@ -252,7 +254,191 @@
252	254	private String jzsInfo;
253	255
254	256	private String ypglx;
	257	+ //iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入
	258	+ //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠
	259	+ private String patientID;
	260	+ //申请单号
	261	+ private String applicationNo;
	262	+ //吸烟 0：不吸烟；-1或空字符串：未知;1：吸烟；3：妊娠期间终止;2:妊娠前终止
	263	+ private Integer smoking;
	264	+ //I-型糖尿病 <空>：未知；0：无;1:有
	265	+ private Integer insulin;
	266	+ private Integer hC;
	267	+ //B超孕天如果7W2D，此处应填5
	268	+ private Integer mannualEntry;
	269	+ //如果有NT，则必须有
	270	+ private Integer nT;
	271	+ //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠
	272	+ private String responsibleCode;
	273	+ //既往T21 <空>：未知；0：无;1:有
	274	+ private Integer t21;
	275	+ //既往T18 <空>：未知；0：无;1:有
	276	+ private Integer t18;
	277	+ //既往NTD <空>：未知；0：无;1:有
	278	+ private Integer nTD;
	279	+ //辅助生殖方法 <空>：未知；
	280	+ //3：克罗米芬治疗；//1：配子输卵管内移植；
	281	+ //4：捐赠卵子； //6：卵细胞浆内单精子注射；
	282	+ //5：捐赠受精；//0：体外受精；
	283	+ //7：其他；//2：合子输卵管内移植
	284	+ private Integer aRMethod;
	285	+ //辅助生殖之提取日期若输入了ARMethod，此项必填
	286	+ private String extractionDate;
	287	+ // 辅助生殖之移植日期若输入了ARMethod，此项必填
	288	+ private String transferDate;
	289	+ //辅助生殖之捐赠者生日若输入了ARMethod，此项必填
	290	+ private String donorBirthDate;
	291	+ //鼻骨 <空>：未知；1：未显;2:显示
	292	+ private Integer nasalBone;
	293	+ //单卵 0：否;1：是
	294	+ private Integer monozygous;
	295	+ //孕妇筛查类型 0：一般；1：早中联合筛查孕妇
	296	+ private Integer patientType;
255	297
	298	+ public String getPatientID() {
	299	+ return patientID;
	300	+ }
	301	+
	302	+ public void setPatientID(String patientID) {
	303	+ this.patientID = patientID;
	304	+ }
	305	+
	306	+ public String getApplicationNo() {
	307	+ return applicationNo;
	308	+ }
	309	+
	310	+ public void setApplicationNo(String applicationNo) {
	311	+ this.applicationNo = applicationNo;
	312	+ }
	313	+
	314	+ public Integer getSmoking() {
	315	+ return smoking;
	316	+ }
	317	+
	318	+ public void setSmoking(Integer smoking) {
	319	+ this.smoking = smoking;
	320	+ }
	321	+
	322	+ public Integer getInsulin() {
	323	+ return insulin;
	324	+ }
	325	+
	326	+ public void setInsulin(Integer insulin) {
	327	+ this.insulin = insulin;
	328	+ }
	329	+
	330	+ public Integer gethC() {
	331	+ return hC;
	332	+ }
	333	+
	334	+ public void sethC(Integer hC) {
	335	+ this.hC = hC;
	336	+ }
	337	+
	338	+ public Integer getMannualEntry() {
	339	+ return mannualEntry;
	340	+ }
	341	+
	342	+ public void setMannualEntry(Integer mannualEntry) {
	343	+ this.mannualEntry = mannualEntry;
	344	+ }
	345	+
	346	+ public Integer getnT() {
	347	+ return nT;
	348	+ }
	349	+
	350	+ public void setnT(Integer nT) {
	351	+ this.nT = nT;
	352	+ }
	353	+
	354	+ public String getResponsibleCode() {
	355	+ return responsibleCode;
	356	+ }
	357	+
	358	+ public void setResponsibleCode(String responsibleCode) {
	359	+ this.responsibleCode = responsibleCode;
	360	+ }
	361	+
	362	+ public Integer getT21() {
	363	+ return t21;
	364	+ }
	365	+
	366	+ public void setT21(Integer t21) {
	367	+ this.t21 = t21;
	368	+ }
	369	+
	370	+ public Integer getT18() {
	371	+ return t18;
	372	+ }
	373	+
	374	+ public void setT18(Integer t18) {
	375	+ this.t18 = t18;
	376	+ }
	377	+
	378	+ public Integer getnTD() {
	379	+ return nTD;
	380	+ }
	381	+
	382	+ public void setnTD(Integer nTD) {
	383	+ this.nTD = nTD;
	384	+ }
	385	+
	386	+ public Integer getaRMethod() {
	387	+ return aRMethod;
	388	+ }
	389	+
	390	+ public void setaRMethod(Integer aRMethod) {
	391	+ this.aRMethod = aRMethod;
	392	+ }
	393	+
	394	+ public String getExtractionDate() {
	395	+ return extractionDate;
	396	+ }
	397	+
	398	+ public void setExtractionDate(String extractionDate) {
	399	+ this.extractionDate = extractionDate;
	400	+ }
	401	+
	402	+ public String getTransferDate() {
	403	+ return transferDate;
	404	+ }
	405	+
	406	+ public void setTransferDate(String transferDate) {
	407	+ this.transferDate = transferDate;
	408	+ }
	409	+
	410	+ public String getDonorBirthDate() {
	411	+ return donorBirthDate;
	412	+ }
	413	+
	414	+ public void setDonorBirthDate(String donorBirthDate) {
	415	+ this.donorBirthDate = donorBirthDate;
	416	+ }
	417	+
	418	+ public Integer getNasalBone() {
	419	+ return nasalBone;
	420	+ }
	421	+
	422	+ public void setNasalBone(Integer nasalBone) {
	423	+ this.nasalBone = nasalBone;
	424	+ }
	425	+
	426	+ public Integer getMonozygous() {
	427	+ return monozygous;
	428	+ }
	429	+
	430	+ public void setMonozygous(Integer monozygous) {
	431	+ this.monozygous = monozygous;
	432	+ }
	433	+
	434	+ public Integer getPatientType() {
	435	+ return patientType;
	436	+ }
	437	+
	438	+ public void setPatientType(Integer patientType) {
	439	+ this.patientType = patientType;
	440	+ }
	441	+
256	442	public String getNf() {
257	443	return nf;
258	444	}
...	...	@@ -269,6 +455,14 @@
269	455	this.ypglx = ypglx;
270	456	}
271	457
	458	+ public String getRedundancy() {
	459	+ return redundancy;
	460	+ }
	461	+
	462	+ public void setRedundancy(String redundancy) {
	463	+ this.redundancy = redundancy;
	464	+ }
	465	+
272	466	@Override
273	467	public SieveApplyOrderModel convertToDataModel() {
274	468	SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
275	469
...	...	@@ -277,7 +471,28 @@
277	471	sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));
278	472	sieveApplyOrderModel.setCheckDate(checkDate == null ? sendTime : checkDate);
279	473	sieveApplyOrderModel.setGuide(guide);
	474	+ sieveApplyOrderModel.setRedundancy(redundancy);
280	475	sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime));
	476	+
	477	+
	478	+ sieveApplyOrderModel.setPatientID(patientID);
	479	+ sieveApplyOrderModel.setApplicationNo(applicationNo);
	480	+ sieveApplyOrderModel.setSmoking(smoking);
	481	+ sieveApplyOrderModel.setInsulin(insulin);
	482	+ sieveApplyOrderModel.setHC(hC);
	483	+ sieveApplyOrderModel.setMannualEntry(mannualEntry);
	484	+ sieveApplyOrderModel.setNT(nT);
	485	+ sieveApplyOrderModel.setResponsibleCode(responsibleCode);
	486	+ sieveApplyOrderModel.setT21(t21);
	487	+ sieveApplyOrderModel.setT18(t18);
	488	+ sieveApplyOrderModel.setNTD(nTD);
	489	+ sieveApplyOrderModel.setARMethod(aRMethod);
	490	+ sieveApplyOrderModel.setExtractionDate(StringUtils.isNotEmpty(extractionDate) ? DateUtil.parseYMD(extractionDate) : null);
	491	+ sieveApplyOrderModel.setTransferDate(StringUtils.isNotEmpty(transferDate) ? DateUtil.parseYMD(transferDate) : null);
	492	+ sieveApplyOrderModel.setDonorBirthDate(StringUtils.isNotEmpty(donorBirthDate) ? DateUtil.parseYMD(donorBirthDate) : null);
	493	+ sieveApplyOrderModel.setNasalBone(nasalBone);
	494	+ sieveApplyOrderModel.setMonozygous(monozygous);
	495	+ sieveApplyOrderModel.setPatientType(patientType);
281	496
282	497
283	498	sieveApplyOrderModel.setBirth(StringUtils.isNotEmpty(birth) ? DateUtil.parseYMD(birth) : null);