jiangjiazhi / regional-platform

Commit 73c192d6d8e87f8b8487249fb126a04f44be07db

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

产前诊断

Showing 3 changed files with 132 additions and 30 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java

...	...	@@ -52,7 +52,36 @@
52	52	private String CsStatus;//产筛状态
53	53	private String ztfx;//整体风险
54	54	private String ztfeText;//整体风险中文
	55	+ private String refStatus;//转诊标志(0,未转诊；1，待接收；2，已接收)
	56	+ private Date diaDate;//诊断时间
	57	+ private String diaHospital;//诊断单位
	58	+ private String inPerson;//录入人员
55	59
	60	+
	61	+ public Date getDiaDate() {
	62	+ return diaDate;
	63	+ }
	64	+
	65	+ public void setDiaDate(Date diaDate) {
	66	+ this.diaDate = diaDate;
	67	+ }
	68	+
	69	+ public String getDiaHospital() {
	70	+ return diaHospital;
	71	+ }
	72	+
	73	+ public void setDiaHospital(String diaHospital) {
	74	+ this.diaHospital = diaHospital;
	75	+ }
	76	+
	77	+ public String getInPerson() {
	78	+ return inPerson;
	79	+ }
	80	+
	81	+ public void setInPerson(String inPerson) {
	82	+ this.inPerson = inPerson;
	83	+ }
	84	+
56	85	public String getId() {
57	86	return id;
58	87	}
59	88
60	89
61	90
62	91
63	92
...	...	@@ -349,21 +378,29 @@
349	378	this.dueDays = dueDays;
350	379	}
351	380
352		- public Map<String,String> contomap(){
	381	+ public String getRefStatus() {
	382	+ return refStatus;
	383	+ }
	384	+
	385	+ public void setRefStatus(String refStatus) {
	386	+ this.refStatus = refStatus;
	387	+ }
	388	+
	389	+ public Map<String,String> contomap(Patients patients){
353	390	Map<String,String> map = new HashMap<String,String>();
354	391	map.put("id",id);
355		- map.put("hospitalId",hospitalId);
	392	+ map.put("hospitalId",patients.getHospitalId());
356	393	map.put("parentId",parentId);
357		- map.put("name",name);
358		- map.put("cardNo",cardNo);
359		- map.put("age",age);
	394	+ map.put("name",patients.getUsername());
	395	+ map.put("cardNo",patients.getCardNo());
	396	+ map.put("age",DateUtil.getAge(patients.getBirth()).toString()+"岁");
360	397	map.put("dueWeek",dueWeek);
361		- map.put("yChanQi", DateUtil.getyyyy_MM_dd(yChanQi));
362		- map.put("phone",phone);
	398	+ map.put("yChanQi", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
	399	+ map.put("phone",patients.getPhone());
363	400	map.put("diaProject",diaProject);
364		- map.put("birth",DateUtil.getyyyy_MM_dd(birth));
	401	+ map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
365	402	map.put("weight",weight);
366		- map.put("lastMenses",DateUtil.getyyyy_MM_dd(lastMenses));
	403	+ map.put("lastMenses",DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
367	404	map.put("mensStartDay",mensStartDay);
368	405	map.put("mensEndDay",mensEndDay);
369	406	map.put("mensStopStartDay",mensStopStartDay);

...	...	@@ -72,7 +72,7 @@
72	72	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件");
73	73	}
74	74	List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
75		- Patients pat = null;
	75	+ Patients pat = new Patients();
76	76	if (CollectionUtils.isNotEmpty(localPatients)) {
77	77	pat = localPatients.get(0);
78	78	DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
...	...	@@ -142,6 +142,14 @@
142	142	diagnosisResult.setZtfeText("高风险");
143	143	}
144	144	}
	145	+ }else{
	146	+ if(1 == sieveModel.getStatus()){//未筛查
	147	+ diagnosisResult.setIsCqSieve("0");
	148	+ }else if(2 == sieveModel.getStatus()){//已筛查
	149	+ diagnosisResult.setIsCqSieve("2");
	150	+ }else if(3 == sieveModel.getStatus()){//筛查中
	151	+ diagnosisResult.setIsCqSieve("1");
	152	+ }
145	153	}
146	154	}else{
147	155	diagnosisResult.setIsCqSieve("0");//未筛查
...	...	@@ -201,6 +209,12 @@
201	209	return objectResponse;
202	210	}else{//新增数据
203	211	diagnosisModel.setStatus("1");
	212	+ diagnosisModel.setRefStatus("0");
	213	+ //查询孕妇基本信息
	214	+ Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
	215	+ int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
	216	+ String applyWeek = com.lyms.platform.common.utils.StringUtils.dueWeek(days);
	217	+ diagnosisModel.setApplyWeek(applyWeek);
204	218	diagnosisService.addDiagnosis(diagnosisModel);//插入数据
205	219	BaseObjectResponse objectResponse = new BaseObjectResponse();
206	220	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -224,7 +238,9 @@
224	238	diagnosisQuery.setId(id);
225	239	DiagnosisModel dia = new DiagnosisModel();
226	240	dia = diagnosisService.findOneDiagnosisById(id);
227		- br.setData(dia.contomap());
	241	+ //查询孕妇基本信息
	242	+ Patients patients = patientsService.findOnePatientById(dia.getParentId());
	243	+ br.setData(dia.contomap(patients));
228	244	br.setErrorcode(ErrorCodeConstants.SUCCESS);
229	245	br.setErrormsg("成功");
230	246	return br;
231	247
...	...	@@ -293,11 +309,13 @@
293	309	return diagnosisManagerResult;
294	310	}
295	311	for(DiagnosisModel diagnosisModel : diaList){
296		- mList.add(diagnosisModel.contomap());
297	312	diagnosisModel.setCsStatus("0");//赋值为未产筛，如果已经做了产筛后边的代码判断会重新赋值
298	313	if(StringUtils.isEmpty(diagnosisModel.getParentId())){
299	314	continue;
300	315	}
	316	+ //查询孕妇基本信息
	317	+ Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
	318	+
301	319	SieveQuery sieveQuery = new SieveQuery();
302	320	sieveQuery.setParentId(diagnosisModel.getParentId());
303	321	//查询产筛list
...	...	@@ -311,7 +329,13 @@
311	329	diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
312	330	}
313	331	if(sieveModel.getStatus() != null){
314		- diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
	332	+ if(1 == sieveModel.getStatus()){
	333	+ diagnosisModel.setCsStatus("0");
	334	+ }else if(2 == sieveModel.getStatus()){
	335	+ diagnosisModel.setCsStatus("2");
	336	+ }else if(3 == sieveModel.getStatus()){
	337	+ diagnosisModel.setCsStatus("1");
	338	+ }
315	339	}
316	340	if(null != sieveModel.getZtfx()){
317	341	if(0 == sieveModel.getZtfx()){
...	...	@@ -328,6 +352,7 @@
328	352	}
329	353	}
330	354	}
	355	+ mList.add(diagnosisModel.contomap(patients));
331	356	}
332	357	diagnosisManagerResult.setData(mList);
333	358	diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
334	359
...	...	@@ -393,10 +418,13 @@
393	418	return diagnosisManagerResult;
394	419	}
395	420	for(DiagnosisModel diagnosisModel : diaList){
396		- mList.add(diagnosisModel.contomap());
	421	+
397	422	if(StringUtils.isEmpty(diagnosisModel.getParentId())){
398	423	continue;
399	424	}
	425	+ //查询孕妇基本信息
	426	+ Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
	427	+
400	428	SieveQuery sieveQuery = new SieveQuery();
401	429	sieveQuery.setParentId(diagnosisModel.getParentId());
402	430	//查询产筛list
...	...	@@ -419,6 +447,7 @@
419	447	diagnosisModel.setZtfeText("高风险");
420	448	}
421	449	}
	450	+ mList.add(diagnosisModel.contomap(patients));
422	451	}
423	452	diagnosisManagerResult.setData(diaList);
424	453	diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());

...	...	@@ -69,8 +69,6 @@
69	69	private String hospitalId;
70	70	//查询号
71	71	private String queryNo;
72		- //诊断结果（0，阴性；1，阳性）
73		- private String diaResult;
74	72	//申请孕周开始
75	73	private String applyWeekStart;
76	74	//申请孕周结束
77	75
...	...	@@ -81,14 +79,22 @@
81	79	private Integer nowWeeksEnd;
82	80	//产前诊断申请时间
83	81	private String applyDate;
84		- //诊断出具开始时间
85		- private String resultDateStart;
86		- //诊断出具结束时间
87		- private String resultDateEnd;
88		- //数据状态
89		- private String diaStatus;
	82	+ //诊断时间
	83	+ private String diaDate;
	84	+ //诊断单位
	85	+ private String diaHospital;
	86	+ //诊断结果（0，阴性；1，阳性）
	87	+ private String diaResult;
90	88	//妊娠结局
91	89	private String rsResult;
	90	+ //诊断出具时间
	91	+ private String resultDate;
	92	+ //录入人员
	93	+ private String inPerson;
	94	+ //数据状态
	95	+ private String diaStatus;
	96	+ //转诊状态
	97	+ private String refStatus;
92	98
93	99	public String getNeed() {
94	100	return need;
95	101
96	102
97	103
98	104
...	...	@@ -362,22 +368,38 @@
362	368	this.applyDate = applyDate;
363	369	}
364	370
365		- public String getResultDateStart() {
366		- return resultDateStart;
	371	+ public String getDiaDate() {
	372	+ return diaDate;
367	373	}
368	374
369		- public void setResultDateStart(String resultDateStart) {
370		- this.resultDateStart = resultDateStart;
	375	+ public void setDiaDate(String diaDate) {
	376	+ this.diaDate = diaDate;
371	377	}
372	378
373		- public String getResultDateEnd() {
374		- return resultDateEnd;
	379	+ public String getDiaHospital() {
	380	+ return diaHospital;
375	381	}
376	382
377		- public void setResultDateEnd(String resultDateEnd) {
378		- this.resultDateEnd = resultDateEnd;
	383	+ public void setDiaHospital(String diaHospital) {
	384	+ this.diaHospital = diaHospital;
379	385	}
380	386
	387	+ public String getResultDate() {
	388	+ return resultDate;
	389	+ }
	390	+
	391	+ public void setResultDate(String resultDate) {
	392	+ this.resultDate = resultDate;
	393	+ }
	394	+
	395	+ public String getInPerson() {
	396	+ return inPerson;
	397	+ }
	398	+
	399	+ public void setInPerson(String inPerson) {
	400	+ this.inPerson = inPerson;
	401	+ }
	402	+
381	403	public String getDiaStatus() {
382	404	return diaStatus;
383	405	}
...	...	@@ -394,6 +416,14 @@
394	416	this.rsResult = rsResult;
395	417	}
396	418
	419	+ public String getRefStatus() {
	420	+ return refStatus;
	421	+ }
	422	+
	423	+ public void setRefStatus(String refStatus) {
	424	+ this.refStatus = refStatus;
	425	+ }
	426	+
397	427	@Override
398	428	public DiagnosisModel convertToDataModel(){
399	429	DiagnosisModel diagnosisModel = new DiagnosisModel();
...	...	@@ -424,6 +454,12 @@
424	454	diagnosisModel.setSendDate(DateUtil.parseYMD(sendDate));
425	455	diagnosisModel.setCollectHospitalId(collectHospitalId);
426	456	diagnosisModel.setCreated(new Date());
	457	+ diagnosisModel.setRefStatus(refStatus);
	458	+ diagnosisModel.setDiaDate(DateUtil.parseYMD(diaDate));
	459	+ diagnosisModel.setDiaHospital(diaHospital);
	460	+ diagnosisModel.setDiaResult(diaResult);
	461	+ diagnosisModel.setRsResult(rsResult);
	462	+ diagnosisModel.setInPerson(inPerson);
427	463
428	464	return diagnosisModel;
429	465	}