jiangjiazhi / regional-platform

Commit 2cb74c79a2e964fa03a5307f7f8d1bcb6b8ab376

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

听力诊断模块

Showing 8 changed files with 30 additions and 14 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBabyQuery.java
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarBaby.xml
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml
platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.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/controller/HearingDiagnoseController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java

...	...	@@ -22,6 +22,7 @@
22	22	private String hospitalId;
23	23	private Integer buildType;
24	24	private String enable;
	25	+ private String isEnable;
25	26	private String noEnable;
26	27	private Integer yn;
27	28	private Date buildDate;
...	...	@@ -38,6 +39,14 @@
38	39	* 生日
39	40	*/
40	41	private Date birthEnd;
	42	+
	43	+ public String getIsEnable() {
	44	+ return isEnable;
	45	+ }
	46	+
	47	+ public void setIsEnable(String isEnable) {
	48	+ this.isEnable = isEnable;
	49	+ }
41	50
42	51	public String getPersonId() {
43	52	return personId;

...	...	@@ -183,9 +183,10 @@
183	183	and build_type = #{buildType,jdbcType=INTEGER}
184	184	</if>
185	185	<if test="enable != null and enable != ''">
186		- and (enable = #{enable,jdbcType=VARCHAR}
187		- or `enable` is null
188		- )
	186	+ and enable = #{enable,jdbcType=VARCHAR}
	187	+ </if>
	188	+ <if test="isEnable != null and isEnable != ''">
	189	+ and enable is null
189	190	</if>
190	191	<if test="noEnable != null and noEnable != ''">
191	192	and (enable != #{noEnable,jdbcType=VARCHAR}

...	...	@@ -594,8 +594,7 @@
594	594	id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_left,oae_right,aabr_left,aabr_right,gjb2_del_35,gjb2_del_176,gjb2_del_235,gjb2_del_299,gjb3_slc26a4_538,gjb3_slc26a4_2168,gjb3_slc26a4_ivs7,rrna_1494,rrna_1555,process_option_type,process_option_desc,guid_opinion,check_doctor_id,referral_date,create_date,create_user_id,create_hospital_id,last_update_date,next_check_time,last_update_user_id,last_update_hospital_id,status,scr_ispass,pid
595	595	from baby_patient_extend_ear_screen
596	596	<where>
597		- (oae_left =-1 or oae_right = -1 or aabr_left = -1 or aabr_right = -1)
598		- and screen_type = 2
	597	+ scr_ispass = 2
599	598	<if test="screenStartDate!=null">
600	599	and
601	600	<![CDATA[

...	...	@@ -189,7 +189,7 @@
189	189	<select id="queryHighriskChangeHospital" resultMap="HighriskChangeHospitalResultMap"
190	190	parameterType="com.lyms.platform.permission.model.HighriskChangeHospitalQuery">
191	191	select
192		- ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID
	192	+ ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,CHANGEWAY,APPLY_DOCTORID,CREATE_ID,CHANGE_TYPE,STATUS,CREATE_TIME,RECEIVE_TIME,RECEIVE_DOCTORID,SCRREEN_ID,pid
193	193	from HIGHRISK_CHANGE_HOSPITAL
194	194	<include refid="HighriskChangeHospitalCondition"/>
195	195	<include refid="orderAndLimit"/>

...	...	@@ -155,7 +155,7 @@
155	155
156	156	public enum SourceEnums {
157	157	BY(1, "本院"),
158		- ALL(3, "全部"),
	158	+ // ALL(3, "全部"),
159	159	WY(2, "外院");
160	160
161	161	private int id;

...	...	@@ -297,8 +297,6 @@
297	297	BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
298	298	List<String> babyIds = babyEarFacade.getBabyIdsByItemOrg(babyId, hospitalId);
299	299
300		-
301		-
302	300	BabyModel babyModel = babyService.getOneBabyById(babyId);
303	301	String pid = babyModel.getPid();
304	302

...	...	@@ -354,10 +354,10 @@
354	354	} else if (hdReq.getSource() == 1) {//1.本院
355	355	BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
356	356	babyQuery.setHospitalId(hospitalId);
357		- babyQuery.setEnable("2");
	357	+ babyQuery.setIsEnable("1");
358	358	List<BabyPatientExtendEarBaby> earBabies = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
359	359	for (BabyPatientExtendEarBaby eb:earBabies){
360		- pids.add(eb.getBabyPatientId());
	360	+ pids.add(eb.getPersonId());
361	361	}
362	362	}
363	363	}
364	364
...	...	@@ -380,11 +380,17 @@
380	380	}
381	381	}
382	382
383		- //主数据
	383	+ //本院听筛数据
384	384	List<String> babyIds = screenService.queryScrBabyIds(scrQuery);
385	385
386	386	BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
387		- query.setPids((String[]) pids.toArray(new String[pids.size()]));
	387	+ if(CollectionUtils.isNotEmpty(pids)){
	388	+ query.setPids((String[]) pids.toArray(new String[pids.size()]));
	389	+ }
	390	+ if(CollectionUtils.isEmpty(pids)&&hdReq.getSource()!=null){
	391	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到要删除的数据");
	392	+ }
	393	+
388	394	//设置要查询的babyId
389	395	query.setHospitalId(hospitalId);
390	396	if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间

...	...	@@ -334,13 +334,14 @@
334	334	babyPatientExtendEarBaby.setMphone(babyModel.getMphone());
335	335	babyPatientExtendEarBaby.setVcCardNo(babyModel.getVcCardNo());
336	336	babyPatientExtendEarBaby.setBuildDoctor(babyModel.getBuildDoctor());
337		- babyPatientExtendEarBaby.setHospitalId(babyModel.getHospitalId());
	337	+ babyPatientExtendEarBaby.setHospitalId(hospitalId);
338	338	babyPatientExtendEarBaby.setBuildType(babyModel.getBuildType());
339	339	babyPatientExtendEarBaby.setYn(babyModel.getYn());
340	340	babyPatientExtendEarBaby.setBuildDate(babyModel.getBuildDate());
341	341	babyPatientExtendEarBaby.setEnable(babyModel.getEnable());
342	342	babyPatientExtendEarBaby.setBabyPatientId(babyModel.getId());
343	343	babyPatientExtendEarBaby.setBabyEarId(ear.getId());
	344	+ babyPatientExtendEarBaby.setPersonId(babyModel.getPid());
344	345	babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
345	346	}
346	347	}
...	...	@@ -475,6 +476,7 @@
475	476	babyPatientExtendEar.setDischargeDiagnosis(babyEarBase.getDischargeDiagnosis());
476	477	babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause());
477	478	babyPatientExtendEar.setHighRiskCause(babyEarBase.getHighRiskCause());
	479	+
478	480	//根据babyId查询是否存
479	481	BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
480	482	earQuery.setBabyPatientId(babyPatientId);
...	...	@@ -496,6 +498,7 @@
496	498	babyPatientExtendEar.setLastUpdateHospitalId(hId);
497	499	babyPatientExtendEar.setLastUpdateUserId(userId + "");
498	500	babyPatientExtendEar.setBabyPatientId(babyPatientId);
	501	+ babyPatientExtendEar.setStatus(YnEnums.YES.getId());
499	502	babyPatientExtendEarService.addBabyPatientExtendEar(babyPatientExtendEar);
500	503	}
501	504