From 218282c5dad0017e464ec6131b3685004fd308b5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 29 Aug 2017 09:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/HearingDiagnosisEnums.java | 2 +- .../web/controller/HearingDiagnoseController.java | 69 +++++++++++++--------- .../web/result/HearingDiagnoseListResult.java | 10 ++++ 3 files changed, 53 insertions(+), 28 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java index ed4bfef..457e74f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HearingDiagnosisEnums.java @@ -1,7 +1,7 @@ package com.lyms.platform.common.enums; /** - * 听力诊断列表 + * 听力诊断枚举 * @auther yangfei * @createTime 2017年05月15日 17时41分 * @discription diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index 391b7d5..d76e4c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -150,7 +150,7 @@ public class HearingDiagnoseController extends BaseController { behd.setConfirmTimeStr(DateUtil.getyyyy_MM_dd(behd.getConfirmTime())); } - if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum + if (StringUtils.isNotEmpty(behd.getHighFactor()))//听力高危因素文字 HighRiskEnum { StringBuffer hfBuff = new StringBuffer(); List highArr = new ArrayList(); @@ -161,8 +161,8 @@ public class HearingDiagnoseController extends BaseController { String name = HighRiskEnum.getTitle(Integer.parseInt(hf)); hfBuff.append(name + "、"); JSONObject confiJo = new JSONObject(); - confiJo.put("id",hf); - confiJo.put("name",name); + confiJo.put("id", hf); + confiJo.put("name", name); highArr.add(confiJo); } } @@ -192,15 +192,15 @@ public class HearingDiagnoseController extends BaseController { if (StringUtils.isNotEmpty(hf)) { String name = ConfirmedEnums.getTitle(Integer.parseInt(hf)); JSONObject confiJo = new JSONObject(); - confiJo.put("id",hf); - confiJo.put("name",name); + confiJo.put("id", hf); + confiJo.put("name", name); confiArr.add(confiJo); hfBuff.append(name + "、"); } } behd.setConfirmResults(confiArr); behd.setConfirmResultStr(hfBuff.toString()); - }else{ + } else { behd.setConfirmResults(new ArrayList()); } @@ -213,19 +213,19 @@ public class HearingDiagnoseController extends BaseController { if (StringUtils.isNotEmpty(hf)) { String name = HearingDiagnosisEnums.getTitle(Integer.parseInt(hf)); JSONObject confiJo = new JSONObject(); - confiJo.put("id",hf); - confiJo.put("name",name); + confiJo.put("id", hf); + confiJo.put("name", name); diagnArr.add(confiJo); hfBuff.append(name + "、"); } } behd.setDiagnResultStr(hfBuff.toString()); behd.setDiagnResults(diagnArr); - }else{ + } else { behd.setConfirmResults(new ArrayList()); } - if(behd.getDiagnHandSugge()!=null){ + if (behd.getDiagnHandSugge() != null) { behd.setDiagnHandSuggeStr(HdEnums.getHsTitle(behd.getDiagnHandSugge())); } @@ -291,6 +291,7 @@ public class HearingDiagnoseController extends BaseController { /** * 获取听力诊断记录列表 + * * @param hdReq 听力诊断记录对象 多条件查询 * @param request * @return @@ -356,19 +357,19 @@ public class HearingDiagnoseController extends BaseController { babyQuery.setQueryNo(hdReq.getKeyWord()); babyQuery.setHospitalId(hospitalId); List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); - if(CollectionUtils.isNotEmpty(models)){ - List babyIds = new ArrayList<>(); - for(BabyPatientExtendEarBaby babyModel:models){ + if (CollectionUtils.isNotEmpty(models)) { + List babyIds = new ArrayList<>(); + for (BabyPatientExtendEarBaby babyModel : models) { babyIds.add(babyModel.getBabyPatientId()); } scrQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } } scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()])); - if(scrQuery.getCheckHospitalIds()==null||scrQuery.getCheckHospitalIds().length==0){ + if (scrQuery.getCheckHospitalIds() == null || scrQuery.getCheckHospitalIds().length == 0) { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); } //主数据 @@ -505,7 +506,7 @@ public class HearingDiagnoseController extends BaseController { hea.setId(hd.getId()); hea.setDiagnoseTime(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())); String docotorId = hd.getDiagnDoctorId(); - Users users = usersService.getUsers(Integer.parseInt(docotorId==null?"0":docotorId)); + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); if (users != null) { hea.setDoctorName(users.getName() == null ? "-" : users.getName()); } @@ -520,7 +521,7 @@ public class HearingDiagnoseController extends BaseController { String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b])); map.put(Integer.parseInt(hf[b]), title); // highRiskEnums.add(map); - hrSb.append(title+","); + hrSb.append(title + ","); } } // hea.setHighRiskEnums(highRiskEnums); @@ -529,22 +530,36 @@ public class HearingDiagnoseController extends BaseController { //确诊结果 if (hd.getConfirmResult() != null) { String cr[] = hd.getConfirmResult().split(","); - // List> hdEnums = new ArrayList<>(); StringBuffer hdSb = new StringBuffer(); for (int b = 0; b < cr.length; b++) { if (StringUtils.isNotEmpty(cr[b])) { Map map = new HashMap<>(); String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b])); map.put(Integer.parseInt(cr[b]), title); - // hdEnums.add(map); - hdSb.append(title+"，"); + hdSb.append(title + "，"); } } // hea.setDiagnResult(hdEnums); + hea.setConfirmResult(hdSb.toString()); + } + + //诊断结果 + if (hd.getDiagnResult() != null) { + String cr[] = hd.getDiagnResult().split(","); + StringBuffer hdSb = new StringBuffer(); + for (int b = 0; b < cr.length; b++) { + if (StringUtils.isNotEmpty(cr[b])) { + Map map = new HashMap<>(); + String title = HearingDiagnosisEnums.getTitle(Integer.parseInt(cr[b])); + map.put(Integer.parseInt(cr[b]), title); + hdSb.append(title + "，"); + } + } hea.setDiagnResult(hdSb.toString()); } } + //诊断结果，肯定是有诊断记录 if (hdReq.getConfirmResult() != null || hdReq.getConfirmDegree() != null) { // 1、已诊断、2、待诊断、0、全部 @@ -626,7 +641,7 @@ public class HearingDiagnoseController extends BaseController { //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); BabyPatientExtendEarHearingDiagnose hearDiag = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(obj.getId()); - if (hearDiag == null||hearDiag.getIfdel()!=0) {//没有找到数据 + if (hearDiag == null || hearDiag.getIfdel() != 0) {//没有找到数据 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据"); } @@ -635,18 +650,18 @@ public class HearingDiagnoseController extends BaseController { earHearingDiagnoseQuery.setBabyId(hearDiag.getBabyId()); earHearingDiagnoseQuery.setSort("diagnose_time"); List earHearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(earHearingDiagnoseQuery); - if(CollectionUtils.isNotEmpty(earHearingDiagnoseList)){ - BabyPatientExtendEarHearingDiagnose earHearingDiagnose = earHearingDiagnoseList.get(earHearingDiagnoseList.size()-1); - if(earHearingDiagnose.getId().equals(obj.getId())){ + if (CollectionUtils.isNotEmpty(earHearingDiagnoseList)) { + BabyPatientExtendEarHearingDiagnose earHearingDiagnose = earHearingDiagnoseList.get(earHearingDiagnoseList.size() - 1); + if (earHearingDiagnose.getId().equals(obj.getId())) { obj.setModifyId(String.valueOf(loginState.getId())); obj.setModifyTime(new Date()); obj.setIfdel(1); hearingDiagnoseService.updateBabyPatientExtendEarHearingDiagnose(obj); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("删除成功"); - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("删除失败！只能删除最后一次听诊记录"); } - }else{ + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据"); } } @@ -743,7 +758,7 @@ public class HearingDiagnoseController extends BaseController { } //听力筛查-当某个儿童在同一院组内某家医院完成了的听筛建档后去院组内其他医院做了听筛、听诊或随访，应该要在对应的医院下创建一个隐藏档案 //建立隐藏档案 - babyEarFacade.addhideBabyEar(obj.getBabyId(),hospitalId); + babyEarFacade.addhideBabyEar(obj.getBabyId(), hospitalId); BaseResponse result = new BaseResponse(); result.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java index 364c531..7d2c86b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HearingDiagnoseListResult.java @@ -25,6 +25,8 @@ public class HearingDiagnoseListResult { private String diagnResult; //是否确诊 0-待确诊，1-确诊 private String isconfirm; + //确诊结果 + private String confirmResult; //创建时间 private String diagnoseTime; //医生名称 @@ -36,6 +38,14 @@ public class HearingDiagnoseListResult { //听力高危集合 private String highRiskEnums; + public String getConfirmResult() { + return confirmResult; + } + + public void setConfirmResult(String confirmResult) { + this.confirmResult = confirmResult; + } + public String getBabyId() { return babyId; } -- 1.8.3.1