jiangjiazhi / regional-platform

Commit 18ab42724fea8bd3d84135611c7226ef36a31d82

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 7 changed files with 116 additions and 6 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitScreen.java

1	1	package com.lyms.platform.common.enums;
2	2
	3	+import java.util.ArrayList;
	4	+import java.util.HashMap;
	5	+import java.util.List;
	6	+import java.util.Map;
	7	+
3	8	/**
4	9	*
5	10	* 耳聾基因結果
...	...	@@ -21,6 +26,17 @@
21	26	private DeafEnums(Integer id,String name){
22	27	this.id=id;
23	28	this.name=name;
	29	+ }
	30	+
	31	+ public static List<Map> getDeafEnums() {
	32	+ List<Map> list = new ArrayList<>();
	33	+ for (DeafEnums e : DeafEnums.values()) {
	34	+ Map rootMap = new HashMap();
	35	+ rootMap.put("id", e.getId());
	36	+ rootMap.put("name", e.getName());
	37	+ list.add(rootMap);
	38	+ }
	39	+ return list;
24	40	}
25	41
26	42	public Integer getId() {

...	...	@@ -56,6 +56,19 @@
56	56	}
57	57
58	58	/**
	59	+ * 获取听力母亲信息
	60	+ *
	61	+ * @param id babyId
	62	+ * @return 母亲信息
	63	+ */
	64	+ @TokenRequired
	65	+ @ResponseBody
	66	+ @RequestMapping(method = RequestMethod.GET,value = "/queryBabyInfo/{id}")
	67	+ public BaseResponse queryBabyInfo(@PathVariable("id")String id){
	68	+ return babyEarFacade.queryBabyInfo(id);
	69	+ }
	70	+
	71	+ /**
59	72	* 听筛建档初始化数据
60	73	* @return
61	74	*/

...	...	@@ -126,7 +126,7 @@
126	126	//根据条件查询基础配置信息表
127	127	InitScreen initScreen = new InitScreen();
128	128	initScreen.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class));
129		- initScreen.setDeafEnumsResult(EnumUtil.toJson(DeafEnums.class));
	129	+ initScreen.setDeafEnumsResult(DeafEnums.getDeafEnums());
130	130	return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
131	131	}
132	132

...	...	@@ -1208,7 +1208,8 @@
1208	1208	babyEarBaseView.setFphone(babyEarBase.getFphone());
1209	1209	babyEarBaseView.setCreateTime(babyEarBase.getCreateTime());
1210	1210	babyEarBaseView.setVcCardNo(babyEarBase.getVcCardNo());
1211		- babyEarBaseView.setServiceType(ServiceStatusEnums.getNameById(babyEarBase.getServiceType()));
	1211	+ babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyEarBase.getServiceStatus()));
	1212	+ babyEarBaseView.setServiceStatus(ServiceStatusEnums.getNameById(babyEarBase.getServiceStatus()));
1212	1213	babyEarBaseView.setMonthAge(babyEarBase.getMonthAge());
1213	1214	return babyEarBaseView;
1214	1215	}
...	...	@@ -1614,6 +1615,63 @@
1614	1615	baseResponse.setPageInfo(pageInfo);
1615	1616	baseResponse.setErrormsg("成功");
1616	1617	return baseResponse;
	1618	+ }
	1619	+
	1620	+ public BaseResponse queryBabyInfo(String id) {
	1621	+ BaseObjectResponse br = new BaseObjectResponse();
	1622	+ Map<String, Object> mothMap = new HashMap<>();
	1623	+ Map<String, Object> resMap = new HashMap<>();
	1624	+ BabyModel model = babyService.getOneBabyById(id);
	1625	+ if (model != null) {
	1626	+ //儿童姓名
	1627	+ mothMap.put("name", model.getName());
	1628	+ //儿童月龄
	1629	+ mothMap.put("monthAge", DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	1630	+ //生日
	1631	+ mothMap.put("birthday", DateUtil.getyyyy_MM_dd(model.getBirth()));
	1632	+ //母亲名称
	1633	+ mothMap.put("mname", model.getMname());
	1634	+ //联系方式
	1635	+ mothMap.put("mphone", model.getMphone());
	1636	+ //备注
	1637	+ mothMap.put("mremark", model.getMremark());
	1638	+ //性别
	1639	+ mothMap.put("sex", SexEnum.getTextById(model.getSex()));
	1640	+ //母亲的就诊卡号
	1641	+ mothMap.put("vcCardNo", model.getVcCardNo());
	1642	+ //母亲身份证号
	1643	+ mothMap.put("cardNo", model.getMcertNo());
	1644	+
	1645	+ BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
	1646	+
	1647	+ earQuery.setBabyPatientId(id);
	1648	+ List<BabyPatientExtendEar> babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
	1649	+ if (CollectionUtils.isNotEmpty(babyPatientExtendEars)) {
	1650	+ BabyPatientExtendEar babyPatientExtendEar = babyPatientExtendEars.get(0);
	1651	+ //母亲孕期高危因素
	1652	+ if (babyPatientExtendEar.getmHighRiskFactorId() != null) {
	1653	+ String[] highFactors = babyPatientExtendEar.getmHighRiskFactorId().split(",");
	1654	+ List<String> ids = Arrays.asList(highFactors);
	1655	+
	1656	+ HighScoreResult highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
	1657	+ Integer score = 0;
	1658	+ if (highScoreResult != null && highScoreResult.getScore() != null) {
	1659	+ score = highScoreResult.getScore();
	1660	+ }
	1661	+ List<Map<String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
	1662	+ List<Map<String, Object>> list = new ArrayList<>();
	1663	+ if (CollectionUtils.isNotEmpty(checkList)) {
	1664	+ list.addAll(checkList);
	1665	+ }
	1666	+ //高危孕妇
	1667	+ mothMap.put("highRisk", list);
	1668	+ }
	1669	+ }
	1670	+ //是否高危儿童 0 非高危 1高危
	1671	+ resMap.put("baseInfo", mothMap);
	1672	+ br.setData(resMap);
	1673	+ }
	1674	+ return br;
1617	1675	}
1618	1676	}

...	...	@@ -130,6 +130,7 @@
130	130	setName(babyModel.getName());
131	131	setCardNo(babyModel.getCardNo());
132	132	setBirth(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
	133	+ setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBuildDate()));
133	134	setProvinceId(babyModel.getProvinceId());
134	135	setCityId(babyModel.getCityId());
135	136	setAreaId(babyModel.getAreaId());
...	...	@@ -144,7 +145,6 @@
144	145	setFcertNo(babyModel.getFcertNo());
145	146	setFcertTypeId(babyModel.getFcertTypeId());
146	147	setMbirth(DateUtil.getyyyy_MM_dd(babyModel.getMbirth()));
147		- setMonthAge(DateUtil.getBabyMonthAge(babyModel.getMbirth(), babyModel.getBuildDate()));
148	148	setMproTypeId(babyModel.getMproTypeId());
149	149	setMcertNo(babyModel.getMcertNo());
150	150	setMcertTypeId(babyModel.getMcertTypeId());

...	...	@@ -80,6 +80,10 @@
80	80
81	81	private Integer gjb3Slc26a4Ivs7;
82	82
	83	+ private Integer rrna1494;
	84	+
	85	+ private Integer rrna1555;
	86	+
83	87	/**
84	88	* 处理意见 1=复筛 2=诊断
85	89	*/
...	...	@@ -89,6 +93,7 @@
89	93	* 处理意见描述信息
90	94	*/
91	95	private String processOptionDesc;
	96	+
92	97	@Override
93	98	public BabyPatientExtendEarScreen convertToDataModel() {
94	99	BabyPatientExtendEarScreen babyPatientExtendEarScreen = new BabyPatientExtendEarScreen();
...	...	@@ -116,6 +121,8 @@
116	121	babyPatientExtendEarScreen.setGjb2Del299(gjb2Del299);
117	122	babyPatientExtendEarScreen.setGjb3Slc26a4538(gjb3Slc26a4538);
118	123	babyPatientExtendEarScreen.setGjb3Slc26a42168(gjb3Slc26a42168);
	124	+ babyPatientExtendEarScreen.setRrna1494(rrna1494);
	125	+ babyPatientExtendEarScreen.setRrna1555(rrna1555);
119	126	babyPatientExtendEarScreen.setGuidOpinion(guidOpinion);
120	127	babyPatientExtendEarScreen.setCheckDoctorId(checkDoctorId);
121	128	if(null!=referralDate){
...	...	@@ -137,6 +144,22 @@
137	144	* 诊断时间
138	145	*/
139	146	private String referralDate;
	147	+
	148	+ public Integer getRrna1494() {
	149	+ return rrna1494;
	150	+ }
	151	+
	152	+ public void setRrna1494(Integer rrna1494) {
	153	+ this.rrna1494 = rrna1494;
	154	+ }
	155	+
	156	+ public Integer getRrna1555() {
	157	+ return rrna1555;
	158	+ }
	159	+
	160	+ public void setRrna1555(Integer rrna1555) {
	161	+ this.rrna1555 = rrna1555;
	162	+ }
140	163
141	164	public String getNextCheckTime() {
142	165	return nextCheckTime;

...	...	@@ -12,7 +12,7 @@
12	12	*/
13	13	public class InitScreen extends BaseResponse {
14	14	//听力基因类型
15		- private List<Map<String, Object>> deafEnumsResult;
	15	+ private List<Map> deafEnumsResult;
16	16	//高危儿的确定因素
17	17	private List<Map<String,Object>> highRiskConfirms;
18	18
19	19
...	...	@@ -24,11 +24,11 @@
24	24	this.highRiskConfirms = highRiskConfirms;
25	25	}
26	26
27		- public List<Map<String, Object>> getDeafEnumsResult() {
	27	+ public List<Map> getDeafEnumsResult() {
28	28	return deafEnumsResult;
29	29	}
30	30
31		- public void setDeafEnumsResult(List<Map<String, Object>> deafEnumsResult) {
	31	+ public void setDeafEnumsResult(List<Map> deafEnumsResult) {
32	32	this.deafEnumsResult = deafEnumsResult;
33	33	}
34	34	}