jiangjiazhi / regional-platform

Commit 047bd607e41205db226108ecf632c9cc4406db25

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

衡水需求

Showing 4 changed files with 73 additions and 1 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/SieveListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java

...	...	@@ -1020,9 +1020,20 @@
1020	1020	data.put("cqStatus", sive.getCqStatus());
1021	1021	data.put("cqResult", sive.getCqResult());
1022	1022	data.put("renShenResult", sive.getRenShenResult());
1023		- data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(sive.getRealPhone()));
	1023	+// data.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(sive.getRealPhone()));
	1024	+ data.put("phone", sive.getRealPhone());
1024	1025	data.put("remarkTypeText", sive.getCsRemarkTypeText());
1025	1026	data.put("detail", sive.getDetail());
	1027	+
	1028	+ data.put("number", sive.getNumber());
	1029	+ data.put("weight", sive.getWeight());
	1030	+ data.put("lastMenstrual", sive.getLastMenstrual());
	1031	+ data.put("sieveType", sive.getSieveType());
	1032	+ data.put("costType", sive.getCostType());
	1033	+ data.put("collectionDate", sive.getCollectionDate());
	1034	+ data.put("applyDoctor", sive.getApplyDoctor());
	1035	+ data.put("residence", sive.getResidence());
	1036	+
1026	1037	datas.add(data);
1027	1038	}
1028	1039	}
...	...	@@ -1041,6 +1052,16 @@
1041	1052	cnames.put("phone", "联系方式");
1042	1053	cnames.put("remarkTypeText", "备注");
1043	1054	cnames.put("detail", "详情");
	1055	+
	1056	+ cnames.put("number", "标本号");
	1057	+ cnames.put("weight", "体重");
	1058	+ cnames.put("lastMenstrual", "末次月经");
	1059	+ cnames.put("sieveType", "产筛类型");
	1060	+ cnames.put("costType", "收费类型");
	1061	+ cnames.put("collectionDate", "采血时间");
	1062	+ cnames.put("applyDoctor", "送检医生");
	1063	+ cnames.put("residence", "孕妇住址");
	1064	+
1044	1065	response.setContentType("application/octet-stream");
1045	1066	response.setCharacterEncoding("UTF-8");
1046	1067	response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls");
...	...	@@ -3141,6 +3162,7 @@
3141	3162	private void cnamesRegionalCqsievesMap(Map<String, String> cnames) {
3142	3163	cnames.put("姓名", "姓名");
3143	3164	cnames.put("年龄", "年龄");
	3165	+ cnames.put("联系方式", "联系方式");
3144	3166	cnames.put("申请时间", "申请时间");
3145	3167	cnames.put("申请孕周", "申请孕周");
3146	3168	cnames.put("采血时间", "采血时间");
...	...	@@ -3180,6 +3202,7 @@
3180	3202	Map<String, Object> data = new HashMap<>();
3181	3203	data.put("姓名", sive.getName());
3182	3204	data.put("年龄", sive.getAge());
	3205	+ data.put("联系方式", sive.getPhone());
3183	3206	data.put("申请时间", sive.getApplyTime());
3184	3207	data.put("申请孕周", sive.getDueWeek());
3185	3208	data.put("采血时间", sive.getCollectionDate());

...	...	@@ -16,6 +16,18 @@
16	16	public class SieveListResult implements IBasicResultConvert<SieveListResult, SieveModel> {
17	17	public static final String SPIT = "-";
18	18
	19	+ /**
	20	+ * null/1 血清学筛查 2/无创基因筛查 3/二者都用
	21	+ */
	22	+ private String sieveType;
	23	+
	24	+ /**
	25	+ * 1/免费 2/自费
	26	+ */
	27	+ private String costType;
	28	+ //体重
	29	+ private String weight;
	30	+
19	31	private String sjgjx;// 神经管畸形
20	32	private String sbst;// 18-三体
21	33	private String tszhz;// 21 唐氏综合症
...	...	@@ -504,6 +516,30 @@
504	516
505	517	public void setId(String id) {
506	518	this.id = id;
	519	+ }
	520	+
	521	+ public String getSieveType() {
	522	+ return sieveType;
	523	+ }
	524	+
	525	+ public void setSieveType(String sieveType) {
	526	+ this.sieveType = sieveType;
	527	+ }
	528	+
	529	+ public String getWeight() {
	530	+ return weight;
	531	+ }
	532	+
	533	+ public void setWeight(String weight) {
	534	+ this.weight = weight;
	535	+ }
	536	+
	537	+ public String getCostType() {
	538	+ return costType;
	539	+ }
	540	+
	541	+ public void setCostType(String costType) {
	542	+ this.costType = costType;
507	543	}
508	544
509	545	public String getName() {

...	...	@@ -63,6 +63,9 @@
63	63	SieveResultModel resultModel = null;
64	64	try {
65	65	SieveListResult sieveListResult = new SieveListResult();
	66	+ //联系方式
	67	+ sieveListResult.setPhone(sieveModel.getPhone());
	68	+
66	69	//申请孕周
67	70	AntExQuery antExQuery = new AntExQuery();
68	71	antExQuery.setYn(YnEnums.YES.getId());
...	...	@@ -127,6 +130,8 @@
127	130	}
128	131	//年龄
129	132	sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
	133	+
	134	+
130	135	//户籍地
131	136	sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
132	137	patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));

...	...	@@ -128,14 +128,22 @@
128	128	//B超信息
129	129	//血清
130	130	if ("1".equals(sieveApplyOrderModel.getSieveType())) {
	131	+ sieveListResult.setSieveType("血清学筛查");
131	132	String bpd = null;
132	133	String crl = null;
133	134	bpd = StringUtils.isNotEmpty(sieveApplyOrderModel.getBpd()) ? "BPD:" + sieveApplyOrderModel.getBpd() : "";
134	135	crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:" + sieveApplyOrderModel.getCrl() : "";
135	136	sieveListResult.setbScanInfo(bpd + "," + crl);
136	137	} else if ("2".equals(sieveApplyOrderModel.getSieveType())) {
	138	+ sieveListResult.setSieveType("无创基因筛查");
137	139	sieveListResult.setbScanInfo(StringUtils.isNotEmpty(sieveApplyOrderModel.getFetusNum()) ? data.get(sieveApplyOrderModel.getFetusNum()) : "--");
138	140	}
	141	+ if("1".equals(sieveApplyOrderModel.getCostType())){
	142	+ sieveListResult.setCostType("免费");
	143	+ }else if ("2".equals(sieveApplyOrderModel.getCostType())){
	144	+ sieveListResult.setCostType("自费");
	145	+ }
	146	+ sieveListResult.setWeight(sieveApplyOrderModel.getWeight());
139	147	}
140	148	List<AntenatalExaminationModel> list1 = antService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
141	149	if (CollectionUtils.isNotEmpty(list1)) {