jiangjiazhi / regional-platform

Commit bd77f63baa43afeda812cb14b2a8d475f9215753

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 6 changed files with 88 additions and 57 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBirth.xml
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.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

...	...	@@ -90,7 +90,7 @@
90	90	/**
91	91	* 异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
92	92	*/
93		- private Integer abnormalParturitionPosition;
	93	+ private String abnormalParturitionPosition;
94	94
95	95	/**
96	96	* 头颅、五观是否畸形 1=有 -1=无
97	97
...	...	@@ -310,11 +310,11 @@
310	310	this.abnormalParturitionType = abnormalParturitionType;
311	311	}
312	312
313		- public Integer getAbnormalParturitionPosition() {
	313	+ public String getAbnormalParturitionPosition() {
314	314	return abnormalParturitionPosition;
315	315	}
316	316
317		- public void setAbnormalParturitionPosition(Integer abnormalParturitionPosition) {
	317	+ public void setAbnormalParturitionPosition(String abnormalParturitionPosition) {
318	318	this.abnormalParturitionPosition = abnormalParturitionPosition;
319	319	}
320	320

...	...	@@ -19,7 +19,7 @@
19	19	<result column="birth_injury_position" property="birthInjuryPosition" jdbcType="VARCHAR"/>
20	20	<result column="amniotic_fluid_type" property="amnioticFluidType" jdbcType="INTEGER"/>
21	21	<result column="abnormal_parturition_type" property="abnormalParturitionType" jdbcType="INTEGER"/>
22		- <result column="abnormal_parturition_position" property="abnormalParturitionPosition" jdbcType="INTEGER"/>
	22	+ <result column="abnormal_parturition_position" property="abnormalParturitionPosition" jdbcType="VARCHAR"/>
23	23	<result column="deformity_type" property="deformityType" jdbcType="INTEGER"/>
24	24	<result column="deformity_position" property="deformityPosition" jdbcType="VARCHAR"/>
25	25	<result column="birth_infection_type" property="birthInfectionType" jdbcType="INTEGER"/>
...	...	@@ -97,8 +97,8 @@
97	97	<if test="abnormalParturitionType != null and abnormalParturitionType >= 0">
98	98	abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER},
99	99	</if>
100		- <if test="abnormalParturitionPosition != null and abnormalParturitionPosition >= 0">
101		- abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=INTEGER},
	100	+ <if test="abnormalParturitionPosition != null and abnormalParturitionPosition != ''">
	101	+ abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR},
102	102	</if>
103	103	<if test="deformityType != null and deformityType >= 0">
104	104	deformity_type = #{deformityType,jdbcType=INTEGER},
...	...	@@ -241,8 +241,8 @@
241	241	<if test="abnormalParturitionType != null and abnormalParturitionType >= 0">
242	242	and abnormal_parturition_type = #{abnormalParturitionType,jdbcType=INTEGER}
243	243	</if>
244		- <if test="abnormalParturitionPosition != null and abnormalParturitionPosition >= 0">
245		- and abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=INTEGER}
	244	+ <if test="abnormalParturitionPosition != null and abnormalParturitionPosition != ''">
	245	+ and abnormal_parturition_position = #{abnormalParturitionPosition,jdbcType=VARCHAR}
246	246	</if>
247	247	<if test="deformityType != null and deformityType >= 0">
248	248	and deformity_type = #{deformityType,jdbcType=INTEGER}

...	...	@@ -316,6 +316,13 @@
316	316	and check_doctor_id = #{checkDoctorId}
317	317	</if>
318	318
	319	+ <if test="checkHospitalIds != null ">
	320	+ and check_hospital_id in
	321	+ <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
	322	+ #{item}
	323	+ </foreach>
	324	+ </if>
	325	+
319	326	<if test="babyIds!=null">
320	327	and baby_id in (
321	328	<foreach item="babyId" collection="babyIds" separator="," >

...	...	@@ -163,7 +163,6 @@
163	163	private Boolean isNull;
164	164
165	165
166		-
167	166	public Integer[] getOrServiceStatus() {
168	167	return orServiceStatus;
169	168	}
...	...	@@ -630,7 +629,7 @@
630	629
631	630	if (null != hospitalIdList) {
632	631	condition = condition.and("hospitalId", hospitalIdList, MongoOper.IN);
633		- }else if (null != hospitalId) {
	632	+ } else if (null != hospitalId) {
634	633	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
635	634	}
636	635	if (!StringUtils.isEmpty(lastDiagnose)) {
637	636
...	...	@@ -660,13 +659,13 @@
660	659	condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN);
661	660	}
662	661
663		- if (StringUtils.isNotEmpty(queryNo)){
	662	+ if (StringUtils.isNotEmpty(queryNo)) {
664	663	MongoCondition c = MongoCondition.newInstance();
665	664	MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE);
666	665	MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS);
667	666	MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
668	667	MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
669		- condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}));
	668	+ condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3, con4}));
670	669	}
671	670
672	671	if (null != sex) {
673	672
...	...	@@ -726,38 +725,11 @@
726	725	condition = condition.and("expVip", expVip, MongoOper.IS);
727	726	}
728	727
729		-
730	728	Criteria c = null;
731	729	if (null != birthStart) {
732	730	c = Criteria.where("birth").gte(birthStart);
733	731	}
734	732
735		- if (null != nextDateStart && nextDateEnd != null) {
736		-
737		- Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
738		- condition.andCondition(new MongoCondition(cr));
739		-
740		- }
741		-
742		-
743		- if (null != phoneOrcardNo) {
744		- MongoCondition c1 = MongoCondition.newInstance();
745		- MongoCondition con1 = MongoCondition.newInstance("mphone", phoneOrcardNo, MongoOper.IS);
746		- MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS);
747		- if(c!=null) {
748		- c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
749		- }else {
750		- c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
751		- }
752		- }
753		-
754		-
755		- if (null != gteModified && null != gteCreated) {
756		- MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
757		- MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
758		- condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
759		- }
760		-
761	733	if (null != birthEnd) {
762	734	if (null != c) {
763	735	c = c.lte(birthEnd);
...	...	@@ -782,6 +754,31 @@
782	754	c = Criteria.where("buildDate").lte(buildDateEnd);
783	755	}
784	756	}
	757	+
	758	+ if (null != nextDateStart && nextDateEnd != null) {
	759	+ Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
	760	+ condition.andCondition(new MongoCondition(cr));
	761	+ }
	762	+
	763	+
	764	+ if (null != phoneOrcardNo) {
	765	+ MongoCondition c1 = MongoCondition.newInstance();
	766	+ MongoCondition con1 = MongoCondition.newInstance("mphone", phoneOrcardNo, MongoOper.IS);
	767	+ MongoCondition con2 = MongoCondition.newInstance("mcertNo", phoneOrcardNo, MongoOper.IS);
	768	+ if (c != null) {
	769	+ c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	770	+ } else {
	771	+ c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	772	+ }
	773	+ }
	774	+
	775	+
	776	+ if (null != gteModified && null != gteCreated) {
	777	+ MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
	778	+ MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
	779	+ condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
	780	+ }
	781	+
785	782
786	783	if (c != null) {
787	784	return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();

...	...	@@ -263,14 +263,23 @@
263	263	} else {
264	264	boolean isResu = false;
265	265	for (BabyPatientExtendEarScreen scr : screenList) {
266		- if(scr.getOaeRight()==null\|\|scr.getOaeLeft()==null\|\|scr.getAabrLeft()==null\|\|scr.getAabrRight()==null){
267		-
268		- }else
269		- //只要有听筛未通过的就可以进入听诊了
270		- if (scr.getOaeLeft() == -1 \|\| scr.getOaeRight() == -1 \|\| scr.getAabrLeft() == -1 \|\| scr.getAabrRight() == -1) {//1=通过 -1=未通过
271		- isResu = true;
272		- break;
273		- }
	266	+ if (scr.getOaeRight() == null) {
	267	+ scr.setOaeRight(1);
	268	+ }
	269	+ if (scr.getOaeLeft() == null) {
	270	+ scr.setOaeLeft(1);
	271	+ }
	272	+ if (scr.getAabrLeft() == null) {
	273	+ scr.setAabrLeft(1);
	274	+ }
	275	+ if (scr.getAabrRight() == null) {
	276	+ scr.setAabrRight(1);
	277	+ }
	278	+ //只要有听筛未通过的就可以进入听诊了
	279	+ if (scr.getOaeLeft() == -1 \|\| scr.getOaeRight() == -1 \|\| scr.getAabrLeft() == -1 \|\| scr.getAabrRight() == -1) {//1=通过 -1=未通过
	280	+ isResu = true;
	281	+ break;
	282	+ }
274	283	}
275	284	if (!isResu) {
276	285	return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("听诊诊断失败，儿童听筛已通过");

...	...	@@ -1049,15 +1049,32 @@
1049	1049	String parturitType = "无";
1050	1050	if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) {
1051	1051	if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有
1052		- parturitType = "有";
1053		- if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() != null) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
1054		- if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) {
1055		- parturitType = "有(臀部)";
1056		- } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) {
1057		- parturitType = "有(脐带绕颈)";
1058		- } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 3) {
1059		- parturitType = "有(胎膜早破)";
	1052	+ parturitType = "有(";
	1053	+ if (StringUtils.isNotEmpty(babyPatientExtendEarBirth.getAbnormalParturitionPosition())) {//异常分娩部位 1=臀部 2=脐带绕颈 3=胎膜早破
	1054	+ JSONObject positionJo = JSONObject.parseObject(babyPatientExtendEarBirth.getAbnormalParturitionPosition());
	1055	+ if(positionJo.containsKey("tw")){
	1056	+ if(positionJo.getBoolean("tw")){
	1057	+ parturitType+="臀部、";
	1058	+ }
1060	1059	}
	1060	+ if(positionJo.containsKey("qdrj")){
	1061	+ if(positionJo.getBoolean("qdrj")){
	1062	+ parturitType+="脐带绕颈、";
	1063	+ }
	1064	+ }
	1065	+ if(positionJo.containsKey("tmzp")){
	1066	+ if(positionJo.getBoolean("tmzp")){
	1067	+ parturitType+="胎膜早破、";
	1068	+ }
	1069	+ }
	1070	+ parturitType+=")";
	1071	+ // if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 1) {
	1072	+ // parturitType = "有(臀部)";
	1073	+ // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 2) {
	1074	+ // parturitType = "有(脐带绕颈)";
	1075	+ // } else if (babyPatientExtendEarBirth.getAbnormalParturitionPosition() == 3) {
	1076	+ // parturitType = "有(胎膜早破)";
	1077	+ // }
1061	1078	}
1062	1079	}
1063	1080	}
...	...	@@ -1550,6 +1567,7 @@
1550	1567	babyQuery.setQueryNo(earScreenListRequest.getKeyWord());
1551	1568	babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime());
1552	1569	babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime());
	1570	+ babyQuery.setHospitalId(hospitalId);
1553	1571	//查询建档记录
1554	1572	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1555	1573	if (CollectionUtils.isNotEmpty(models)) {
1556	1574
...	...	@@ -1591,10 +1609,10 @@
1591	1609	screenResult.setHighRiskCause(hfBuff.toString());
1592	1610	}
1593	1611	String srcResult = "通过";
1594		- if (earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1 && earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1) {
	1612	+ if ((earScreen.getAabrLeft() != null && earScreen.getAabrLeft() == -1 )\|\| (earScreen.getOaeLeft() != null && earScreen.getOaeLeft() == -1)) {
1595	1613	srcResult = "不通过";
1596	1614	}
1597		- if (earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1 && earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1) {
	1615	+ if ((earScreen.getOaeRight() != null && earScreen.getOaeRight() == -1)\|\| (earScreen.getAabrRight() != null && earScreen.getAabrRight() == -1)) {
1598	1616	srcResult = "不通过";
1599	1617	}
1600	1618	screenResult.setSrcResult(srcResult);