jiangjiazhi / regional-platform

Browse Code »

Commit 61ac35020ce60854f08038c201c075853fe1e4a3

Authored by liquanyu about 3 years ago

Committed by liquanyu about 3 years ago

1 parent d20c3f7ebb

Exists in master and in 6 other branches

隆化妇幼需求

Showing 6 changed files with 82 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java

...	...	@@ -31,7 +31,7 @@
31	31
32	32
33	33	/**
34		- * 添加/修改检查
	34	+ * 添加/修改检查queryAllBabyListPage
35	35	* @param babyCheck
36	36	* @param request
37	37	* @return
...	...	@@ -47,7 +47,7 @@
47	47	/**
48	48	* 删除检查
49	49	* @param id
50		- * @return
	50	+ * @return
51	51	*/
52	52	@ResponseBody
53	53	@TokenRequired

...	...	@@ -389,8 +389,6 @@
389	389	}
390	390	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
391	391	}
392		-
393		-
394	392	/**
395	393	* 儿童检查上传患者签名
396	394	* @Author: 武涛涛

...	...	@@ -128,7 +128,9 @@
128	128	Map<String, List<BasicConfig>> slaveBasicConfigMap = new HashMap<>();
129	129	for (BasicConfig bc : basicConfigList) {
130	130	bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId()));
131		-
	131	+ if (bc.getParentId().equals("fb43fd5a-b153-4cb9-9180-c46f5612ba43")) {
	132	+ bc.setColor("risk_" + RiskDefaultTypeEnum.getColor(bc.getName()));
	133	+ }
132	134	if (bc.getpId() != null) {
133	135	if (slaveBasicConfigMap.containsKey(bc.getpId())) {
134	136	slaveBasicConfigMap.get(bc.getpId()).add(bc);

...	...	@@ -75,7 +75,7 @@
75	75	(Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8>babyCheck.getLhsljcstRight()) \|\|
76	76	("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6>babyCheck.getLhsljcstLeft()) \|\|
77	77	(Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8>babyCheck.getLhsljcstLeft()) \|\|
78		- "2".equals(babyCheck.getLhsldcRight()) \|\| "2".equals(babyCheck.getLhsldcLeft()) \|\| (Boolean) dioptricAnomaly(babyCheck).get("state")
	78	+ "2".equals(babyCheck.getLhsldcRight()) \|\| "2".equals(babyCheck.getLhsldcLeft()) \|\| (Boolean) dioptricAnomalyState(babyCheck).get("state")
79	79
80	80	){
81	81	babyCheck.setPositiveType("2");
...	...	@@ -412,7 +412,7 @@
412	412	if("2".equals(babyCheck.getLhsldcLeft())){
413	413	abnormal+="视力低常（左）;";
414	414	}
415		- if((Boolean) dioptricAnomaly(babyCheck).get("state")){
	415	+ if((Boolean) dioptricAnomalyState(babyCheck).get("state")){
416	416	abnormal+="屈光筛查";
417	417	}
418	418
419	419
420	420
421	421
422	422
...	...	@@ -434,27 +434,71 @@
434	434	(Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > babyCheck.getLhsljcstLeft())){
435	435	abnormalInfo+="视力检查（左）:"+babyCheck.getLhsljcstLeft()+";";
436	436	}
437		- Map map=dioptricAnomaly(babyCheck);
	437	+ Map map=dioptricAnomalyState(babyCheck);
438	438	if((Boolean) map.get("state")){
439	439	abnormalInfo+="屈光异常值:"+map.get("value");
	440	+ }else{
	441	+ abnormalInfo+="无";
440	442	}
441	443
442	444	return abnormalInfo;
443	445	}
444	446
	447	+
445	448	/**
446	449	* 是否屈光异常
447	450	* @param babyCheck
448	451	* @return
449	452	*/
	453	+ public Map<String,Object> dioptricAnomalyState(LhBabyEyeCheck babyCheck){
	454	+ Map<String,Object> map=new HashMap<>();
	455	+ map.put("state",false);
	456	+ map.put("value","");
	457	+ //6月-1岁
	458	+ if(babyCheck.getLhdsr()!="" && babyCheck.getLhdsl()!="" &&babyCheck.getLhdcr()!="" && babyCheck.getLhdcl()!="" &&
	459	+ babyCheck.getLhdsr()!=null && babyCheck.getLhdsl()!=null &&babyCheck.getLhdcr()!=null && babyCheck.getLhdcl()!=null) {
	460	+ if (NumberUtils.isNumber(babyCheck.getLhdsr())) {
	461	+ if (1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) \|\| -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) \|\|
	462	+ 1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) \|\|
	463	+ -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))) {
	464	+ map.put("state", true);
	465	+ map.put("value", "散光异常");
	466	+ }
	467	+ }
	468	+ if (NumberUtils.isNumber(babyCheck.getLhdsl())) {
	469	+ if (3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) \|\| 3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) {
	470	+// if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){
	471	+ map.put("state", true);
	472	+// map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";");
	473	+ map.put("value", map.get("value") + "远视异常");
	474	+ }
	475	+ }
	476	+ if (NumberUtils.isNumber(babyCheck.getLhdcl())) {
	477	+ if (Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) < -0.5d \|\| Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) < -0.5d) {
	478	+ map.put("state", true);
	479	+ map.put("value", map.get("value") + "近视异常");
	480	+ }
	481	+ }
	482	+ return map;
	483	+ }else{
	484	+ map.put("state", false);
	485	+ map.put("value", null);
	486	+ return map;
	487	+ }
	488	+ }
	489	+ /**
	490	+ * 是否屈光异常
	491	+ * @param babyCheck
	492	+ * @return
	493	+ */
450	494	public Map<String,Object> dioptricAnomaly(LhBabyEyeCheck babyCheck){
451	495	Map<String,Object> map=new HashMap<>();
452	496	map.put("state",false);
453	497	map.put("value","");
454	498	//6月-1岁
455	499	if(Arrays.asList("6","8","12").contains(babyCheck.getCheckMonthId())){
456		- if(NumberUtils.isNumber(babyCheck.getLhdsr())){
457		- if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){
	500	+
	501	+ if(2.5d>=Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){
458	502	map.put("state",true);
459	503	map.put("value","DS-R:"+babyCheck.getLhdsr()+";");
460	504	}
461	505
...	...	@@ -473,15 +517,15 @@
473	517	}
474	518	}
475	519	if(NumberUtils.isNumber(babyCheck.getLhdcl())){
476		- if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) \|\|
	520	+ if(-0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) \|\|
477	521	0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))){
478	522	map.put("state",true);
479	523	map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";");
480	524	}
481	525	}
482	526
483		- }
484		- //2-3岁
	527	+
	528	+// 2-3岁
485	529	if(Arrays.asList("24","30","36").contains(babyCheck.getCheckMonthId())) {
486	530	if (NumberUtils.isNumber(babyCheck.getLhdsr())) {
487	531	if (2.0d > Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) {

...	...	@@ -2686,6 +2686,8 @@
2686	2686	patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge()));
2687	2687	patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7);
2688	2688	patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7);
	2689	+ patientsQuery.setBuildDaysStart(StringUtils.isEmpty(childbirthManagerRequest.getStartBuildWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartBuildWeek()) * 7);
	2690	+ patientsQuery.setBuildDaysEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndBuildWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndBuildWeek()) * 7);
2689	2691	// 分娩方式去另外一张表查
2690	2692	patientsQuery.setDesc("fmDate");
2691	2693	patientsQuery.setSort("fmDate");

...	...	@@ -160,6 +160,13 @@
160	160	*/
161	161	private String endDueWeek;
162	162
	163	+ /*建档孕周start
	164	+ * */
	165	+ private String startBuildWeek;
	166	+
	167	+ /建档孕周end/
	168	+ private String endBuildWeek;
	169	+
163	170	/**
164	171	* 出血量：
165	172	* 顺产：1-产后2小时出血≥300ml、2-产后24小时出血＜500ml、3-产后24小时出血≥500ml
...	...	@@ -196,6 +203,22 @@
196	203	private String yyzyfmHospitalId;
197	204	//建档医院id
198	205	private String firstHospitalId;
	206	+
	207	+ public String getStartBuildWeek() {
	208	+ return startBuildWeek;
	209	+ }
	210	+
	211	+ public void setStartBuildWeek(String startBuildWeek) {
	212	+ this.startBuildWeek = startBuildWeek;
	213	+ }
	214	+
	215	+ public String getEndBuildWeek() {
	216	+ return endBuildWeek;
	217	+ }
	218	+
	219	+ public void setEndBuildWeek(String endBuildWeek) {
	220	+ this.endBuildWeek = endBuildWeek;
	221	+ }
199	222
200	223	public String getYyzyfmHospitalId() {
201	224	return yyzyfmHospitalId;