From f30ec7f69fd4240439c3b0ffb0e8daaa7a8ea607 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 3 Aug 2017 09:07:22 +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 --- .../model/BabyPatientExtendEarHearingDiagnose.java | 22 +++++++++---- .../web/controller/HearDiagnManageController.java | 3 ++ .../web/controller/HearingDiagnoseController.java | 38 +++++++++++++++------- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java index 443ff38..605c384 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnose.java @@ -1,10 +1,8 @@ package com.lyms.platform.permission.model; -import com.lyms.platform.common.dao.BaseQuery; - import java.util.Date; -public class BabyPatientExtendEarHearingDiagnose extends BaseQuery{ +public class BabyPatientExtendEarHearingDiagnose { /** * 主键 @@ -386,7 +384,11 @@ public class BabyPatientExtendEarHearingDiagnose extends BaseQuery{ /** * 诊断指导处理意见 1-确诊纳入随访 2-未发现问题 */ - private String diagnHandSugge; + private Integer diagnHandSugge; + /** + * 诊断指导处理意见 1-确诊纳入随访 2-未发现问题 + */ + private String diagnHandSuggeStr; /** * 诊断指导指导意见 */ @@ -1280,14 +1282,22 @@ public class BabyPatientExtendEarHearingDiagnose extends BaseQuery{ this.assrRight4k = assrRight4k; } - public String getDiagnHandSugge() { + public Integer getDiagnHandSugge() { return diagnHandSugge; } - public void setDiagnHandSugge(String diagnHandSugge) { + public void setDiagnHandSugge(Integer diagnHandSugge) { this.diagnHandSugge = diagnHandSugge; } + public String getDiagnHandSuggeStr() { + return diagnHandSuggeStr; + } + + public void setDiagnHandSuggeStr(String diagnHandSuggeStr) { + this.diagnHandSuggeStr = diagnHandSuggeStr; + } + public String getDiagnGuideSugge() { return diagnGuideSugge; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java index 19d1832..3d30d00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java @@ -80,18 +80,21 @@ public class HearDiagnManageController extends BaseController { //儿童听筛记录 BabyPatientExtendEarScreenQuery earScreenQuery = new BabyPatientExtendEarScreenQuery(); earScreenQuery.setBabyId(babyId); + earScreenQuery.setSort("screen_date"); List earScreenList = screenService.queryBabyPatientExtendEarScreen(earScreenQuery); //儿童听力诊断记录 BabyPatientExtendEarHearingDiagnoseQuery hearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); hearingDiagnoseQuery.setBabyId(babyId); hearingDiagnoseQuery.setIfdel(0); + hearingDiagnoseQuery.setSort("diagnose_time"); List hearingDiagnoseList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(hearingDiagnoseQuery); //儿童听力随访记录 BabyPatientExtendEarFollowUpQuery earFollowUpQuery = new BabyPatientExtendEarFollowUpQuery(); earFollowUpQuery.setBabyId(babyId); earFollowUpQuery.setIfdel(0); + earFollowUpQuery.setSort("follow_time"); List earFollowUpList = babyPatientExtendEarFollowUpService.queryBabyPatientExtendEarFollowUpByBaby(earFollowUpQuery); List> resultList = new ArrayList<>(); 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 dba9ad0..37bdcd0 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 @@ -197,8 +197,8 @@ public class HearingDiagnoseController extends BaseController { behd.setDiagnResultStr(hfBuff.toString()); } - if(StringUtils.isNotEmpty(behd.getDiagnHandSugge())){ - behd.setDiagnHandSugge(HdEnums.getHsTitle(Integer.parseInt(behd.getDiagnHandSugge()))); + if(behd.getDiagnHandSugge()!=null){ + behd.setDiagnHandSuggeStr(HdEnums.getHsTitle(behd.getDiagnHandSugge())); } BaseResponse result = new BaseResponse(); @@ -227,6 +227,7 @@ public class HearingDiagnoseController extends BaseController { BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery(); query.setBabyId(babyId); + query.setIfdel(0); //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查 HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery(); hcQuery.setIntoOrgid(hospitalId); @@ -240,7 +241,7 @@ public class HearingDiagnoseController extends BaseController { } } query.setCheckHospitalIds((String[]) hospitalIds.toArray(new String[hospitalIds.size()])); - + query.setSort("diagnose_time"); List behdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query); List> list = new ArrayList<>(); for (BabyPatientExtendEarHearingDiagnose hd : behdList) { @@ -569,7 +570,7 @@ public class HearingDiagnoseController extends BaseController { * @param request * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/delHearingDiagnose") + @RequestMapping(method = RequestMethod.DELETE, value = "/delHearingDiagnose") @ResponseBody @TokenRequired public BaseResponse delHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj, HttpServletRequest request) { @@ -585,14 +586,29 @@ public class HearingDiagnoseController extends BaseController { //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); BabyPatientExtendEarHearingDiagnose hearDiag = hearingDiagnoseService.getBabyPatientExtendEarHearingDiagnose(obj.getId()); - if (hearDiag == null) {// - return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要修改的数据"); + if (hearDiag == null||hearDiag.getIfdel()!=0) {//没有找到数据 + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据"); + } + + BabyPatientExtendEarHearingDiagnoseQuery earHearingDiagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); + earHearingDiagnoseQuery.setIfdel(0); + 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())){ + obj.setModifyId(String.valueOf(loginState.getId())); + obj.setModifyTime(new Date()); + obj.setIfdel(1); + hearingDiagnoseService.updateBabyPatientExtendEarHearingDiagnose(obj); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("删除成功"); + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("删除失败！只能删除最后一次听诊记录"); + } + }else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("没有找到要删除的数据"); } - obj.setModifyId(String.valueOf(loginState.getId())); - obj.setModifyTime(new Date()); - obj.setIfdel(1); - hearingDiagnoseService.updateBabyPatientExtendEarHearingDiagnose(obj); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("删除成功"); } /** -- 1.8.3.1