liquanyu / regional-platform

Commit 69d2c6ce2192a4705f6da77bcc24475b210a7f37

Authored by liquanyu over 7 years ago

Merge remote-tracking branch 'origin/master'

Showing 15 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.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/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java

...	...	@@ -63,6 +63,10 @@
63	63	iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel);
64	64	}
65	65
	66	+ public int queryCount(ReferralApplyOrderQuery babyQuery){
	67	+ return iReferralApplyOrderDao.count(babyQuery.convertToQuery());
	68	+ }
	69	+
66	70	public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) {
67	71	iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(), orderModel);
68	72	}

...	...	@@ -9,7 +9,9 @@
9	9	import org.apache.commons.collections.CollectionUtils;
10	10	import org.slf4j.Logger;
11	11	import org.slf4j.LoggerFactory;
	12	+import org.springframework.data.mongodb.core.query.Criteria;
12	13
	14	+import java.util.Date;
13	15	import java.util.List;
14	16
15	17
16	18
...	...	@@ -36,7 +38,32 @@
36	38	private String parentId;
37	39	private List<String> pids;
38	40	private String hospitalId;
	41	+ /**
	42	+ * 末次月经
	43	+ */
	44	+ private Date lastMensesStart;
39	45
	46	+ /**
	47	+ * 末次月经
	48	+ */
	49	+ private Date lastMensesEnd;
	50	+
	51	+ public Date getLastMensesStart() {
	52	+ return lastMensesStart;
	53	+ }
	54	+
	55	+ public void setLastMensesStart(Date lastMensesStart) {
	56	+ this.lastMensesStart = lastMensesStart;
	57	+ }
	58	+
	59	+ public Date getLastMensesEnd() {
	60	+ return lastMensesEnd;
	61	+ }
	62	+
	63	+ public void setLastMensesEnd(Date lastMensesEnd) {
	64	+ this.lastMensesEnd = lastMensesEnd;
	65	+ }
	66	+
40	67	public String getHospitalId() {
41	68	return hospitalId;
42	69	}
...	...	@@ -134,6 +161,24 @@
134	161	}
135	162	if (null != pids) {
136	163	condition = condition.and("pid", pids, MongoOper.IN);
	164	+ }
	165	+ Criteria c1 = null;
	166	+ if (null != lastMensesStart) {
	167	+ if (null != c1) {
	168	+ c1 = c1.and("lastMenses").gte(lastMensesStart);
	169	+ } else {
	170	+ c1 = Criteria.where("lastMenses").gte(lastMensesStart);
	171	+ }
	172	+ }
	173	+ if (null != lastMensesEnd) {
	174	+ if (c1 != null) {
	175	+ c1 = c1.lte(lastMensesEnd);
	176	+ } else {
	177	+ c1 = Criteria.where("lastMenses").lte(lastMensesEnd);
	178	+ }
	179	+ }
	180	+ if (null != c1) {
	181	+ condition = condition.andCondition(new MongoCondition(c1));
137	182	}
138	183	return condition.toMongoQuery();
139	184	}

...	...	@@ -1196,7 +1196,7 @@
1196	1196	} catch (Exception e) {
1197	1197	ERROR_LOGGER.error("convert high risk error." + list2, e);
1198	1198	}
1199		- if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
	1199	+ if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
1200	1200	String otherHighRisk = antExChuModel.getOtherHighRisk();
1201	1201	List<Map> otherHighRisks = new ArrayList<>();
1202	1202	if (otherHighRisk.startsWith("[") && otherHighRisk.endsWith("]")) {

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.common.utils.JsonUtil;
16	16	import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
17	17	import com.lyms.platform.operate.web.facade.BabyCheckFacade;
	18	+import com.lyms.platform.operate.web.facade.HosptialHighRiskFacade;
18	19	import com.lyms.platform.operate.web.facade.SieveFacade;
19	20	import com.lyms.platform.operate.web.result.HighScoreResult;
20	21	import com.lyms.platform.operate.web.service.IBloodPressureService;
21	22
...	...	@@ -130,7 +131,9 @@
130	131
131	132	static {
132	133	highRisks.put("f3a1c08f-a2c1-4e93-8ffd-398af9e2d8c9", "5a40c763422b03d4ad2bf7c1"); // 流产≥2次---------> 不良孕产史（各类流产≥3次、早产、围产儿死亡、出生缺陷、异位妊娠、滋养细胞疾病等）
	134	+ highRisks.put("1d23ecbb-8e30-4c56-b6fb-bdcb23a55206", "5a40c763422b03d4ad2bf7c1"); // 不良孕产史---------> 不良孕产史（各类流产≥3次、早产、围产儿死亡、出生缺陷、异位妊娠、滋养细胞疾病等）
133	135	highRisks.put("ee3ba99e-64c0-4aab-b0a4-71dec0d61ca6", "5a40c772422b03d4ad2bf7c4"); //人工受精------->辅助生殖妊娠
	136	+ highRisks.put("134a92a6-1a2d-42d8-b9e9-e824cabbe5f2", "5a40c772422b03d4ad2bf7c4"); //IVF------->辅助生殖妊娠
134	137	highRisks.put("a8094bd6-de5d-4b95-9a1a-59ae376bb2a6", "9310676a-9482-4da5-9ba8-e2a302843ea0"); //高血压------> 妊娠期高血压疾病（除外红、橙色）
135	138	highRisks.put("3be742b2-ed07-425e-a435-8a19fc8ba86e", "52986b9e-5a44-4613-9af5-07564f15b703"); //臀位 -------->≥36周胎位不正
136	139	highRisks.put("cbeb4447-f4cb-4c2e-96f3-973a0c701fc3", "8856c4da-57e3-42af-820a-25c991dde3f0"); //BMI≥32------>BMI≥28
...	...	@@ -140,7 +143,8 @@
140	143	highRisks.put("5cba13c2-5cb5-46c9-905a-41708d13d45e", "d6cfcad8-c674-4624-b50d-8797d217f10c"); //糖尿病并发心脏病 ----糖尿病并发肾病V级、严重心血管病、增生性视网膜病变或玻璃体出血、周围神经病变等
141	144	highRisks.put("0b51b328-1c8f-41de-90de-ef3b76341c1b", "d6cfcad8-c674-4624-b50d-8797d217f10c"); //糖尿病并发蛋白尿 ----糖尿病并发肾病V级、严重心血管病、增生性视网膜病变或玻璃体出血、周围神经病变等
142	145	highRisks.put("80587d8a-009e-46aa-87e5-57996b0708b1", "d6cfcad8-c674-4624-b50d-8797d217f10c"); //糖尿病并发肾功能不全 ---糖尿病并发肾病V级、严重心血管病、增生性视网膜病变或玻璃体出血、周围神经病变等
143		-
	146	+ highRisks.put("f50206fe-5fe4-4831-be7b-506ab0b458ed", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
	147	+ highRisks.put("e04d5364-11da-45f6-9801-c50ad5eb6f27", "63347e70-4a74-4bc9-bad6-0c0cf1b2fd89"); //严重心律失常 ---严重心血管系统疾病
144	148	}
145	149
146	150	@ResponseBody
...	...	@@ -247,7 +251,7 @@
247	251	int batchSize = 1000;
248	252	if (patientCount > 100000) {
249	253	batchSize = 30000;
250		- }else if(patientCount > 10000){
	254	+ } else if (patientCount > 10000) {
251	255	batchSize = 10000;
252	256	}
253	257
254	258
...	...	@@ -1471,8 +1475,9 @@
1471	1475
1472	1476	@Autowired
1473	1477	private SieveFacade sieveFacade;
	1478	+ @Autowired
	1479	+ private AntenatalExaminationFacade atFacade;
1474	1480
1475		-
1476	1481	/**
1477	1482	* 更新新版高危因素
1478	1483	*
1479	1484
...	...	@@ -1517,11 +1522,19 @@
1517	1522	public void run() {
1518	1523	if (CollectionUtils.isNotEmpty(tempList)) {
1519	1524	for (Patients pat : tempList) {
1520		- List<String> patientRisk = pat.getRiskFactorId();
	1525	+ List<String> patientRisk = null;
	1526	+ if (StringUtils.isNotEmpty(pat.getPid())) {
	1527	+ atFacade.updateLastRisk(pat.getId());
	1528	+ }
	1529	+ Patients loa = patientsService.findOnePatientById(pat.getId());
	1530	+ patientRisk = loa
	1531	+ .getRiskFactorId();
	1532	+
1521	1533	if (CollectionUtils.isNotEmpty(patientRisk)) {
1522	1534	int modCount = doRiskHandle(patientRisk);
1523	1535	if (modCount > 0) {
1524	1536	pat.setRiskFactorId(patientRisk);
	1537	+
1525	1538	patientsService.updatePatient(pat);
1526	1539	}
1527	1540	}
...	...	@@ -1596,6 +1609,22 @@
1596	1609	}
1597	1610
1598	1611	antExRecordModels.clear();
	1612	+
	1613	+ ReferralApplyOrderQuery applyOrderQuery = new ReferralApplyOrderQuery();
	1614	+ applyOrderQuery.setParentId(pat.getId());
	1615	+ if (applyOrderService.queryCount(applyOrderQuery) > 0) {
	1616	+ ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
	1617	+ referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(",")));
	1618	+ referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor());
	1619	+ List<String> rlevel=Collections.emptyList();
	1620	+ if(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())){
	1621	+ rlevel= JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class);
	1622	+ HashSet set =new HashSet(rlevel);
	1623	+ rlevel=new ArrayList<String>(set);
	1624	+ }
	1625	+ referralApplyOrderModel.setrLevel(rlevel);
	1626	+ applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel);
	1627	+ }
1599	1628	}
1600	1629	}
1601	1630	}
...	...	@@ -1606,6 +1635,11 @@
1606	1635	}
1607	1636	return "upateNewHighRisk finish";
1608	1637	}
	1638	+
	1639	+ @Autowired
	1640	+ private CommonService commonService;
	1641	+ @Autowired
	1642	+ private ApplyOrderService applyOrderService;
1609	1643
1610	1644	private int doRiskHandle(List<String> patientRisk) {
1611	1645	int modCount = 0;

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.biz.SequenceConstant;
5	5	import com.lyms.platform.biz.service.*;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
	7	+import com.lyms.platform.common.dao.operator.MongoQuery;
7	8	import com.lyms.platform.common.enums.OptActionEnums;
8	9	import com.lyms.platform.common.enums.QuickenEnums;
9	10	import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
...	...	@@ -662,7 +663,7 @@
662	663	patients.setLastRhTime(antExChuModel.getCheckTime());
663	664	hasLast = true;
664	665	break;
665		- } else if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk())&& !"[]".equals(antExChuModel.getOtherHighRisk())) {
	666	+ } else if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
666	667	patients.setLastRhTime(antExChuModel.getCheckTime());
667	668	hasLast = true;
668	669	break;
...	...	@@ -679,7 +680,8 @@
679	680	* 获取最后一次高危产检的高危信息
680	681	* <p/>
681	682	* 先取复诊最后一条，在取初诊
682		- *@param needLevel --true需要查询高危等级
	683	+ *
	684	+ * @param needLevel --true需要查询高危等级
683	685	* @return
684	686	*/
685	687	public HighScoreResult findLastRisk(String pid, boolean needLevel) {
686	688
687	689
688	690
...	...	@@ -784,17 +786,17 @@
784	786	for (Map<String, Object> map : listMap) {
785	787	Object fxysu = map.get("fxysu").toString();
786	788	if (fxysu != null) {
787		- otherRisk.append(fxysu+",");
	789	+ otherRisk.append(fxysu + ",");
788	790	}
789		- score+=NumberUtils.toInt(map.get("score").toString());
	791	+ score += NumberUtils.toInt(map.get("score").toString());
790	792
791	793	highScoreResult.getLevel().add(map);
792	794	}
793		- if(StringUtils.isNotEmpty(otherRisk.toString())){
	795	+ if (StringUtils.isNotEmpty(otherRisk.toString())) {
794	796	highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
795	797	}
796		- highScoreResult.setScore(highScoreResult.getScore()+score);
797		-
	798	+ highScoreResult.setScore(highScoreResult.getScore() + score);
	799	+ highScoreResult.setHighriskDesc(model.getHighriskDesc());
798	800	highScoreResult.getHighRisk().addAll(listMap);
799	801	} else {
800	802	continue;
...	...	@@ -814,7 +816,11 @@
814	816	antExChuQuery.setEnd(date);
815	817	}
816	818	antExChuQuery.setYn(YnEnums.YES.getId());
817		- List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(antExChuQuery);
	819	+
	820	+
	821	+ MongoQuery mongoQuery = antExChuQuery.convertToQuery();
	822	+ mongoQuery.addOrder(Sort.Direction.DESC, "checkTime");
	823	+ List<AntExChuModel> list1 = antenatalExaminationService.queryAntExChu(mongoQuery);
818	824	if (CollectionUtils.isNotEmpty(list1)) {
819	825	for (AntExChuModel antExChuModel : list1) {
820	826	if (!next) {
821	827
822	828
823	829
...	...	@@ -835,16 +841,17 @@
835	841	for (Map<String, Object> map : listMap) {
836	842	Object fxysu = map.get("fxysu").toString();
837	843	if (fxysu != null) {
838		- otherRisk.append(fxysu+",");
	844	+ otherRisk.append(fxysu + ",");
839	845	}
840		- score+=NumberUtils.toInt(map.get("score").toString(),0);
	846	+ score += NumberUtils.toInt(map.get("score").toString(), 0);
841	847
842	848	highScoreResult.getLevel().add(map);
843	849	}
844		- highScoreResult.setScore(highScoreResult.getScore()+score);
845		- if(StringUtils.isNotEmpty(otherRisk.toString())){
	850	+ highScoreResult.setScore(highScoreResult.getScore() + score);
	851	+ if (StringUtils.isNotEmpty(otherRisk.toString())) {
846	852	highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
847	853	}
	854	+ highScoreResult.setHighriskDesc(antExChuModel.getHighriskDesc());
848	855	highScoreResult.getHighRisk().addAll(listMap);
849	856	next = false;
850	857	}
...	...	@@ -854,6 +861,7 @@
854	861	} catch (Exception e) {
855	862	e.printStackTrace();
856	863	}
	864	+ highScoreResult.setLevel(HighScoreResult.filter(highScoreResult.getLevel()));
857	865	return highScoreResult;
858	866	}
859	867
...	...	@@ -1442,7 +1450,7 @@
1442	1450	if (patients != null) {
1443	1451	HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
1444	1452	highRisk = highScoreResult.getHighRisk();
1445		- highriskDesc = highScoreResult.getHighriskDesc();
	1453	+ highriskDesc = highScoreResult.getHighriskDesc();
1446	1454	}
1447	1455
1448	1456	return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc);
1449	1457
...	...	@@ -1755,9 +1763,11 @@
1755	1763	HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
1756	1764	patients1.setRiskScore(highScoreResult.getScore());
1757	1765	patients1.setRiskFactorId(highScoreResult.getHighId());
1758		- patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId()));
	1766	+
	1767	+ HashSet set = new HashSet(highScoreResult.getLevelId());
	1768	+ patients1.setRiskLevelId(JsonUtil.array2JsonString(new ArrayList<String>(set)));
1759	1769	//设置其他的高危因素
1760		- patients1.setoRiskFactor(highScoreResult.getOtherRisk());
	1770	+ patients1.setoRiskFactor(StringUtils.isNotEmpty(highScoreResult.getOtherRisk()) ? highScoreResult.getOtherRisk() : "");
1761	1771	patientsService.findAndModify(patientsQuery1, patients1);
1762	1772	}
1763	1773
1764	1774
1765	1775
...	...	@@ -2280,11 +2290,11 @@
2280	2290	String name = bc.getName();
2281	2291	if (name.indexOf("黄色") > -1) {
2282	2292	name = "黄色";
2283		- }else if (name.indexOf("橙色") > -1) {
	2293	+ } else if (name.indexOf("橙色") > -1) {
2284	2294	name = "橙色";
2285		- }else if (name.indexOf("红色") > -1) {
	2295	+ } else if (name.indexOf("红色") > -1) {
2286	2296	name = "红色";
2287		- }else if (name.indexOf("紫色") > -1) {
	2297	+ } else if (name.indexOf("紫色") > -1) {
2288	2298	name = "紫色";
2289	2299	}
2290	2300	map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));

...	...	@@ -7,9 +7,7 @@
7	7	import com.lyms.platform.common.result.BaseListResponse;
8	8	import com.lyms.platform.common.result.BaseObjectResponse;
9	9	import com.lyms.platform.common.result.BaseResponse;
10		-import com.lyms.platform.common.utils.DateUtil;
11		-import com.lyms.platform.common.utils.ExcelUtil;
12		-import com.lyms.platform.common.utils.SystemConfig;
	10	+import com.lyms.platform.common.utils.*;
13	11	import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
14	12	import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
15	13	import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
...	...	@@ -70,6 +68,8 @@
70	68
71	69	@Autowired
72	70	private OperateLogFacade operateLogFacade;
	71	+ @Autowired
	72	+ private CommonService commonService;
73	73
74	74	/**
75	75	* 增加转诊申请
...	...	@@ -137,10 +137,17 @@
137	137	days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
138	138	}
139	139	referralApplyOrderModel.setLastMenses(patients.getLastMenses());
140		- HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
141		- referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList());
142		- referralApplyOrderModel.setScore(highScoreResult.getScore());
143		- List lsit = new ArrayList();
	140	+ referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(patients.getRiskFactorId()).split(",")));
	141	+ referralApplyOrderModel.setOtherHighRisk(patients.getoRiskFactor());
	142	+ List<String> rlevel=Collections.emptyList();
	143	+ if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
	144	+ rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
	145	+ HashSet set =new HashSet(rlevel);
	146	+ rlevel=new ArrayList<String>(set);
	147	+ }
	148	+ referralApplyOrderModel.setrLevel(rlevel);
	149	+ referralApplyOrderModel.setScore(patients.getRiskScore());
	150	+ /* List lsit = new ArrayList();
144	151	List<Map> list = highScoreResult.filter(highScoreResult.getLevel());
145	152	for (Map<String, String> map : list) {
146	153	String name = map.get("name");
...	...	@@ -148,7 +155,7 @@
148	155	lsit.add(name);
149	156	}
150	157	}
151		- referralApplyOrderModel.setrLevel(lsit);
	158	+ referralApplyOrderModel.setrLevel(lsit);*/
152	159	referralApplyOrderModel.setPid(patients.getPid());
153	160	referralApplyOrderModel.setDueWeek(new Date());
154	161	days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
...	...	@@ -185,7 +192,7 @@
185	192	patients.setExpVip(0);
186	193	patients.setEnable("0");
187	194	id = patientsService.addPatient(patients).getId();
188		- operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊");
	195	+ operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊");
189	196	} else {
190	197	Patients patients1 = patientsList.get(0);
191	198	id = patients1.getId();
...	...	@@ -262,7 +269,7 @@
262	269	babyModel.setEnable("0");
263	270	id = babyService.addOneBaby(babyModel).getId();
264	271
265		- operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),babyModel,OptActionEnums.ADD.getId(),"添加儿童转诊");
	272	+ operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), babyModel, OptActionEnums.ADD.getId(), "添加儿童转诊");
266	273	} else {
267	274	BabyModel babyModel1 = babyModels.get(0);
268	275	id = babyModel1.getId();
269	276
...	...	@@ -372,9 +379,9 @@
372	379	sieveApplyOrderModel1.setStatus(1);
373	380	SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
374	381	sieveApplyOrderQuery2.setId(str);
375		- List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
	382	+ List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
376	383	applyOrderService.updateSieve(sieveApplyOrderModel1);
377		- operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
	384	+ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
378	385	}
379	386	}
380	387	SieveQuery sieveQuery = new SieveQuery();
...	...	@@ -766,7 +773,6 @@
766	773	zhuanCName = zhuanc.getName();
767	774	}
768	775	} catch (Exception e) {
769		-
770	776	}
771	777	}
772	778	if (NumberUtils.isNumber(zhuanru)) {
...	...	@@ -776,7 +782,6 @@
776	782	zhuanRname = zhuanc1.getName();
777	783	}
778	784	} catch (Exception e) {
779		-
780	785	}
781	786	}
782	787
...	...	@@ -792,16 +797,6 @@
792	797	applyOrderResult.setRecDoctor(users.getName());
793	798	}
794	799	}
795		- /*HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
796		- StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr());
797		- if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
798		- if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
799		- stringBuilder.append(",");
800		- }
801		- if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
802		- stringBuilder.append(orderModel.getOtherHighRisk());
803		- }
804		- }*/
805	800
806	801	StringBuilder stringBuilder = new StringBuilder();
807	802	if (CollectionUtils.isNotEmpty(orderModel.getrRisk())) {
808	803
809	804
810	805
811	806
812	807
...	...	@@ -813,29 +808,41 @@
813	808	}
814	809	}
815	810
	811	+ if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
	812	+ if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
	813	+ stringBuilder.append(",");
	814	+ }
	815	+ if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
	816	+ stringBuilder.append(orderModel.getOtherHighRisk());
	817	+ }
	818	+ }
	819	+
816	820	applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
817	821	applyOrderResult.setrRisk(stringBuilder.toString());
818	822	applyOrderResult.setScore(orderModel.getScore());
819	823
820		-
821	824	List rLevel = new ArrayList();
822	825	if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
823		- for (String str : orderModel.getrLevel()) {
824		- Map map1 = new HashMap();
825		- map1.put("id", "");
826		- if (str.indexOf("预警") > -1) {
827		- str = str.replace("预警", "");
	826	+ try {
	827	+ List<String> list = orderModel.getrLevel();
	828	+ for (String str : list) {
	829	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
	830	+ if (null != basicConfig) {
	831	+ Map map = new HashMap();
	832	+ basicConfig.replenRisk(map);
	833	+ rLevel.add(map);
	834	+ }
828	835	}
829		- map1.put("name", str);
830		- map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str));
831		- rLevel.add(map1);
	836	+ } catch (Exception e) {
	837	+ ExceptionUtils.catchException(e, "patients.getRiskLevelId error.");
832	838	}
	839	+ applyOrderResult.setrLevel(HighScoreResult.filter(rLevel));
833	840	}
834	841	applyOrderResult.setrLevel(rLevel);
835	842	Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
836	843
837	844	if (null != patients) {
838		- applyOrderResult.setIsGravida(patients.getType()==3?"0":"1");
	845	+ applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1");
839	846	if (1 == patients.getDueStatus())
840	847	applyOrderResult.setcDueWeek("终止妊娠");
841	848	else if (patients.getType() == 3)

...	...	@@ -415,6 +415,13 @@
415	415	result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
416	416	//高危因素
417	417	result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId()));
	418	+
	419	+ if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
	420	+ result.setRiskFactor(result.getRiskFactor() + "," + patients.getoRiskFactor());
	421	+ }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor()))
	422	+ {
	423	+ result.setRiskFactor(patients.getoRiskFactor());
	424	+ }
418	425	//高危等级颜色
419	426	result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId()));
420	427	}else{

...	...	@@ -191,7 +191,16 @@
191	191	data.put("certeTypeId", patients.getPcerteTypeId());
192	192	data.put("status", null == tmp.getNow() ? "" : getTempStatus(Double.valueOf(tmp.getNow())));
193	193	data.put("level", commonService.findRiskLevel(patients.getRiskLevelId()));
194		- data.put("rFactor", commonService.resloveFactor(patients.getRiskFactorId()));
	194	+ String rFactor = commonService.resloveFactor(patients.getRiskFactorId());
	195	+ if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor()))
	196	+ {
	197	+ if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)){
	198	+ rFactor+=","+patients.getoRiskFactor();
	199	+ }else{
	200	+ rFactor = patients.getoRiskFactor();
	201	+ }
	202	+ }
	203	+ data.put("rFactor", rFactor); // 高危因素
195	204	data.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
196	205	dataList.add(data);
197	206	}

...	...	@@ -76,6 +76,7 @@
76	76	trackDownTypeHandlerMap.put(TrackDownDateEnums.A.getId(), new FQTrackDownTypeHandler());
77	77	trackDownTypeHandlerMap.put(TrackDownDateEnums.B.getId(), new FQTrackDownTypeHandler());
78	78	trackDownTypeHandlerMap.put(TrackDownDateEnums.C.getId(), new CJTrackDownTypeHandler());
	79	+ trackDownTypeHandlerMap.put(TrackDownDateEnums.D.getId(), new CJTrackDownTypeHandler());
79	80	}
80	81
81	82	/**
...	...	@@ -91,6 +92,11 @@
91	92	downRecordQuery.setCityId(downQueryRequest.getCityId());
92	93	downRecordQuery.setStreetId(downQueryRequest.getStreetId());
93	94	downRecordQuery.setTrackType(downQueryRequest.getTrackType());
	95	+ //如果是产筛请求
	96	+ if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){
	97	+ downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
	98	+ downRecordQuery.setTrackType(3);
	99	+ }
94	100	downRecordQuery.setPage(downQueryRequest.getPage());
95	101	downRecordQuery.setLimit(downQueryRequest.getLimit());
96	102	downRecordQuery.setNeed("1");
...	...	@@ -258,7 +264,9 @@
258	264	temp.put("id", downRecord.getId());
259	265	temp.put("parentId", downRecord.getParentId());
260	266	// temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate()));
261		-// temp.put("week", DateUtil.getWeekDesc(patient.getLastMenses(), new Date())); /** 孕周 */
	267	+ if(null!=downRecord.getLastMenses()){
	268	+ temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */
	269	+ }
262	270	temp.put("cjDate", ""); /** 产检日期 */
263	271	temp.put("yycjDate", ""); /** 预约产检日期 */
264	272	temp.put("cjzfDate", ""); /** 产检追访时间 */

...	...	@@ -392,6 +392,8 @@
392	392	examinationModel.setRiskScore(riskScore);
393	393	if(CollectionUtils.isNotEmpty(otherRisk)){
394	394	examinationModel.setOtherRisk(JsonUtil.array2JsonString(otherRisk));
	395	+ }else{
	396	+ examinationModel.setOtherRisk("{}");
395	397	}
396	398	if(null!=diagnosis){
397	399	examinationModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	import com.lyms.platform.common.utils.StringUtils;
	4	+import org.apache.commons.collections.CollectionUtils;
4	5
5	6	import java.util.ArrayList;
6	7	import java.util.Collections;
7	8
...	...	@@ -51,12 +52,15 @@
51	52	public static List filter(List<java.util.Map> level){
52	53	List list = new ArrayList();
53	54	List addEdList = new ArrayList();
54		- for(java.util.Map map :level){
55		- if(!addEdList.contains(map.get("name"))){
56		- list.add(map);
57		- addEdList.add(map.get("name"));
	55	+ if(CollectionUtils.isNotEmpty(level)){
	56	+ for(java.util.Map map :level){
	57	+ if(!addEdList.contains(map.get("name"))){
	58	+ list.add(map);
	59	+ addEdList.add(map.get("name"));
	60	+ }
58	61	}
59	62	}
	63	+
60	64	return list;
61	65	}
62	66
63	67
...	...	@@ -91,8 +95,12 @@
91	95	for (int i1 = 0; i1 < level.size(); i1++) {
92	96	java.util.Map<String, String> map = (java.util.Map<String, String>) level.get(i1);
93	97	String name = map.get("id");
	98	+ String fyyse= map.get("fyyse");
94	99	if (StringUtils.isNotEmpty(name)) {
95	100	idList.add(name);
	101	+ }
	102	+ if(StringUtils.isNotEmpty(fyyse)){
	103	+ idList.add(fyyse);
96	104	}
97	105	}
98	106	return idList;

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
3	5	import java.util.List;
4	6	import java.util.Map;
5	7
...	...	@@ -184,6 +186,9 @@
184	186	}
185	187
186	188	public String getRiskFactor() {
	189	+ if(StringUtils.isEmpty(riskFactor)){
	190	+ return "-";
	191	+ }
187	192	return riskFactor;
188	193	}
189	194

...	...	@@ -148,7 +148,18 @@
148	148	temp.put("age", DateUtil.getAge(p.getBirth()));
149	149	temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
150	150	temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
151		- temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
	151	+
	152	+ String rFactor = commonService.resloveFactor(p.getRiskFactorId());
	153	+ if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
	154	+ {
	155	+ if(StringUtils.isNotEmpty(rFactor)){
	156	+ rFactor+=","+p.getoRiskFactor();
	157	+ }else{
	158	+ rFactor = p.getoRiskFactor();
	159	+ }
	160	+ }
	161	+ temp.put("riskFactor", rFactor); // 高危因素
	162	+
152	163	temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
153	164	temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg");
154	165	temp.put("pulse", bloodPressure.getPulse());

...	...	@@ -102,7 +102,16 @@
102	102	temp.put("age", DateUtil.getAge(p.getBirth()));
103	103	temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
104	104	temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
105		- temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
	105	+ String rFactor = commonService.resloveFactor(p.getRiskFactorId());
	106	+ if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor()))
	107	+ {
	108	+ if(StringUtils.isNotEmpty(rFactor)){
	109	+ rFactor+=","+p.getoRiskFactor();
	110	+ }else{
	111	+ rFactor = p.getoRiskFactor();
	112	+ }
	113	+ }
	114	+ temp.put("riskFactor", rFactor); // 高危因素
106	115	temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
107	116	temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L");
108	117	temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));

...	...	@@ -428,18 +428,10 @@
428	428
429	429
430	430	public static void main(String[] str) {
431		-// String ssss = "{\"qztp\":true,\"yesOrNo\":\"no\",\"tpzb\":true,\"zxqqz\":true,\"zxqqq\":true,\"tpzl\":true," +
432		-// "\"zxmxgxybfzxqq\":true,\"chcx\":true,\"rshbmxgxy\":true,\"tmzp\":true,\"rsqgxy\":true,\"qt\":false,\"qtText\":\"11\"}";
433		-//
434		-// Map m = JsonUtil.str2Obj(ssss,Map.class);
435		-//
436		-// String a = replace(m);
437		-// System.out.print("哈哈.................... " + a);
438		-
439		-// String s = "{\"qt\":true,\"jsjmj\":true,\"ydqjd\":\"5769ef930cf2d37f03479390\",\"qtText\":\"其他\",\"yesOrNO\":\"yes\",\"dc\":true}";
440		-// Map m = JsonUtil.str2Obj(s,Map.class);
441		-// String a = replaceYDFMW(m,1);
442		-
	431	+ List<Map<String, Object>> listMap = new ArrayList<>();
	432	+ String s="[{\"fxpf\":\"5769f0640cf2d37f034793a2\",\"fxysu\":\"色盲遗传史\",\"fyyse\":\"315107bd-91fe-42a1-9237-752f3c046a40\",\"score\":5,\"color\":\"risk_yellow\",\"otherId\":\"5a531d6bc07dbb92526b3566\"},{\"fxpf\":\"5769f0640cf2d37f034793a3\",\"fxysu\":\"阿斯顿发送到\",\"fyyse\":\"224b2329-cb82-4da3-a071-8527f8283aab\",\"score\":10,\"color\":\"risk_purple\",\"otherId\":\"5a531d6ac07dbb92526b3556\"}]";
	433	+ ResolveUtils.queryOtherRisk(s, listMap);
	434	+ System.out.println(listMap);
443	435	}
444	436
445	437	}