jiangjiazhi / regional-platform

Commit 80c8db8c10c70f395722c10da88a899e07ea2781

Authored by liquanyu about 5 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 11 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java

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

...	...	@@ -18,6 +18,8 @@
18	18
19	19	private String id;
20	20	private String parentId;
	21	+ //冗余lyms_sieve表id
	22	+ private String lymsSieveId;
21	23
22	24	private String tszhz;// 唐氏综合症
23	25	private String sjgjx;// 神经管畸形
...	...	@@ -78,6 +80,14 @@
78	80	* 打印次数
79	81	*/
80	82	private Integer printSize;
	83	+
	84	+ public String getLymsSieveId() {
	85	+ return lymsSieveId;
	86	+ }
	87	+
	88	+ public void setLymsSieveId(String lymsSieveId) {
	89	+ this.lymsSieveId = lymsSieveId;
	90	+ }
81	91
82	92	public Boolean getHasReport() {
83	93	return hasReport;

...	...	@@ -22,14 +22,15 @@
22	22
23	23	private String number;
24	24
25		- private String redundancy;
	25	+ //冗余lyms_sieve表id
	26	+ private String lymsSieveId;
26	27
27		- public String getRedundancy() {
28		- return redundancy;
	28	+ public String getLymsSieveId() {
	29	+ return lymsSieveId;
29	30	}
30	31
31		- public void setRedundancy(String redundancy) {
32		- this.redundancy = redundancy;
	32	+ public void setLymsSieveId(String lymsSieveId) {
	33	+ this.lymsSieveId = lymsSieveId;
33	34	}
34	35
35	36	//产筛医院
...	...	@@ -104,8 +105,8 @@
104	105	if(null!=id){
105	106	condition= condition.and("id",id, MongoOper.IS);
106	107	}
107		- if(null!=redundancy){
108		- condition= condition.and("redundancy",redundancy, MongoOper.IS);
	108	+ if(null!=lymsSieveId){
	109	+ condition= condition.and("lymsSieveId",lymsSieveId, MongoOper.IS);
109	110	}
110	111
111	112	return condition.toMongoQuery();

...	...	@@ -95,6 +95,8 @@
95	95
96	96	private List<String> parentIds;
97	97
	98	+ private List<String> lymsSieveIds;
	99	+
98	100	private List<Integer> statuses;
99	101
100	102	/**
101	103
...	...	@@ -118,7 +120,14 @@
118	120	private String areaId;
119	121	private String streetId;
120	122
	123	+ public List<String> getLymsSieveIds() {
	124	+ return lymsSieveIds;
	125	+ }
121	126
	127	+ public void setLymsSieveIds(List<String> lymsSieveIds) {
	128	+ this.lymsSieveIds = lymsSieveIds;
	129	+ }
	130	+
122	131	public String getProvinceId() {
123	132	return provinceId;
124	133	}
...	...	@@ -419,6 +428,9 @@
419	428
420	429	if (null != parentIds && parentIds.size() > 0) {
421	430	condition = condition.and("parentId", parentIds, MongoOper.IN);
	431	+ }
	432	+ if (null != lymsSieveIds && lymsSieveIds.size() > 0) {
	433	+ condition = condition.and("id", lymsSieveIds, MongoOper.IN);
422	434	}
423	435
424	436	if (StringUtils.isNotEmpty(name)) {

...	...	@@ -21,6 +21,9 @@
21	21	private String id;
22	22	//患者id
23	23	private String parentId;
	24	+ //冗余lyms_sieve表id
	25	+ private String lymsSieveId;
	26	+
24	27	private List<String> parentIds;
25	28	//姓名
26	29	private String name;
...	...	@@ -66,6 +69,14 @@
66	69	private Date resultTimeStart;
67	70	private Date resultTimeEnd;
68	71
	72	+ public String getLymsSieveId() {
	73	+ return lymsSieveId;
	74	+ }
	75	+
	76	+ public void setLymsSieveId(String lymsSieveId) {
	77	+ this.lymsSieveId = lymsSieveId;
	78	+ }
	79	+
69	80	public Date getResultTimeStart() {
70	81	return resultTimeStart;
71	82	}
...	...	@@ -201,6 +212,9 @@
201	212
202	213	if (null != parentId) {
203	214	condition = condition.and("parentId", parentId, MongoOper.IS);
	215	+ }
	216	+ if (null != lymsSieveId) {
	217	+ condition = condition.and("lymsSieveId", lymsSieveId, MongoOper.IS);
204	218	}
205	219	if (null != name) {
206	220	condition = condition.and("name", name, MongoOper.IS);

...	...	@@ -103,6 +103,7 @@
103	103	* <p>
104	104	* type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询
105	105	*
	106	+ * @param lymsSieveId == lyms_sieve表的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 lymsSieveId, @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, lymsSieveId,loginState.getId(), type);
116	117	}
117	118
118	119
119	120
120	121
...	...	@@ -126,11 +127,10 @@
126	127	@ResponseBody
127	128	@RequestMapping(value = "/reviceSieve", method = RequestMethod.POST)
128	129	@TokenRequired
129		- public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
	130	+ public BaseResponse reviceSieve(@RequestBody List<String> parentIds, HttpServletRequest request) {
130	131	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
131		- return sieveFacade.reviceSieve(parentIds, loginState.getId());
	132	+ return sieveFacade.reviceSieve2(parentIds, loginState.getId());
132	133	}
133		-
134	134
135	135	/**
136	136	* 产前诊断

...	...	@@ -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.getLymsSieveId())){
	404	+ sieveQuery.setId(sieveApplyOrderAddRequest.getLymsSieveId());
	405	+ }
403	406	List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
404	407	if (CollectionUtils.isNotEmpty(sieveModels)) {
405	408	SieveModel sieveModel = sieveModels.get(0);
...	...	@@ -504,7 +507,7 @@
504	507	sieveApplyOrderModel1.setId(str.get("orderModelid").toString());
505	508	sieveApplyOrderModel1.setModified(new Date());
506	509	sieveApplyOrderModel1.setStatus(1);
507		- sieveApplyOrderModel1.setRedundancy(str.get("sieveModelid").toString());
	510	+ sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString());
508	511	SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
509	512	sieveApplyOrderQuery2.setId(str.get("orderModelid").toString());
510	513	List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);

...	...	@@ -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.getLymsSieveId())){
	149	+ sieveQuery.setId(sieveAddRequest.getLymsSieveId());
	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 lymsSieveId, 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(lymsSieveId)){
	797	+ sieveApplyOrderQuery1.setLymsSieveId(lymsSieveId);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个
	798	+ }
794	799	sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
795	800
796	801	if (CollectionUtils.isNotEmpty(localPatients)) {
...	...	@@ -812,6 +817,9 @@
812	817	SieveResultQuery sieveResultQuery = new SieveResultQuery();
813	818	sieveResultQuery.setParentId(parentId);
814	819	sieveResultQuery.setYn(YnEnums.YES.getId());
	820	+ if(StringUtils.isNotEmpty(lymsSieveId)){
	821	+ sieveResultQuery.setLymsSieveId(lymsSieveId);
	822	+ }
815	823	List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
816	824	if (CollectionUtils.isNotEmpty(list)) {
817	825	SieveResultModel model = list.get(0);
...	...	@@ -842,6 +850,7 @@
842	850	}
843	851	map.put("sieveResultEditInfo", sieveResultEditInfo);
844	852	} else {
	853	+ //1.2.1 查看申请单
845	854	List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
846	855	if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
847	856	Map<String, Object> result = new HashMap<>();
848	857
...	...	@@ -849,9 +858,32 @@
849	858	Map<String, Object> viewInfo = new HashMap<>();
850	859	SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
851	860
	861	+ //iAssistantl数据传输格式说明,导出excel自动不足添加在此处
	862	+ if(StringUtils.isNotEmpty(lymsSieveId)){
	863	+ result.put("lymsSieveId", lymsSieveId);
	864	+ }
	865	+ result.put("patientID", sieveApply.getPatientID());
	866	+ result.put("applicationNo", sieveApply.getApplicationNo());
	867	+ result.put("smoking", sieveApply.getSmoking());
	868	+ result.put("insulin", sieveApply.getInsulin());
	869	+ result.put("hC", sieveApply.getHC());
	870	+ result.put("mannualEntry", sieveApply.getMannualEntry());
	871	+ result.put("nT", sieveApply.getNT());
	872	+ result.put("responsibleCode", sieveApply.getResponsibleCode());
	873	+ result.put("t21", sieveApply.getT21());
	874	+ result.put("t18", sieveApply.getT18());
	875	+ result.put("nTD", sieveApply.getNTD());
	876	+ result.put("aRMethod", sieveApply.getARMethod());
	877	+ result.put("extractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate()));
	878	+ result.put("transferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate()));
	879	+ result.put("donorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate()));
	880	+ result.put("nasalBone", sieveApply.getNasalBone());
	881	+ result.put("monozygous", sieveApply.getMonozygous());
	882	+ result.put("patientType", sieveApply.getPatientType());
	883	+
	884	+
852	885	result.put("id", sieveApply.getId());
853	886	result.put("parentId", sieveApply.getParentId());
854		-
855	887	result.put("check", sieveApply.getCheckItem());
856	888	result.put("guide", sieveApply.getGuide());
857	889	result.put("checkDate", sieveApply.getCheckDate());
...	...	@@ -960,6 +992,9 @@
960	992	SieveResultQuery sieveResultQuery = new SieveResultQuery();
961	993	sieveResultQuery.setParentId(parentId);
962	994	sieveResultQuery.setYn(YnEnums.YES.getId());
	995	+ if(StringUtils.isNotEmpty(lymsSieveId)){
	996	+ sieveResultQuery.setLymsSieveId(lymsSieveId);
	997	+ }
963	998	List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
964	999	if (CollectionUtils.isNotEmpty(list)) {
965	1000	SieveResultModel sieveResultModel = list.get(0);
966	1001
...	...	@@ -971,11 +1006,11 @@
971	1006	sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
972	1007	sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
973	1008
	1009	+ sieveResultInfo.put("lymsSieveresultId", sieveResultModel.getId());//产筛结果id
974	1010	sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId());
975	1011	sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId());
976	1012	sieveResultInfo.put("hasReport", sieveResultModel.getHasReport());
977	1013
978		-
979	1014	String tszhzValue = "";
980	1015	if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
981	1016
...	...	@@ -1216,6 +1251,41 @@
1216	1251	}
1217	1252
1218	1253	public BaseResponse reviceSieve(List<String> parentIds, Integer userId) {
	1254	+ if (CollectionUtils.isNotEmpty(parentIds)) {
	1255	+ SieveQuery query = new SieveQuery();
	1256	+ query.setParentIds(parentIds);
	1257	+ query.setYn(YnEnums.YES.getId());
	1258	+ List<SieveModel> list = sieveService.queryList(query);
	1259	+
	1260	+ if (CollectionUtils.isNotEmpty(list)) {
	1261	+ for (SieveModel sieve : list) {
	1262	+ sieve.setReviceStatus(2);
	1263	+ sieveService.updateOneChanQianDiaSieve(sieve);
	1264	+ }
	1265	+ }
	1266	+ }
	1267	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	1268	+ }
	1269	+ /**
	1270	+ * 功能描述: 接收产筛申请,入参是档案id就使用以前方式
	1271	+ * @author 武涛涛
	1272	+ * @date 2020/6/10
	1273	+ */
	1274	+ public BaseResponse reviceSieve2(List<String> parentIds, Integer userId) {
	1275	+ if (CollectionUtils.isNotEmpty(parentIds)) {
	1276	+ SieveQuery query = new SieveQuery();
	1277	+ query.setLymsSieveIds(parentIds);
	1278	+ query.setYn(YnEnums.YES.getId());
	1279	+ List<SieveModel> list = sieveService.queryList(query);
	1280	+
	1281	+ if (CollectionUtils.isNotEmpty(list)) {
	1282	+ for (SieveModel sieve : list) {
	1283	+ sieve.setReviceStatus(2);
	1284	+ sieveService.updateOneChanQianDiaSieve(sieve);
	1285	+ }
	1286	+ }
	1287	+ }
	1288	+
1219	1289	if (CollectionUtils.isNotEmpty(parentIds)) {
1220	1290	SieveQuery query = new SieveQuery();
1221	1291	query.setParentIds(parentIds);

...	...	@@ -20,6 +20,8 @@
20	20
21	21	private String id;
22	22	private String parentId;
	23	+ //冗余lyms_sieve表id
	24	+ private String lymsSieveId;
23	25
24	26	private String tszhz;// 唐氏综合症 21-三体
25	27	private String sjgjx;// 神经管畸形 NTD
...	...	@@ -58,6 +60,14 @@
58	60
59	61	private String reportType;
60	62
	63	+ public String getLymsSieveId() {
	64	+ return lymsSieveId;
	65	+ }
	66	+
	67	+ public void setLymsSieveId(String lymsSieveId) {
	68	+ this.lymsSieveId = lymsSieveId;
	69	+ }
	70	+
61	71	public String getReportType() {
62	72	return reportType;
63	73	}
...	...	@@ -245,6 +255,7 @@
245	255	sieveModel.setDzhpx(dzhpx);
246	256	sieveModel.setCspj(cspj);
247	257	sieveModel.setStzhz13(stzhz13);
	258	+ sieveModel.setLymsSieveId(lymsSieveId);
248	259	sieveModel.setPublishName(publishName);
249	260	sieveModel.setResultTime(DateUtil.parseYMD(resultTime));
250	261

...	...	@@ -88,6 +88,8 @@
88	88
89	89	private Integer couponType;
90	90
	91	+ //冗余lyms_sieve表id
	92	+ private String lymsSieveId;
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 getLymsSieveId() {
	459	+ return lymsSieveId;
	460	+ }
	461	+
	462	+ public void setLymsSieveId(String lymsSieveId) {
	463	+ this.lymsSieveId = lymsSieveId;
	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.setLymsSieveId(lymsSieveId);
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);

...	...	@@ -91,7 +91,7 @@
91	91	sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
92	92	sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId());
93	93	sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
94		- sieveApplyOrderQuery.setRedundancy(sieveModel.getId());
	94	+ sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId());
95	95
96	96	//查询报告出具时间
97	97	SieveResultQuery sieveResultQuery = new SieveResultQuery();