jiangjiazhi / regional-platform

Commit 3f44de772d16c985db18c13d18fdbf4e28695c56

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

产前诊断

Showing 4 changed files with 87 additions and 2 deletions

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/result/PatientBaseResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java

...	...	@@ -46,6 +46,8 @@
46	46	@Component
47	47	public class SieveFacade {
48	48	@Autowired
	49	+ private DiagnosisService diagnosisService;
	50	+ @Autowired
49	51	private SieveService sieveService;
50	52	@Autowired
51	53	private AutoMatchFacade autoMatchFacade;
...	...	@@ -477,7 +479,7 @@
477	479	if (end > list.size()) {
478	480	end = list.size();
479	481	}
480		- listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService)));
	482	+ listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService,diagnosisService)));
481	483	}
482	484	for (Future f : listFuture) {
483	485	try {
...	...	@@ -667,6 +669,32 @@
667	669	AntExChuModel chuModel = list.get(0);
668	670	patientBaseResult.setWeight(chuModel.getYqWeight());
669	671	}
	672	+
	673	+ //查询产前诊断
	674	+ int a = 0;
	675	+ List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
	676	+ Map<String,String> map = new HashMap<String,String>();
	677	+ map.put("cqSieve","0");//0,未申请；1，已申请；2，已接收；3，已诊断
	678	+ map.put("diaProject","");
	679	+ map.put("diaResult","");//(0，阴性；1，阳性)
	680	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	681	+ diagnosisQuery.setParentId(pat.getId());
	682	+ diagnosisQuery.setHospitalId(hospitalId);
	683	+ List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
	684	+ if(CollectionUtils.isNotEmpty(diaList)){
	685	+ for(DiagnosisModel diagnosisModel : diaList){
	686	+ Map<String,String> m = new HashMap<String,String>();
	687	+ map.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断
	688	+ map.put("diaProject",diagnosisModel.getDiaProject());
	689	+ map.put("diaResult",diagnosisModel.getDiaResult());//(0，阴性；1，阳性)
	690	+ a=1;
	691	+ mList.add(m);
	692	+ }
	693	+ }
	694	+ if(a == 0){
	695	+ mList.add(map);
	696	+ }
	697	+ patientBaseResult.setDia(mList);
670	698
671	699	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
672	700	}

...	...	@@ -55,6 +55,17 @@
55	55
56	56	private String sex;
57	57
	58	+ //新增产前诊断信息
	59	+ private List<Map<String,String>> dia;
	60	+
	61	+ public List<Map<String, String>> getDia() {
	62	+ return dia;
	63	+ }
	64	+
	65	+ public void setDia(List<Map<String, String>> dia) {
	66	+ this.dia = dia;
	67	+ }
	68	+
58	69	public String getSex() {
59	70	return sex;
60	71	}

...	...	@@ -7,6 +7,8 @@
7	7	import com.lyms.platform.pojo.SieveModel;
8	8
9	9	import java.util.Date;
	10	+import java.util.List;
	11	+import java.util.Map;
10	12
11	13	/**
12	14	* Created by Administrator on 2016/7/5 0005.
...	...	@@ -65,6 +67,17 @@
65	67
66	68	//申请医院
67	69	private String applyHospital;
	70	+
	71	+ //新增产前诊断信息
	72	+ private List<Map<String,String>> dia;
	73	+
	74	+ public List<Map<String, String>> getDia() {
	75	+ return dia;
	76	+ }
	77	+
	78	+ public void setDia(List<Map<String, String>> dia) {
	79	+ this.dia = dia;
	80	+ }
68	81
69	82	public String getApplyHospital() {
70	83	return applyHospital;

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.biz.service.AntenatalExaminationService;
4	4	import com.lyms.platform.biz.service.ApplyOrderService;
	5	+import com.lyms.platform.biz.service.DiagnosisService;
5	6	import com.lyms.platform.biz.service.PatientsService;
6	7	import com.lyms.platform.common.enums.YnEnums;
7	8	import com.lyms.platform.common.utils.DateUtil;
...	...	@@ -11,6 +12,7 @@
11	12	import com.lyms.platform.pojo.*;
12	13	import com.lyms.platform.query.AntExChuQuery;
13	14	import com.lyms.platform.query.AntExQuery;
	15	+import com.lyms.platform.query.DiagnosisQuery;
14	16	import com.lyms.platform.query.ReferralApplyOrderQuery;
15	17	import org.apache.commons.collections.CollectionUtils;
16	18	import org.apache.commons.lang.StringUtils;
17	19
...	...	@@ -19,7 +21,9 @@
19	21	import org.springframework.data.domain.Sort;
20	22
21	23	import java.util.ArrayList;
	24	+import java.util.HashMap;
22	25	import java.util.List;
	26	+import java.util.Map;
23	27	import java.util.concurrent.Callable;
24	28
25	29	/**
26	30
27	31
...	...	@@ -40,15 +44,18 @@
40	44
41	45	private OrganizationService organizationService;
42	46
	47	+ private DiagnosisService diagnosisService;
	48	+
43	49	public SieveWorker(String hospitalId, List<SieveModel> list, AntenatalExaminationService antService,
44	50	PatientsService patientsService,ApplyOrderService applyOrderService,
45		- OrganizationService organizationService) {
	51	+ OrganizationService organizationService,DiagnosisService diagnosisService) {
46	52	this.hospitalId = hospitalId;
47	53	this.list = list;
48	54	this.antService = antService;
49	55	this.patientsService = patientsService;
50	56	this.applyOrderService = applyOrderService;
51	57	this.organizationService = organizationService;
	58	+ this.diagnosisService = diagnosisService;
52	59	}
53	60
54	61	@Override
...	...	@@ -122,6 +129,32 @@
122	129	Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId()));
123	130	sieveListResult.setApplyHospital(organization.getName());
124	131	}
	132	+
	133	+ //查询产前诊断
	134	+ int a = 0;
	135	+ List<Map<String,String>> mList = new ArrayList<Map<String,String>>();
	136	+ Map<String,String> map = new HashMap<String,String>();
	137	+ map.put("cqSieve","0");//0,未申请；1，已申请；2，已接收；3，已诊断
	138	+ map.put("diaProject","");
	139	+ map.put("diaResult","");//(0，阴性；1，阳性)
	140	+ DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
	141	+ diagnosisQuery.setParentId(sieveModel.getId());
	142	+ diagnosisQuery.setHospitalId(hospitalId);
	143	+ List<DiagnosisModel> diaList = diagnosisService.queryDiagnosis(diagnosisQuery);
	144	+ if(CollectionUtils.isNotEmpty(diaList)){
	145	+ for(DiagnosisModel diagnosisModel : diaList){
	146	+ Map<String,String> m = new HashMap<String,String>();
	147	+ map.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请；1，已申请；2，已接收；3，已诊断
	148	+ map.put("diaProject",diagnosisModel.getDiaProject());
	149	+ map.put("diaResult",diagnosisModel.getDiaResult());//(0，阴性；1，阳性)
	150	+ a=1;
	151	+ mList.add(m);
	152	+ }
	153	+ }
	154	+ if(a == 0){
	155	+ mList.add(map);
	156	+ }
	157	+ sieveListResult.setDia(mList);
125	158
126	159	results.add(sieveListResult);
127	160	}