diff --git a/src/main/java/com/emr/controller/DictionaryController.java b/src/main/java/com/emr/controller/DictionaryController.java index 76fac37..383635a 100644 --- a/src/main/java/com/emr/controller/DictionaryController.java +++ b/src/main/java/com/emr/controller/DictionaryController.java @@ -124,29 +124,24 @@ public class DictionaryController { @OptionalLog(module = "新增",methods = "字典",fieldName = "typename") @RequestMapping("add") @ResponseBody - public ResultUtil add(Emr_Dictionary dictionary, HttpServletRequest request) { - try{ - if(StringUtils.isNotBlank(dictionary.getParentId()) && "0".equals(dictionary.getParentId())){ - if(StringUtils.isBlank(dictionary.getTypecode())){ - return ResultUtil.error("类别代码不能为空!"); - } - if(StringUtils.isBlank(dictionary.getTypename())){ - return ResultUtil.error("类别名称不能为空!"); - } - }else{ - if(StringUtils.isBlank(dictionary.getCode())){ - return ResultUtil.error("代码不能为空!"); - } - if(StringUtils.isBlank(dictionary.getName())){ - return ResultUtil.error("名称不能为空!"); - } + public ResultUtil add(Emr_Dictionary dictionary, HttpServletRequest request) throws Exception{ + if(StringUtils.isNotBlank(dictionary.getParentId()) && "0".equals(dictionary.getParentId())){ + if(StringUtils.isBlank(dictionary.getTypecode())){ + return ResultUtil.error("类别代码不能为空!"); } - emrDictionaryService.add(dictionary,request); - return ResultUtil.ok(dictionary.getId().toString()); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + if(StringUtils.isBlank(dictionary.getTypename())){ + return ResultUtil.error("类别名称不能为空!"); + } + }else{ + if(StringUtils.isBlank(dictionary.getCode())){ + return ResultUtil.error("代码不能为空!"); + } + if(StringUtils.isBlank(dictionary.getName())){ + return ResultUtil.error("名称不能为空!"); + } + } + emrDictionaryService.add(dictionary,request); + return ResultUtil.ok(dictionary.getId().toString()); } /** @@ -165,29 +160,24 @@ public class DictionaryController { @OptionalLog(module = "修改",methods = "字典",fieldName = "typename") @RequestMapping("update") @ResponseBody - public ResultUtil update(Emr_Dictionary dictionary, HttpServletRequest request) { - try{ - if(StringUtils.isNotBlank(dictionary.getParentId()) && "0".equals(dictionary.getParentId())){ - if(StringUtils.isBlank(dictionary.getTypecode())){ - return ResultUtil.error("类别代码不能为空!"); - } - if(StringUtils.isBlank(dictionary.getTypename())){ - return ResultUtil.error("类别名称不能为空!"); - } - }else{ - if(StringUtils.isBlank(dictionary.getCode())){ - return ResultUtil.error("代码不能为空!"); - } - if(StringUtils.isBlank(dictionary.getName())){ - return ResultUtil.error("名称不能为空!"); - } + public ResultUtil update(Emr_Dictionary dictionary, HttpServletRequest request) throws Exception{ + if(StringUtils.isNotBlank(dictionary.getParentId()) && "0".equals(dictionary.getParentId())){ + if(StringUtils.isBlank(dictionary.getTypecode())){ + return ResultUtil.error("类别代码不能为空!"); } - emrDictionaryService.update(dictionary,request); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + if(StringUtils.isBlank(dictionary.getTypename())){ + return ResultUtil.error("类别名称不能为空!"); + } + }else{ + if(StringUtils.isBlank(dictionary.getCode())){ + return ResultUtil.error("代码不能为空!"); + } + if(StringUtils.isBlank(dictionary.getName())){ + return ResultUtil.error("名称不能为空!"); + } + } + emrDictionaryService.update(dictionary,request); + return ResultUtil.ok(); } /** @@ -206,14 +196,9 @@ public class DictionaryController { @OptionalLog(module = "删除",methods = "字典") @RequestMapping("delete") @ResponseBody - public ResultUtil delete(Integer id) { - try{ - emrDictionaryService.delete(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + public ResultUtil delete(Integer id) throws Exception{ + emrDictionaryService.delete(id); + return ResultUtil.ok(); } /** diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 6576af2..4274938 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -14,6 +14,7 @@ import com.lowagie.text.Utilities; import com.lowagie.text.pdf.*; import com.lowagie.text.pdf.codec.TiffImage; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -71,24 +72,19 @@ public class FontController { */ @RequestMapping(value= "getLockList",method = RequestMethod.GET) @ResponseBody - public Msg getLockList(LockVo lock) { - try { - FontCommom commom = new FontCommom(); - BeanUtils.copyProperties(lock, commom); - int existInpatient = commomMapper.isExistInpatient(commom); - if (existInpatient == 0) { - return Msg.fail("该病案不存在!"); - } - //根据条件查询结果 - List locks = lockMapper.seleceAll(lock); - if (null == locks || locks.isEmpty()) { - return Msg.fail("无该锁定记录!"); - } - return Msg.success().add("list", locks); - } catch (Exception e) { - e.printStackTrace(); - return Msg.fail("查询出错了,请联系系统管理员!"); + public Msg getLockList(LockVo lock) throws Exception{ + FontCommom commom = new FontCommom(); + BeanUtils.copyProperties(lock, commom); + List list = commomMapper.isExistInpatient(commom); + if (CollectionUtils.isEmpty(list)) { + return Msg.fail("该病案不存在!"); } + //根据条件查询结果 + List locks = lockMapper.seleceAll(lock); + if (null == locks || locks.isEmpty()) { + return Msg.fail("无该锁定记录!"); + } + return Msg.success().add("list", locks); } /** @@ -106,22 +102,17 @@ public class FontController { */ @RequestMapping("getInpatientList") @ResponseBody - public Msg getInpatientList(FontCommom commom) { - try { - Msg msg = getScanAssortVoList(commom,0); - if (msg.getCode() == 200) { - return msg; - } - //根据条件查询结果 - List inpatientList = commomMapper.getInpatientList(commom); - if (null != inpatientList && !inpatientList.isEmpty()) { - return Msg.success().add("list", inpatientList); - } else { - return Msg.fail("该病案不存在!"); - } - } catch (Exception e) { - e.printStackTrace(); - return Msg.fail("查询出错了,请联系系统管理员!"); + public Msg getInpatientList(FontCommom commom) throws Exception{ + Msg msg = getScanAssortVoList(commom,0); + if (msg.getCode() == 200) { + return msg; + } + //根据条件查询结果 + List inpatientList = commomMapper.getInpatientList(commom); + if (null != inpatientList && !inpatientList.isEmpty()) { + return Msg.success().add("list", inpatientList); + } else { + return Msg.fail("该病案不存在!"); } } @@ -129,7 +120,7 @@ public class FontController { /** * 封装查询分段信息的判断及查询分段信息 */ - private Msg getScanAssortVoList(FontCommom commom,int flag) { + private Msg getScanAssortVoList(FontCommom commom,int flag) throws Exception{ //判断参数是否不为全空 if (StringUtils.isNotBlank(commom.getPatientId()) && StringUtils.isBlank(commom.getInpatientNo()) && StringUtils.isBlank(commom.getAdmissId()) &&StringUtils.isNotBlank(commom.getName()) && null == commom.getAdmissTimes() && StringUtils.isBlank(commom.getDisDate()) && StringUtils.isBlank(commom.getIdCard())) { @@ -143,13 +134,9 @@ public class FontController { //判断住院记录是否存在 if(flag == 1){ //是否需要判断 - try { - int existInpatient = commomMapper.isExistInpatient(commom); - if (existInpatient == 0) { - return Msg.fail("该病案不存在!"); - } - } catch (Exception e) { - e.printStackTrace(); + List list = commomMapper.isExistInpatient(commom); + if (CollectionUtils.isEmpty(list)) { + return Msg.fail("该病案不存在!"); } } return Msg.success(); @@ -170,24 +157,149 @@ public class FontController { */ @RequestMapping(value="getScanAssortPathList",method = RequestMethod.GET) @ResponseBody - public Msg getScanAssortPathList(FontCommom commom) { + public Msg getScanAssortPathList(FontCommom commom) throws Exception{ Msg msg = getScanAssortVoList(commom,1); if (msg.getCode() == 200) { return msg; } - try { - //根据条件查询分段信息 - List scanAssortVos = scanAssortMapper.seleteScanAssortPath(commom); - List scanAssortVos1 = new ArrayList<>(); - if (null != scanAssortVos && !scanAssortVos.isEmpty()) { - for (int j = 0; j < scanAssortVos.size(); j++) { - if (StringUtils.isNotBlank(scanAssortVos.get(j).getFilePath()) && StringUtils.isNotBlank(scanAssortVos.get(j).getScanPage())) { - String[] pages = scanAssortVos.get(j).getScanPage().split(","); - // 实例化图片 - Image image = null; - //不成张合成的高度 - float tempHeight = 0; - Short pageCount = 0; + //根据条件查询分段信息 + List scanAssortVos = scanAssortMapper.seleteScanAssortPath(commom); + List scanAssortVos1 = new ArrayList<>(); + if (null != scanAssortVos && !scanAssortVos.isEmpty()) { + for (int j = 0; j < scanAssortVos.size(); j++) { + if (StringUtils.isNotBlank(scanAssortVos.get(j).getFilePath()) && StringUtils.isNotBlank(scanAssortVos.get(j).getScanPage())) { + String[] pages = scanAssortVos.get(j).getScanPage().split(","); + // 实例化图片 + Image image = null; + //不成张合成的高度 + float tempHeight = 0; + Short pageCount = 0; + for (String filePath : pages) { + if (StringUtils.isNotBlank(filePath)) { + filePath = scanAssortVos.get(j).getFilePath() + "\\" + filePath; + File file1 = new File(filePath); + if (file1.exists()) { + if (file1.getName().endsWith(".tif") || file1.getName().endsWith(".tiff")) { + Object localObject1 = null; + Object localObject2 = null; + URL paramURL = Utilities.toURL(filePath); + try { + if ("file".equals(paramURL.getProtocol())) { + localObject2 = paramURL.getFile(); + localObject2 = Utilities + .unEscapeURL((String) localObject2); + localObject1 = new RandomAccessFileOrArray( + (String) localObject2); + } else { + localObject1 = new RandomAccessFileOrArray(paramURL); + } + + int pageNums = TiffImage + .getNumberOfPages((RandomAccessFileOrArray) localObject1); + if (pageNums > 0) { + for (int i = 1; i <= pageNums; i++) { + localObject2 = TiffImage.getTiffImage( + (RandomAccessFileOrArray) localObject1, i); + image = (Image) localObject2; + } + } + if (localObject1 != null) { + ((RandomAccessFileOrArray) localObject1).close(); + } + + } finally { + if (localObject1 != null) { + ((RandomAccessFileOrArray) localObject1).close(); + } + } + } else if (file1.getName().endsWith(".png") + || file1.getName().endsWith(".jpg") + || file1.getName().endsWith(".gif") + || file1.getName().endsWith(".jpeg") + ) { + // 实例化图牿 + image = Image.getInstance(filePath); + } + // 获得图片的高庿 + float heigth = image.getHeight(); + float width = image.getWidth(); + // 合理压缩，h>w，按w压缩，否则按w压缩 + int percent = Jpg2PdfUtil.getPercent(heigth, width); + + // 设置图片居中显示 + image.setAlignment(Image.ALIGN_CENTER); + // 按百分比显示图片的比便 + if (width > 1024 || heigth > 786) { + image.scalePercent(percent + 5); + pageCount++; + //整张，把合成的高度置为0； + tempHeight = 0; + } else if (heigth < 786) { + if (tempHeight == 0) { + pageCount++; + } + tempHeight += heigth; + if (tempHeight > 786) { + pageCount++; + tempHeight = heigth; + } + } + } + } + } + scanAssortVos.get(j).setPageCount(pageCount); + } + ScanAssortVoNotFilePath vo1 = new ScanAssortVoNotFilePath(); + BeanUtils.copyProperties(scanAssortVos.get(j), vo1); + scanAssortVos1.add(vo1); + } + } else { + return Msg.fail("查询无该记录!"); + } + return Msg.success().add("list", scanAssortVos1); + } + + /** + * 2.4 + * @MethodName getScanAssortFilePathList + * @Description: 返回分段页数与PDF路径接口 + * @Param lockVo.patientId, admissTimes, admissId + * @Returnt + * @Author: 曾文和 + * @CreateDate: 2019-09-16 + * @UpdateUser: 曾文和 + * @UpdateDate: 2019-09-16 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ + @RequestMapping(value = "getScanAssortFilePathList",method = RequestMethod.GET) + @ResponseBody + public Msg getScanAssortFilePathList(FontCommom commom, HttpServletResponse response) throws Exception{ + Msg msg = getScanAssortVoList(commom,1); + if (msg.getCode() == 200) { + return msg; + } + //根据条件查询分段信息 + List scanAssortVos = scanAssortMapper.seleteScanAssortPath(commom); + List scanAssortVos1 = new ArrayList<>(); + if (null != scanAssortVos && !scanAssortVos.isEmpty()) { + for (int j = 0; j < scanAssortVos.size(); j++) { + if (StringUtils.isNotBlank(scanAssortVos.get(j).getFilePath()) && StringUtils.isNotBlank(scanAssortVos.get(j).getScanPage())) { + //转换pdf + String[] pages = scanAssortVos.get(j).getScanPage().split(","); + // 循环获取图片文件夹内的图牿 + Document doc = new Document(); + // 实例化图片 + Image image = null; + ByteArrayOutputStream baos = new ByteArrayOutputStream(2048); + PdfWriter.getInstance(doc, baos); + //不成张合成的高度 + float tempHeight = 0; + Short pageCount = 0; + try { + // 开启文档 + doc.open(); + for (String filePath : pages) { if (StringUtils.isNotBlank(filePath)) { filePath = scanAssortVos.get(j).getFilePath() + "\\" + filePath; @@ -258,167 +370,32 @@ public class FontController { tempHeight = heigth; } } + doc.add(image); } } } scanAssortVos.get(j).setPageCount(pageCount); - } - ScanAssortVoNotFilePath vo1 = new ScanAssortVoNotFilePath(); - BeanUtils.copyProperties(scanAssortVos.get(j), vo1); - scanAssortVos1.add(vo1); - } - } else { - return Msg.fail("查询无该记录!"); - } - return Msg.success().add("list", scanAssortVos1); - } catch (Exception e) { - e.printStackTrace(); - return Msg.fail("查询无该记录!"); - } - } - - /** - * 2.4 - * @MethodName getScanAssortFilePathList - * @Description: 返回分段页数与PDF路径接口 - * @Param lockVo.patientId, admissTimes, admissId - * @Returnt - * @Author: 曾文和 - * @CreateDate: 2019-09-16 - * @UpdateUser: 曾文和 - * @UpdateDate: 2019-09-16 - * @UpdateRemark: 更新说明 - * @Version: 1.0 - */ - @RequestMapping(value = "getScanAssortFilePathList",method = RequestMethod.GET) - @ResponseBody - public Msg getScanAssortFilePathList(FontCommom commom, HttpServletResponse response) { - Msg msg = getScanAssortVoList(commom,1); - if (msg.getCode() == 200) { - return msg; - } - try { - //根据条件查询分段信息 - List scanAssortVos = scanAssortMapper.seleteScanAssortPath(commom); - List scanAssortVos1 = new ArrayList<>(); - if (null != scanAssortVos && !scanAssortVos.isEmpty()) { - for (int j = 0; j < scanAssortVos.size(); j++) { - if (StringUtils.isNotBlank(scanAssortVos.get(j).getFilePath()) && StringUtils.isNotBlank(scanAssortVos.get(j).getScanPage())) { - //转换pdf - String[] pages = scanAssortVos.get(j).getScanPage().split(","); - // 循环获取图片文件夹内的图牿 - Document doc = new Document(); - // 实例化图片 - Image image = null; - ByteArrayOutputStream baos = new ByteArrayOutputStream(2048); - PdfWriter.getInstance(doc, baos); - //不成张合成的高度 - float tempHeight = 0; - Short pageCount = 0; - try { - // 开启文档 - doc.open(); - - for (String filePath : pages) { - if (StringUtils.isNotBlank(filePath)) { - filePath = scanAssortVos.get(j).getFilePath() + "\\" + filePath; - File file1 = new File(filePath); - if (file1.exists()) { - if (file1.getName().endsWith(".tif") || file1.getName().endsWith(".tiff")) { - Object localObject1 = null; - Object localObject2 = null; - URL paramURL = Utilities.toURL(filePath); - try { - if ("file".equals(paramURL.getProtocol())) { - localObject2 = paramURL.getFile(); - localObject2 = Utilities - .unEscapeURL((String) localObject2); - localObject1 = new RandomAccessFileOrArray( - (String) localObject2); - } else { - localObject1 = new RandomAccessFileOrArray(paramURL); - } - - int pageNums = TiffImage - .getNumberOfPages((RandomAccessFileOrArray) localObject1); - if (pageNums > 0) { - for (int i = 1; i <= pageNums; i++) { - localObject2 = TiffImage.getTiffImage( - (RandomAccessFileOrArray) localObject1, i); - image = (Image) localObject2; - } - } - if (localObject1 != null) { - ((RandomAccessFileOrArray) localObject1).close(); - } - - } finally { - if (localObject1 != null) { - ((RandomAccessFileOrArray) localObject1).close(); - } - } - } else if (file1.getName().endsWith(".png") - || file1.getName().endsWith(".jpg") - || file1.getName().endsWith(".gif") - || file1.getName().endsWith(".jpeg") - ) { - // 实例化图牿 - image = Image.getInstance(filePath); - } - // 获得图片的高庿 - float heigth = image.getHeight(); - float width = image.getWidth(); - // 合理压缩，h>w，按w压缩，否则按w压缩 - int percent = Jpg2PdfUtil.getPercent(heigth, width); - - // 设置图片居中显示 - image.setAlignment(Image.ALIGN_CENTER); - // 按百分比显示图片的比便 - if (width > 1024 || heigth > 786) { - image.scalePercent(percent + 5); - pageCount++; - //整张，把合成的高度置为0； - tempHeight = 0; - } else if (heigth < 786) { - if (tempHeight == 0) { - pageCount++; - } - tempHeight += heigth; - if (tempHeight > 786) { - pageCount++; - tempHeight = heigth; - } - } - doc.add(image); - } - } - } - scanAssortVos.get(j).setPageCount(pageCount); - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (doc.isOpen() && pageCount != 0) { - doc.close(); - } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (doc.isOpen() && pageCount != 0) { + doc.close(); } - byte[] bytes=baos.toByteArray(); - String filePath1 = Base64Utils.encodeToString(bytes); - scanAssortVos.get(j).setFilePath(filePath1); - } else { - scanAssortVos.get(j).setFilePath(""); } - ScanAssortVo1 vo1 = new ScanAssortVo1(); - BeanUtils.copyProperties(scanAssortVos.get(j), vo1); - scanAssortVos1.add(vo1); + byte[] bytes=baos.toByteArray(); + String filePath1 = Base64Utils.encodeToString(bytes); + scanAssortVos.get(j).setFilePath(filePath1); + } else { + scanAssortVos.get(j).setFilePath(""); } - } else { - return Msg.fail("查询无该记录!"); + ScanAssortVo1 vo1 = new ScanAssortVo1(); + BeanUtils.copyProperties(scanAssortVos.get(j), vo1); + scanAssortVos1.add(vo1); } - return Msg.success().add("list", scanAssortVos1); - } catch (Exception e) { - e.printStackTrace(); + } else { return Msg.fail("查询无该记录!"); } + return Msg.success().add("list", scanAssortVos1); } //字节码传对象 @@ -495,12 +472,7 @@ public class FontController { */ @RequestMapping(value = "updateTableCommom", method = RequestMethod.POST) @ResponseBody - public Msg updateTableCommom(CommomVo commom) { - try { - return fontService.updateTableCommom(commom); - } catch (Exception e) { - e.printStackTrace(); - return Msg.fail(e.getMessage()); - } + public Msg updateTableCommom(CommomVo commom) throws Exception{ + return fontService.updateTableCommom(commom); } } diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index 90372bf..9af7138 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/emr/controller/HisController.java b/src/main/java/com/emr/controller/HisController.java index 42065ca..0bf7914 100644 --- a/src/main/java/com/emr/controller/HisController.java +++ b/src/main/java/com/emr/controller/HisController.java @@ -60,49 +60,44 @@ public class HisController { private CommomService commomService; @PostMapping("saveProvincial") @ResponseBody - public ResultUtil saveProvincial(String patientId, HttpServletRequest request){ - try { - //查询基本信息 - String sql = "SELECT commomtable.*,commomtable1.*,t_charge.case_type FROM commomtable LEFT JOIN commomtable1 ON commomtable.patient_id = commomtable1.patient_id LEFT JOIN t_charge on commomtable.patient_id = t_charge.patient_id" + - " WHERE commomtable.patient_id = '"+ patientId +"'"; - List commomVos = commomMapper.selectAll(sql); - if(null != commomVos && !commomVos.isEmpty()){ - //查询一对多诊断记录 - List diags = diagMapper.selectAllByPatientId(patientId, null); - //查询一对多手术记录 - List operates = operateMapper.selectAllByPatientId(patientId, null); - //查询一对多婴儿记录 - List babies = babyMapper.selectAllByPatientId(patientId, null); - //查询一对多化疗记录 - List tTumourChemotherapies = tumourChemotherapyMapper.selectByPatientId(patientId); - //查询相关字典 - String typeCodes = "'sex_code','country','nation_code','marital_status','dept_code','quality_level','idDeadPsy_code','blood_type','rh_code','recordType_code'," + - "'job','admiss_type','clinicalRecord_code','isDrugAllergy_code','zd_dis_type','isAdmissPlan_code','pay_type','admiss_thing','cut_code','heal_code','anaesthesia','whether','operate_class','childbirthResult_code','childStatus_code','breath_code','radiotherapy_type_code','radiotherapy_program_code'," + - "'radiotherapy_device_code','chemotherapy_type_code','chemotherapy_method_code','curative_effect_code','cut_heal_grade'"; - List dictionarys = dictionaryMapper.getDictionaryByTypeCodes(typeCodes); - //查询用户列表 - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - List userList = commomService.getUserList(user.getUserName(), request); - CommomVo commomVo = commomVos.get(0); - //插入HIS_BA1基本信息表 - hisService.insertHisBa1(commomVo,dictionarys,userList,babies,operates.size()); - //插入HIS_BA6 HIS_病人转科情况 - hisService.insertHisBa2(commomVo,dictionarys); - //插入HIS_BA3 病人诊断信息 - hisService.insertHisBa3(commomVo,dictionarys,diags); - //插入HIS_BA4 病人手术信息 - hisService.insertHisBa4(commomVo,dictionarys,operates,userList); - //插入HIS_BA5 妇婴卡 - hisService.insertHisBa5(commomVo,dictionarys,babies); - //插入HIS_BA6 肿瘤卡 - hisService.insertHisBa6(commomVo,dictionarys); - //插入HIS_BA7 化疗卡 - hisService.insertHisBa7(commomVo,dictionarys,tTumourChemotherapies); - } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错,请联系系统管理员!"); + public ResultUtil saveProvincial(String patientId, HttpServletRequest request) throws Exception{ + //查询基本信息 + String sql = "SELECT commomtable.*,commomtable1.*,t_charge.case_type FROM commomtable LEFT JOIN commomtable1 ON commomtable.patient_id = commomtable1.patient_id LEFT JOIN t_charge on commomtable.patient_id = t_charge.patient_id" + + " WHERE commomtable.patient_id = '"+ patientId +"'"; + List commomVos = commomMapper.selectAll(sql); + if(null != commomVos && !commomVos.isEmpty()){ + //查询一对多诊断记录 + List diags = diagMapper.selectAllByPatientId(patientId, null); + //查询一对多手术记录 + List operates = operateMapper.selectAllByPatientId(patientId, null); + //查询一对多婴儿记录 + List babies = babyMapper.selectAllByPatientId(patientId, null); + //查询一对多化疗记录 + List tTumourChemotherapies = tumourChemotherapyMapper.selectByPatientId(patientId); + //查询相关字典 + String typeCodes = "'sex_code','country','nation_code','marital_status','dept_code','quality_level','idDeadPsy_code','blood_type','rh_code','recordType_code'," + + "'job','admiss_type','clinicalRecord_code','isDrugAllergy_code','zd_dis_type','isAdmissPlan_code','pay_type','admiss_thing','cut_code','heal_code','anaesthesia','whether','operate_class','childbirthResult_code','childStatus_code','breath_code','radiotherapy_type_code','radiotherapy_program_code'," + + "'radiotherapy_device_code','chemotherapy_type_code','chemotherapy_method_code','curative_effect_code','cut_heal_grade'"; + List dictionarys = dictionaryMapper.getDictionaryByTypeCodes(typeCodes); + //查询用户列表 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + List userList = commomService.getUserList(user.getUserName(), request); + CommomVo commomVo = commomVos.get(0); + //插入HIS_BA1基本信息表 + hisService.insertHisBa1(commomVo,dictionarys,userList,babies,operates.size()); + //插入HIS_BA6 HIS_病人转科情况 + hisService.insertHisBa2(commomVo,dictionarys); + //插入HIS_BA3 病人诊断信息 + hisService.insertHisBa3(commomVo,dictionarys,diags); + //插入HIS_BA4 病人手术信息 + hisService.insertHisBa4(commomVo,dictionarys,operates,userList); + //插入HIS_BA5 妇婴卡 + hisService.insertHisBa5(commomVo,dictionarys,babies); + //插入HIS_BA6 肿瘤卡 + hisService.insertHisBa6(commomVo,dictionarys); + //插入HIS_BA7 化疗卡 + hisService.insertHisBa7(commomVo,dictionarys,tTumourChemotherapies); } + return ResultUtil.ok(); } } diff --git a/src/main/java/com/emr/controller/ImageController.java b/src/main/java/com/emr/controller/ImageController.java index 7587cbd..009ce5f 100644 --- a/src/main/java/com/emr/controller/ImageController.java +++ b/src/main/java/com/emr/controller/ImageController.java @@ -73,7 +73,7 @@ public class ImageController{ try { //文件存储输出流 com.sun.media.jai.codec.JPEGEncodeParam param = new JPEGEncodeParam(); - ImageEncoder image = ImageCodec.createImageEncoder("JPEG", out, param); //指定输出格式 + ImageEncoder image = ImageCodec.createImageEncoder("JPEG", out, param); //指定输出格式 image.encode(rd); //解析输出流进行输出 out.close(); diff --git a/src/main/java/com/emr/controller/TTumourController.java b/src/main/java/com/emr/controller/TTumourController.java index 9472b73..ccc7d55 100644 --- a/src/main/java/com/emr/controller/TTumourController.java +++ b/src/main/java/com/emr/controller/TTumourController.java @@ -118,47 +118,32 @@ public class TTumourController { //加载肿瘤信息 @RequestMapping("loadTumourInfo") @ResponseBody - public ResultUtil loadTumourInfo(String patientId){ - try { - CommomVo commomVos = commomMapper.selectTumourByPatientId(patientId); - if(null != commomVos){ - return ResultUtil.ok(commomVos); - }else{ - return ResultUtil.error(); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("查询出错了,请联系系统管理员!"); + public ResultUtil loadTumourInfo(String patientId) throws Exception{ + CommomVo commomVos = commomMapper.selectTumourByPatientId(patientId); + if(null != commomVos){ + return ResultUtil.ok(commomVos); + }else{ + return ResultUtil.error(); } } //加载肿瘤化疗信息 @RequestMapping("loadChemotherapyInfo") @ResponseBody - public ResultUtil loadChemotherapyInfo(String patientId){ - try { - List tTumourChemotherapies = tumourChemotherapyMapper.selectByPatientId(patientId); - if(null != tTumourChemotherapies && !tTumourChemotherapies.isEmpty()){ - return ResultUtil.ok(tTumourChemotherapies); - }else{ - return ResultUtil.error(); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("查询出错了,请联系系统管理员"); + public ResultUtil loadChemotherapyInfo(String patientId) throws Exception{ + List tTumourChemotherapies = tumourChemotherapyMapper.selectByPatientId(patientId); + if(null != tTumourChemotherapies && !tTumourChemotherapies.isEmpty()){ + return ResultUtil.ok(tTumourChemotherapies); + }else{ + return ResultUtil.error(); } } //保存肿瘤信息 @RequestMapping("saveTumour") @ResponseBody - public ResultUtil saveTumour(TTumourVo tumourVo, HttpServletRequest request){ - try { - tumourService.saveTumour(tumourVo,request); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存失败,请联系系统管理员!"); - } + public ResultUtil saveTumour(TTumourVo tumourVo, HttpServletRequest request) throws Exception{ + tumourService.saveTumour(tumourVo,request); + return ResultUtil.ok(); } } diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index dfc823a..ada5ff0 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -417,20 +417,15 @@ public class CommomSearchController { */ @RequestMapping("getAssortList") @ResponseBody - public ResultUtil getAssortList(HttpServletRequest request) { - try { - Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); - List zdAssorts = new ArrayList<>(); - if (user.getRoleId() == 0 || user.getRoleId() == -100) { - zdAssorts = assortMapper.selectAll(new Zd_Assort()); - } else { - zdAssorts = assortMapper.selectAllAndUserReaderByUserIdAndRoleId(user.getUserId(), user.getRoleId()); - } - return ResultUtil.ok(zdAssorts); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("查询图片分类出错了,请联系系统管理员!"); + public ResultUtil getAssortList(HttpServletRequest request) throws Exception{ + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + List zdAssorts = new ArrayList<>(); + if (user.getRoleId() == 0 || user.getRoleId() == -100) { + zdAssorts = assortMapper.selectAll(new Zd_Assort()); + } else { + zdAssorts = assortMapper.selectAllAndUserReaderByUserIdAndRoleId(user.getUserId(), user.getRoleId()); } + return ResultUtil.ok(zdAssorts); } /** @@ -507,7 +502,7 @@ public class CommomSearchController { @OptionalLog(module = "保存",methods = "病案信息修改") @RequestMapping("updateCommomInfo") @ResponseBody - public ResultUtil updateCommomInfo(CommomVo commomVo){ + public ResultUtil updateCommomInfo(CommomVo commomVo) throws Exception{ if (null != commomVo.getInpatientNo()){ int vo = commomMapper.selectCountByPatients(commomVo.getPatientId()); if (vo > 0){ @@ -1124,25 +1119,20 @@ public class CommomSearchController { @OptionalLog(module = "修改", methods = "档案预览页面病案图片重新分类") @RequestMapping(value = "updateScanAssort") @ResponseBody - public ResultUtil updateScanAssort(String patientId, String assortIds, Integer index, String newAssortId) { + public ResultUtil updateScanAssort(String patientId, String assortIds, Integer index, String newAssortId) throws Exception{ if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds) && null != index && StringUtils.isNoneBlank(newAssortId)) { - try { - //根据index:当前pdf页数，patientId，admissIds获取pdf信息 - List scanPathVos = getPdfPathVo(index, patientId, assortIds); - List list = new ArrayList<>(); - if (null != scanPathVos && !scanPathVos.isEmpty()) { - for (ScanPathVo scanPathVo : scanPathVos) { - list.add(scanPathVo.getScanPage()); - } - //批量更新 - scanAssortService.SimpleUpdate(patientId, newAssortId, list); - return ResultUtil.ok(); - } else { - return ResultUtil.error("无图片"); + //根据index:当前pdf页数，patientId，admissIds获取pdf信息 + List scanPathVos = getPdfPathVo(index, patientId, assortIds); + List list = new ArrayList<>(); + if (null != scanPathVos && !scanPathVos.isEmpty()) { + for (ScanPathVo scanPathVo : scanPathVos) { + list.add(scanPathVo.getScanPage()); } - } catch (Exception e) { - e.printStackTrace(); - return null; + //批量更新 + scanAssortService.SimpleUpdate(patientId, newAssortId, list); + return ResultUtil.ok(); + } else { + return ResultUtil.error("无图片"); } } return null; @@ -1165,17 +1155,21 @@ public class CommomSearchController { @OptionalLog(module = "修改", methods = "档案预览页面病案图片重新分类",fieldName = "name",tableName = "commomtable") @RequestMapping(value = "updateScanAssortByBlood", method = RequestMethod.POST) @ResponseBody - public ResultUtil updateScanAssortByBlood(CommomVo commomVo,String assortIds, String newAssortId) { + public ResultUtil updateScanAssortByBlood(CommomVo commomVo,String assortIds, String newAssortId) throws Exception{ if (StringUtils.isNoneBlank(commomVo.getPatientId()) && StringUtils.isNoneBlank(assortIds) && StringUtils.isNoneBlank(newAssortId)) { - try { - //根据patientId，admissIds(scanPage分类图片集合)批量更新分段id assrotdId - //批量更新 - scanAssortService.SimpleUpdateByPatientIdAndScanPages(commomVo.getPatientId(), newAssortId, assortIds); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return null; + //根据patientId，admissIds(scanPage分类图片集合)批量更新分段id assrotdId + //组织picNames + String picNameStr = ""; + String[] picNames = assortIds.split(","); + for(String picName : picNames){ + if(StringUtils.isNotBlank(picName)){ + picNameStr += "'" + picName + "',"; + } } + picNameStr = picNameStr.substring(0,picNameStr.length()-1); + //批量更新 + scanAssortService.SimpleUpdateByPatientIdAndScanPages(commomVo.getPatientId(), newAssortId, picNameStr); + return ResultUtil.ok(); } return null; } @@ -1449,56 +1443,50 @@ public class CommomSearchController { @RequestMapping("addCodeType") @ResponseBody public ResultUtil addCodeType(Emr_Code_Type codeType, Integer index, String patientId, String assortIds, - HttpServletRequest request) { + HttpServletRequest request) throws Exception{ if (StringUtils.isBlank(assortIds)) { return ResultUtil.error("没有分段数据,请先在用户分配调阅里添加并分配分段数据!"); } if (StringUtils.isNoneBlank(patientId) && null != index) { - try { - //验证标志和名称都不能重复 - Emr_Code_Type isExistFlag = codeTypeMapper.checkFlagAndNameIsExist(codeType.getTypeFlag(), null); - Emr_Code_Type isExistName = codeTypeMapper.checkFlagAndNameIsExist(null, codeType.getTypeName()); - if (codeType.getId() == null) { - if (isExistFlag == null) { - if (isExistName == null) { - //新增 - codeType.setPatientId(patientId); - //根据index:当前pdf页数，patientId，admissIds获取pdf信息 - List scanPathVo = getPdfPathVo(index, patientId, assortIds); - if (null != scanPathVo && !scanPathVo.isEmpty()) { - codeType.setAssortId(scanPathVo.get(0).getAssortId()); - codeType.setScanPage(scanPathVo.get(0).getScanPage()); - } else { - return ResultUtil.error("图片不存在!"); - } - codeTypeService.addCodeType(codeType, request); - return ResultUtil.ok(); + //验证标志和名称都不能重复 + Emr_Code_Type isExistFlag = codeTypeMapper.checkFlagAndNameIsExist(codeType.getTypeFlag(), null); + Emr_Code_Type isExistName = codeTypeMapper.checkFlagAndNameIsExist(null, codeType.getTypeName()); + if (codeType.getId() == null) { + if (isExistFlag == null) { + if (isExistName == null) { + //新增 + codeType.setPatientId(patientId); + //根据index:当前pdf页数，patientId，admissIds获取pdf信息 + List scanPathVo = getPdfPathVo(index, patientId, assortIds); + if (null != scanPathVo && !scanPathVo.isEmpty()) { + codeType.setAssortId(scanPathVo.get(0).getAssortId()); + codeType.setScanPage(scanPathVo.get(0).getScanPage()); } else { - return ResultUtil.error("类别名称不能重复!"); + return ResultUtil.error("图片不存在!"); } + codeTypeService.addCodeType(codeType, request); + return ResultUtil.ok(); } else { - return ResultUtil.error("类别标志不能重复!"); + return ResultUtil.error("类别名称不能重复!"); } } else { - if (null != isExistName && !isExistName.getId().equals(codeType.getId())) { - return ResultUtil.error("类别名称不能重复!"); + return ResultUtil.error("类别标志不能重复!"); + } + } else { + if (null != isExistName && !isExistName.getId().equals(codeType.getId())) { + return ResultUtil.error("类别名称不能重复!"); + } else { + if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) { + return ResultUtil.error("类别标志不能重复!"); } else { - if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) { - return ResultUtil.error("类别标志不能重复!"); - } else { - //修改 - codeTypeService.updateCodeType(codeType, request); - return ResultUtil.ok(); - } + //修改 + codeTypeService.updateCodeType(codeType, request); + return ResultUtil.ok(); } } - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); } - } else { - return null; } + return null; } /** @@ -1517,14 +1505,9 @@ public class CommomSearchController { @OptionalLog(module = "删除", methods = "编码类别", fieldName = "typeName", tableName = "emr_code_type") @RequestMapping(value = "delCodeTypeById/{id}") @ResponseBody - public ResultUtil delCodeTypeById(@PathVariable("id") Integer id) { - try { - codeTypeService.deleteByPrimaryKey(id); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil delCodeTypeById(@PathVariable("id") Integer id) throws Exception{ + codeTypeService.deleteByPrimaryKey(id); + return ResultUtil.ok(); } /********************************************手术编码*******************************************************/ @@ -1543,14 +1526,9 @@ public class CommomSearchController { @RequiresPermissions("/commom/addOperCode") @RequestMapping(value = "addDiagCode") @ResponseBody - public ResultUtil addDiagCode(String patientId, String diagNos, String diagNames, String diagCodes, String inhospstats) { - try { - diagService.addDiagCode(patientId, diagNos, diagNames, diagCodes, inhospstats); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil addDiagCode(String patientId, String diagNos, String diagNames, String diagCodes, String inhospstats) throws Exception{ + diagService.addDiagCode(patientId, diagNos, diagNames, diagCodes, inhospstats); + return ResultUtil.ok(); } /** @@ -1567,19 +1545,15 @@ public class CommomSearchController { */ @RequestMapping(value = "checkOperateNo") @ResponseBody - public ResultUtil checkOperateNo(String patientId, Short operateNo) { + public ResultUtil checkOperateNo(String patientId, Short operateNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && operateNo != null) { - try { - //根据patientId和手术编码查询手术编码集合 - List operates = operateService.selectAllByPatientId(patientId, operateNo); - if (operates != null && !operates.isEmpty()) { - //存在 - return ResultUtil.error(); - } else { - return ResultUtil.ok(); - } - } catch (Exception e) { - e.printStackTrace(); + //根据patientId和手术编码查询手术编码集合 + List operates = operateService.selectAllByPatientId(patientId, operateNo); + if (operates != null && !operates.isEmpty()) { + //存在 + return ResultUtil.error(); + } else { + return ResultUtil.ok(); } } return ResultUtil.error(); @@ -1599,15 +1573,10 @@ public class CommomSearchController { */ @RequestMapping(value = "getOperByCodeOrName", produces = {"text/json;charset=UTF-8"}) @ResponseBody - public String getOperByCodeOrName(String code, String name) { + public String getOperByCodeOrName(String code, String name) throws Exception{ //根据手术编码和名称查询手术编码对象 - try { - List cm3s = cm3Mapper.selectAll(code, name); - return JSON.toJSONString(cm3s); - } catch (Exception e) { - e.printStackTrace(); - return null; - } + List cm3s = cm3Mapper.selectAll(code, name); + return JSON.toJSONString(cm3s); } /** @@ -1626,37 +1595,32 @@ public class CommomSearchController { @OptionalLog(module = "新增", methods = "手术编码", fieldName = "operateName") @RequestMapping(value = "saveOperCode") @ResponseBody - public ResultUtil saveOperCode(T_Operate operate, Integer isUpdateOperNo, HttpServletRequest request) { - try { - if (operate.getCurrentOperateNo() == null) { - //新增 - boolean flag = FormTokenFlagUtil.isFlag(request); - if (!flag) { - return ResultUtil.error("请不要重复提交!"); - } - operateService.insert(operate); - } else { - //修改 - if (isUpdateOperNo == 1) { - //有修改手术序号 - //查询手术序号是否存在 - List operates = operateService.selectAllByPatientId(operate.getPatientId(), operate.getOperateNo()); - if (null != operates && !operates.isEmpty()) { - //存在 - return ResultUtil.error("该手术序号已存在!"); - } else { - operateService.updateByPrimaryKeySelective(operate); - } + public ResultUtil saveOperCode(T_Operate operate, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{ + if (operate.getCurrentOperateNo() == null) { + //新增 + boolean flag = FormTokenFlagUtil.isFlag(request); + if (!flag) { + return ResultUtil.error("请不要重复提交!"); + } + operateService.insert(operate); + } else { + //修改 + if (isUpdateOperNo == 1) { + //有修改手术序号 + //查询手术序号是否存在 + List operates = operateService.selectAllByPatientId(operate.getPatientId(), operate.getOperateNo()); + if (null != operates && !operates.isEmpty()) { + //存在 + return ResultUtil.error("该手术序号已存在!"); } else { - //手术序号一样 operateService.updateByPrimaryKeySelective(operate); } + } else { + //手术序号一样 + operateService.updateByPrimaryKeySelective(operate); } - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); } + return ResultUtil.ok(); } /** @@ -1675,15 +1639,10 @@ public class CommomSearchController { @OptionalLog(module = "删除", methods = "手术编码", fieldName = "operateName", tableName = "t_operate") @RequestMapping(value = "deleteOperCodeByPatientIdAndOperNo") @ResponseBody - public ResultUtil deleteOperCodeByPatientIdAndOperNo(String patientId, Short operateNo) { + public ResultUtil deleteOperCodeByPatientIdAndOperNo(String patientId, Short operateNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && null != operateNo) { - try { - operateService.deleteOperCodeByPatientIdAndOperNo(patientId, operateNo); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + operateService.deleteOperCodeByPatientIdAndOperNo(patientId, operateNo); + return ResultUtil.ok(); } else { return ResultUtil.error(); } @@ -1704,14 +1663,9 @@ public class CommomSearchController { @RequiresPermissions("/commom/addOperCode") @RequestMapping(value = "addOperCode") @ResponseBody - public ResultUtil addOperCode(String patientId, String operNos, String operDates, String operCodes, String operNames, String operateClasses, String operators, String assistant1s, String assistant2s, String cuts, String chossurgs, String anaesthesiaTypes, String anaesthesiaNames) { - try { - operateService.addOperCode(patientId, operNos, operDates, operCodes, operNames, operateClasses, operators, assistant1s, assistant2s, cuts, chossurgs, anaesthesiaTypes, anaesthesiaNames); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil addOperCode(String patientId, String operNos, String operDates, String operCodes, String operNames, String operateClasses, String operators, String assistant1s, String assistant2s, String cuts, String chossurgs, String anaesthesiaTypes, String anaesthesiaNames) throws Exception{ + operateService.addOperCode(patientId, operNos, operDates, operCodes, operNames, operateClasses, operators, assistant1s, assistant2s, cuts, chossurgs, anaesthesiaTypes, anaesthesiaNames); + return ResultUtil.ok(); } /** @@ -1728,14 +1682,9 @@ public class CommomSearchController { */ @RequestMapping(value = "getDictionaryByTypeCode", produces = {"text/json;charset=UTF-8"}) @ResponseBody - public String getDictionaryByTypeCode(String typeCode) { - try { - List dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode); - return JSON.toJSONString(dictionaries); - } catch (Exception e) { - e.printStackTrace(); - return null; - } + public String getDictionaryByTypeCode(String typeCode) throws Exception{ + List dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode); + return JSON.toJSONString(dictionaries); } /** @@ -1752,14 +1701,9 @@ public class CommomSearchController { */ @RequestMapping(value = "getIcdCodeList", produces = {"text/json;charset=UTF-8"}) @ResponseBody - public String getIcdCodeList() { - try { - List icdCodes = icdCodeMapper.selectAll(null, null); - return JSON.toJSONString(icdCodes); - } catch (Exception e) { - e.printStackTrace(); - return null; - } + public String getIcdCodeList() throws Exception{ + List icdCodes = icdCodeMapper.selectAll(null, null); + return JSON.toJSONString(icdCodes); } /** @@ -1776,14 +1720,9 @@ public class CommomSearchController { */ @RequestMapping(value = "getIcdCodeByCodeOrName", produces = {"text/json;charset=UTF-8"}) @ResponseBody - public String getIcdCodeByCodeOrName(String code, String name) { - try { - List icdCodes = icdCodeMapper.selectAll(code, name); - return JSON.toJSONString(icdCodes); - } catch (Exception e) { - e.printStackTrace(); - return null; - } + public String getIcdCodeByCodeOrName(String code, String name) throws Exception{ + List icdCodes = icdCodeMapper.selectAll(code, name); + return JSON.toJSONString(icdCodes); } /** @@ -1800,18 +1739,14 @@ public class CommomSearchController { */ @RequestMapping(value = "checkDiagNo") @ResponseBody - public ResultUtil checkDiagNo(String patientId, Short diagNo) { + public ResultUtil checkDiagNo(String patientId, Short diagNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && diagNo != null) { - try { - List diags = diagService.selectAllByPatientId(patientId, diagNo); - if (diags != null && !diags.isEmpty()) { - //存在 - return ResultUtil.error(); - } else { - return ResultUtil.ok(); - } - } catch (Exception e) { - e.printStackTrace(); + List diags = diagService.selectAllByPatientId(patientId, diagNo); + if (diags != null && !diags.isEmpty()) { + //存在 + return ResultUtil.error(); + } else { + return ResultUtil.ok(); } } return ResultUtil.error(); @@ -1833,37 +1768,32 @@ public class CommomSearchController { @OptionalLog(module = "保存", methods = "西医诊断编码", fieldName = "diagName") @RequestMapping(value = "saveDiag") @ResponseBody - public ResultUtil saveDiag(T_Diag diag, Integer isUpdateOperNo, HttpServletRequest request) { - try { - if (diag.getCurrentDiagNo() == null) { - //新增 - boolean flag = FormTokenFlagUtil.isFlag(request); - if (!flag) { - return ResultUtil.error("请不要重复提交!"); - } - diagService.insert(diag); - } else { - //修改 - if (isUpdateOperNo == 1) { - //有修改序号 - //查询序号是否存在 - List diags = diagService.selectAllByPatientId(diag.getPatientId(), diag.getDiagNo()); - if (null != diags && !diags.isEmpty()) { - //存在 - return ResultUtil.error("该诊断序号已存在！"); - } else { - diagService.updateByPrimaryKeySelective(diag); - } + public ResultUtil saveDiag(T_Diag diag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{ + if (diag.getCurrentDiagNo() == null) { + //新增 + boolean flag = FormTokenFlagUtil.isFlag(request); + if (!flag) { + return ResultUtil.error("请不要重复提交!"); + } + diagService.insert(diag); + } else { + //修改 + if (isUpdateOperNo == 1) { + //有修改序号 + //查询序号是否存在 + List diags = diagService.selectAllByPatientId(diag.getPatientId(), diag.getDiagNo()); + if (null != diags && !diags.isEmpty()) { + //存在 + return ResultUtil.error("该诊断序号已存在！"); } else { - //诊断序号一样 diagService.updateByPrimaryKeySelective(diag); } + } else { + //诊断序号一样 + diagService.updateByPrimaryKeySelective(diag); } - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); } + return ResultUtil.ok(); } /*****************************************中医诊断********************************************************/ @@ -1883,15 +1813,10 @@ public class CommomSearchController { @OptionalLog(module = "删除", methods = "西医诊断编码", fieldName = "diagName", tableName = "t_diag") @RequestMapping(value = "deleteCodeByPatientIdAndDiagNo") @ResponseBody - public ResultUtil deleteCodeByPatientIdAndDiagNo(String patientId, Short diagNo) { + public ResultUtil deleteCodeByPatientIdAndDiagNo(String patientId, Short diagNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && null != diagNo) { - try { - diagService.deleteDiagByPatientIdAndDiagNo(patientId, diagNo); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + diagService.deleteDiagByPatientIdAndDiagNo(patientId, diagNo); + return ResultUtil.ok(); } else { return ResultUtil.error(); } @@ -1911,18 +1836,14 @@ public class CommomSearchController { */ @RequestMapping(value = "checkHerbNo") @ResponseBody - public ResultUtil checkHerbNo(String patientId, Short herbNo) { + public ResultUtil checkHerbNo(String patientId, Short herbNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && herbNo != null) { - try { - List herbDiags = herbDiagService.selectAllByPatientId(patientId, herbNo); - if (herbDiags != null && !herbDiags.isEmpty()) { - //存在 - return ResultUtil.error(); - } else { - return ResultUtil.ok(); - } - } catch (Exception e) { - e.printStackTrace(); + List herbDiags = herbDiagService.selectAllByPatientId(patientId, herbNo); + if (herbDiags != null && !herbDiags.isEmpty()) { + //存在 + return ResultUtil.error(); + } else { + return ResultUtil.ok(); } } return ResultUtil.error(); @@ -1944,37 +1865,32 @@ public class CommomSearchController { @OptionalLog(module = "保存", methods = "中医诊断编码", fieldName = "herbName") @RequestMapping(value = "saveHerbDiag") @ResponseBody - public ResultUtil saveHerbDiag(T_Herb_Diag herbDiag, Integer isUpdateOperNo, HttpServletRequest request) { - try { - if (herbDiag.getCurrentHerbDiagNo() == null) { - //新增 - boolean flag = FormTokenFlagUtil.isFlag(request); - if (!flag) { - return ResultUtil.error("请不要重复提交!"); - } - herbDiagService.insert(herbDiag); - } else { - //修改 - if (isUpdateOperNo == 1) { - //有修改序号 - //查询序号是否存在 - List herbDiags = herbDiagService.selectAllByPatientId(herbDiag.getPatientId(), herbDiag.getHerbNo()); - if (null != herbDiags && !herbDiags.isEmpty()) { - //存在 - return ResultUtil.error("该诊断序号已存在！"); - } else { - herbDiagService.updateByPrimaryKeySelective(herbDiag); - } + public ResultUtil saveHerbDiag(T_Herb_Diag herbDiag, Integer isUpdateOperNo, HttpServletRequest request) throws Exception{ + if (herbDiag.getCurrentHerbDiagNo() == null) { + //新增 + boolean flag = FormTokenFlagUtil.isFlag(request); + if (!flag) { + return ResultUtil.error("请不要重复提交!"); + } + herbDiagService.insert(herbDiag); + } else { + //修改 + if (isUpdateOperNo == 1) { + //有修改序号 + //查询序号是否存在 + List herbDiags = herbDiagService.selectAllByPatientId(herbDiag.getPatientId(), herbDiag.getHerbNo()); + if (null != herbDiags && !herbDiags.isEmpty()) { + //存在 + return ResultUtil.error("该诊断序号已存在！"); } else { - //诊断序号一样 herbDiagService.updateByPrimaryKeySelective(herbDiag); } + } else { + //诊断序号一样 + herbDiagService.updateByPrimaryKeySelective(herbDiag); } - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); } + return ResultUtil.ok(); } /** @@ -1993,15 +1909,10 @@ public class CommomSearchController { @OptionalLog(module = "删除", methods = "中医诊断编码", fieldName = "herbName", tableName = "t_herb_diag") @RequestMapping(value = "deleteCodeByPatientIdAndHerbNo") @ResponseBody - public ResultUtil deleteCodeByPatientIdAndHerbNo(String patientId, Short herbNo) { + public ResultUtil deleteCodeByPatientIdAndHerbNo(String patientId, Short herbNo) throws Exception{ if (StringUtils.isNoneBlank(patientId) && null != herbNo) { - try { - herbDiagService.deleteHerbDiagByPatientIdAndHerbNo(patientId, herbNo); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + herbDiagService.deleteHerbDiagByPatientIdAndHerbNo(patientId, herbNo); + return ResultUtil.ok(); } else { return ResultUtil.error(); } @@ -2119,17 +2030,12 @@ public class CommomSearchController { @RequiresPermissions("/commom/updatePic") @RequestMapping(value = "updatePic", method = RequestMethod.POST) @ResponseBody - public ResultUtil updatePic(CommomVo commomVo,@RequestParam(required = false, value = "files") MultipartFile[] files,String assortId) { - try { - String str = commomService.updatePic(files, commomVo.getPatientId(), assortId); - if(StringUtils.isNotBlank(str)){ - return ResultUtil.error(str); - } - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("上传出错了,请联系系统管理员!"); + public ResultUtil updatePic(CommomVo commomVo,@RequestParam(required = false, value = "files") MultipartFile[] files,String assortId) throws Exception{ + ResultUtil resultUtil = commomService.updatePic(files, commomVo.getPatientId(), assortId); + if(!resultUtil.getCode().equals(0)){ + return resultUtil; } + return ResultUtil.ok(); } /** @@ -2148,17 +2054,12 @@ public class CommomSearchController { @OptionalLog(module = "删除", methods = "档案预览页面删除病案图片",fieldName = "name",tableName = "commomtable") @RequestMapping(value = "delScanAssortByBlood", method = RequestMethod.POST) @ResponseBody - public ResultUtil delScanAssortByBlood(String patientId) { + public ResultUtil delScanAssortByBlood(String patientId) throws Exception{ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String assortIds = request.getParameter("assortIds"); if (StringUtils.isNoneBlank(patientId) && StringUtils.isNoneBlank(assortIds)) { - try { - scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } + scanAssortService.SimpleDelByPatientIdAndScanPages(patientId, assortIds); + return ResultUtil.ok(); } return null; } @@ -2180,14 +2081,9 @@ public class CommomSearchController { @RequiresPermissions("/commom/addReMark") @RequestMapping(value="updateRecordReMark",method = RequestMethod.POST) @ResponseBody - public ResultUtil updateRecordReMark(CommomVo commomVo){ - try { - commomMapper.updateRecordReMark(commomVo); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("修改失败,请联系系统管理员!"); - } + public ResultUtil updateRecordReMark(CommomVo commomVo) throws Exception{ + commomService.updateRecordReMark(commomVo); + return ResultUtil.ok(); } /**************************病案备注结束*******************************/ /**************************恢复已删除图片开始*************************/ @@ -2282,18 +2178,36 @@ public class CommomSearchController { @RequiresPermissions("/commom/recoverPic") @RequestMapping(value="recoverPic",method = RequestMethod.POST) @ResponseBody - public ResultUtil recoverPic(CommomVo commomVo,String scanPages) { - try { - scanAssortService.recoverPic(commomVo.getPatientId(),scanPages); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(e.getMessage()); - } + public ResultUtil recoverPic(CommomVo commomVo,String scanPages) throws Exception{ + scanAssortService.recoverPic(commomVo.getPatientId(),scanPages); + return ResultUtil.ok(); } /**************************恢复已删除图片结束***********************/ /**************************病案维护开始*****************************/ + /** + * 验证编号和协议号是否存在 + * @param commomBlood + * @return + * @throws Exception + */ //脐血库 + @RequestMapping("validExistForm") + @ResponseBody + public ResultUtil validExistForm(CommomBlood commomBlood) throws Exception{ + String patientId = commomBlood.getPatientId(); + commomBlood.setPatientId(null); + FontCommom commom = new FontCommom(); + BeanUtils.copyProperties(commomBlood,commom); + List list = commomMapper.isExistInpatient(commom); + if(!CollectionUtils.isEmpty(list)){ + //修改的情况，同一份病案返回成功 + if(StringUtils.isNotBlank(patientId) && list.get(0).getPatientId().equals(patientId)){ + return ResultUtil.ok(); + } + return ResultUtil.ok("已存在"); + } + return ResultUtil.ok(); + } /** * 脐血库新增档案 * @param commomBlood @@ -2302,7 +2216,7 @@ public class CommomSearchController { */ @OptionalLog(module = "新增", methods = "新增档案") @RequiresPermissions("/commom/addRecord") - @RequestMapping("addRecord") + @RequestMapping(value="addRecord",method = RequestMethod.POST) @ResponseBody public ResultUtil addRecordBlood(@Valid CommomBlood commomBlood,HttpServletRequest request) throws Exception{ //判断formToken @@ -2310,17 +2224,25 @@ public class CommomSearchController { if(!flag){ return ResultUtil.error("请不要重复提交!"); } - //判断脐血编号不为空 - if(StringUtils.isBlank(commomBlood.getInpatientNo())){ - return ResultUtil.error("脐血编号不能为空!"); + //判断表单不为空和不可重复的字段 + ResultUtil result = validFieldOper(commomBlood); + if(!result.getCode().equals(0)){ + return result; } - //判断孕妇姓名不为空 - if(StringUtils.isBlank(commomBlood.getName())){ - return ResultUtil.error("孕妇姓名不能为空!"); + //进入添加病案方法 + ResultUtil resultUtil = commomService.addRecordBlood(commomBlood, request); + //有错误返回错误信息 + if(!resultUtil.getCode().equals(0)){ + return resultUtil; } - commomService.addRecordBlood(commomBlood); return ResultUtil.ok(); } + + /** + * 加载分类树 + * @param request + * @return + */ @RequestMapping("selectRecordTree") @ResponseBody public List selectRecordTree(HttpServletRequest request){ @@ -2346,5 +2268,72 @@ public class CommomSearchController { return null; } } + + //判断表单不为空和不可重复的字段 + private ResultUtil validFieldOper(CommomBlood commomBlood) throws Exception{ + String patientId = commomBlood.getPatientId(); + //判断脐血编号不为空 + String inpatientNo = commomBlood.getInpatientNo(); + if(StringUtils.isBlank(inpatientNo)){ + return ResultUtil.error("脐血编号不能为空!"); + }else{ + FontCommom commom = new FontCommom(); + commom.setInpatientNo(inpatientNo); + List list = commomMapper.isExistInpatient(commom); + if(!CollectionUtils.isEmpty(list)){ + if(StringUtils.isNotBlank(patientId)){ + if(list.get(0).getPatientId().equals(patientId)){ + return ResultUtil.ok(); + } + } + return ResultUtil.error("脐血编号已存在!"); + } + } + //验证协议号是否存在 + String admissId = commomBlood.getAdmissId(); + if(StringUtils.isNotBlank(admissId)){ + FontCommom commom = new FontCommom(); + commom.setAdmissId(admissId); + List list = commomMapper.isExistInpatient(commom); + if(!CollectionUtils.isEmpty(list)){ + if(StringUtils.isNotBlank(patientId)){ + if(list.get(0).getPatientId().equals(patientId)){ + return ResultUtil.ok(); + } + } + return ResultUtil.error("协议号已存在!"); + } + } + //判断孕妇姓名不为空 + if(StringUtils.isBlank(commomBlood.getName())){ + return ResultUtil.error("孕妇姓名不能为空!"); + } + return ResultUtil.ok(); + } + + @OptionalLog(module = "修改", methods = "修改档案",fieldName = "name",tableName = "commomtable") + @RequiresPermissions("/commom/updateRecord") + @RequestMapping(value="updateRecordBlood",method = RequestMethod.POST) + @ResponseBody + public ResultUtil updateRecordBlood(CommomBlood commomBlood) throws Exception{ + //判断表单不为空和不可重复的字段 + ResultUtil resultUtil = validFieldOper(commomBlood); + if(!resultUtil.getCode().equals(0)){ + return resultUtil; + } + CommomVo commomVo = new CommomVo(); + BeanUtils.copyProperties(commomBlood,commomVo); + commomService.updateRecord(commomVo); + return ResultUtil.ok(); + } + + @OptionalLog(module = "删除", methods = "删除档案",fieldName = "name",tableName = "commomtable") + @RequiresPermissions("/commom/deleteRecord") + @RequestMapping(value="deleteRecordBlood",method = RequestMethod.POST) + @ResponseBody + public ResultUtil deleteRecordBlood(String patientId) throws Exception{ + commomService.deleteRecord(patientId); + return ResultUtil.ok(); + } /**************************病案维护结束*****************************/ } diff --git a/src/main/java/com/emr/controller/distributionManage/DistributionController.java b/src/main/java/com/emr/controller/distributionManage/DistributionController.java index 69572c9..9bc90dc 100644 --- a/src/main/java/com/emr/controller/distributionManage/DistributionController.java +++ b/src/main/java/com/emr/controller/distributionManage/DistributionController.java @@ -173,16 +173,11 @@ public class DistributionController { */ @RequestMapping("checkAssortName") @ResponseBody - public ResultUtil checkAssortName(String assortName){ - try { - Zd_Assort assort = assortMapper.checkAssortName(assortName); - if(assort == null){ - return ResultUtil.ok(); - }else{ - return ResultUtil.error(); - } - }catch (Exception e){ - e.printStackTrace(); + public ResultUtil checkAssortName(String assortName) throws Exception{ + Zd_Assort assort = assortMapper.checkAssortName(assortName); + if(assort == null){ + return ResultUtil.ok(); + }else{ return ResultUtil.error(); } } @@ -202,34 +197,29 @@ public class DistributionController { @OptionalLog(module = "保存",methods = "调阅分段信息",fieldName = "assortName") @RequestMapping("saveDistribution") @ResponseBody - public ResultUtil saveDistribution(Zd_Assort assort,HttpServletRequest request){ - try{ - if(StringUtils.isBlank(assort.getAssortId())){ - Zd_Assort assorts = assortMapper.checkAssortName(assort.getAssortName()); - if(assorts != null){ - return ResultUtil.error("名称已存在!"); - } - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - //添加 - assortService.insert(assort); - }else{ - return ResultUtil.error("请不要重复提交!"); - } + public ResultUtil saveDistribution(Zd_Assort assort,HttpServletRequest request) throws Exception{ + if(StringUtils.isBlank(assort.getAssortId())){ + Zd_Assort assorts = assortMapper.checkAssortName(assort.getAssortName()); + if(assorts != null){ + return ResultUtil.error("名称已存在!"); + } + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + //添加 + assortService.insert(assort); }else{ - //修改 - Zd_Assort existAssort = assortMapper.checkAssortName(assort.getAssortName()); - if(null != existAssort && !existAssort.getAssortId().equals(assort.getAssortId())){ - return ResultUtil.error("名称已存在!"); - }else{ - assortService.updateByPrimaryKeySelective(assort); - } + return ResultUtil.error("请不要重复提交!"); + } + }else{ + //修改 + Zd_Assort existAssort = assortMapper.checkAssortName(assort.getAssortName()); + if(null != existAssort && !existAssort.getAssortId().equals(assort.getAssortId())){ + return ResultUtil.error("名称已存在!"); + }else{ + assortService.updateByPrimaryKeySelective(assort); } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错啦！"); } + return ResultUtil.ok(); } /** @@ -272,14 +262,9 @@ public class DistributionController { @OptionalLog(module = "删除",methods = "调阅分段信息",fieldName = "assortName",tableName = "zd_assort") @RequestMapping("deleteAssortByAssortId/{assortId}") @ResponseBody - public ResultUtil deleteAssortByAssortId(@PathVariable("assortId") String assortId){ - try{ - assortService.deleteAssortByAssortId(assortId); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + public ResultUtil deleteAssortByAssortId(@PathVariable("assortId") String assortId) throws Exception{ + assortService.deleteAssortByAssortId(assortId); + return ResultUtil.ok(); } /** @@ -328,93 +313,88 @@ public class DistributionController { @OptionalLog(module = "保存",methods = "调阅分配") @RequestMapping("saveUserOrRoleReader") @ResponseBody - public ResultUtil saveUserOrRoleReader(Integer userId, Integer roleId, Integer roleIdByUser, String selects, HttpServletRequest request){ - try{ - //先删除后添加 - if(null != roleId){ - roleRearderService.deleteReaderByRoleId(roleId); - }else if(null != userId){ - userRearderService.deleteReaderByUserId(userId); - } - String[] selectList = selects.split(","); - if(null != roleId) { - List list = new ArrayList<>(); - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - for (int i = 0; i < selectList.length; i++) { - if(StringUtils.isNoneBlank(selectList[i])){ - Emr_Role_Reader roleReader = new Emr_Role_Reader(); - roleReader.setRoleId(roleId); - roleReader.setRecordId(selectList[i]); - roleReader.setCreater(user.getUserName()); - roleReader.setUpater(user.getUserName()); - roleReader.setCreateTime(fmt.format(new Date())); - roleReader.setUpdateTime(fmt.format(new Date())); - list.add(roleReader); - } + public ResultUtil saveUserOrRoleReader(Integer userId, Integer roleId, Integer roleIdByUser, String selects, HttpServletRequest request) throws Exception{ + //先删除后添加 + if(null != roleId){ + roleRearderService.deleteReaderByRoleId(roleId); + }else if(null != userId){ + userRearderService.deleteReaderByUserId(userId); + } + String[] selectList = selects.split(","); + if(null != roleId) { + List list = new ArrayList<>(); + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + for (int i = 0; i < selectList.length; i++) { + if(StringUtils.isNoneBlank(selectList[i])){ + Emr_Role_Reader roleReader = new Emr_Role_Reader(); + roleReader.setRoleId(roleId); + roleReader.setRecordId(selectList[i]); + roleReader.setCreater(user.getUserName()); + roleReader.setUpater(user.getUserName()); + roleReader.setCreateTime(fmt.format(new Date())); + roleReader.setUpdateTime(fmt.format(new Date())); + list.add(roleReader); } - roleRearderService.SimpleInsert(list); } - if(null != userId) { - //与角色分配表对比，多出部分，flag设为1，减少部分flag设为0 - //角色权限 - List roleReaders = roleRearderService.selectAllByRoleId(roleIdByUser); - List list = new ArrayList<>(); - if (null != roleReaders && !roleReaders.isEmpty()) { - //计算新增和删除 - List roles = new ArrayList<>(); - List users = new ArrayList<>(); - for (int j = 0; j < roleReaders.size(); j++) { - if (StringUtils.isNotBlank(selects)) { - roles.add(roleReaders.get(j).getRecordId().toString()); - } else { - //全取消 - list.add(addUserReaderFunction(userId, roleIdByUser, roleReaders.get(j).getRecordId().toString(), 0,request)); - } - } + roleRearderService.SimpleInsert(list); + } + if(null != userId) { + //与角色分配表对比，多出部分，flag设为1，减少部分flag设为0 + //角色权限 + List roleReaders = roleRearderService.selectAllByRoleId(roleIdByUser); + List list = new ArrayList<>(); + if (null != roleReaders && !roleReaders.isEmpty()) { + //计算新增和删除 + List roles = new ArrayList<>(); + List users = new ArrayList<>(); + for (int j = 0; j < roleReaders.size(); j++) { if (StringUtils.isNotBlank(selects)) { - String[] readers = selects.split(","); - users = Arrays.asList(readers); - //新增部分 - Collection inserts = new ArrayList(users); - inserts.removeAll(roles); - if (null != inserts && !inserts.isEmpty()) { - //新增flag为1 - for (String insertReader : inserts) { - if (StringUtils.isNotBlank(insertReader)) { - list.add(addUserReaderFunction(userId, roleIdByUser, insertReader, 1,request)); - } + roles.add(roleReaders.get(j).getRecordId().toString()); + } else { + //全取消 + list.add(addUserReaderFunction(userId, roleIdByUser, roleReaders.get(j).getRecordId().toString(), 0,request)); + } + } + if (StringUtils.isNotBlank(selects)) { + String[] readers = selects.split(","); + users = Arrays.asList(readers); + //新增部分 + Collection inserts = new ArrayList(users); + inserts.removeAll(roles); + if (null != inserts && !inserts.isEmpty()) { + //新增flag为1 + for (String insertReader : inserts) { + if (StringUtils.isNotBlank(insertReader)) { + list.add(addUserReaderFunction(userId, roleIdByUser, insertReader, 1,request)); } } - //删除部分 - Collection deletes = new ArrayList(roles); - deletes.removeAll(users); - if (null != deletes && !deletes.isEmpty()) { - for (String deleteReader : deletes) { - if (StringUtils.isNotBlank(deleteReader)) { - list.add(addUserReaderFunction(userId, roleIdByUser, deleteReader, 0,request)); - } + } + //删除部分 + Collection deletes = new ArrayList(roles); + deletes.removeAll(users); + if (null != deletes && !deletes.isEmpty()) { + for (String deleteReader : deletes) { + if (StringUtils.isNotBlank(deleteReader)) { + list.add(addUserReaderFunction(userId, roleIdByUser, deleteReader, 0,request)); } } } - }else{ - //全部新增 - if (StringUtils.isNotBlank(selects)) { - String[] readers = selects.split(","); - for (String insertReader : readers) { - if (StringUtils.isNotBlank(insertReader)) { - list.add(addUserReaderFunction(userId, roleIdByUser, insertReader, 1,request)); - } + } + }else{ + //全部新增 + if (StringUtils.isNotBlank(selects)) { + String[] readers = selects.split(","); + for (String insertReader : readers) { + if (StringUtils.isNotBlank(insertReader)) { + list.add(addUserReaderFunction(userId, roleIdByUser, insertReader, 1,request)); } } } - userRearderService.SimpleInsert(list); } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; + userRearderService.SimpleInsert(list); } + return ResultUtil.ok(); } //封装新增用户权限表公共部分 diff --git a/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java b/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java index 8dcd5ee..92ff055 100644 --- a/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java +++ b/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java @@ -122,68 +122,63 @@ public class AnnotationTemplateController { @OptionalLog(module = "保存",methods = "原因及批准模板类别",fieldName = "typeName") @RequestMapping("addAnoType") @ResponseBody - public ResultUtil addAnoType(Emr_Reason_Anno_Model reasonAnnoModel, HttpServletRequest request){ - try { - if(StringUtils.isBlank(reasonAnnoModel.getTypeFlag()) && reasonAnnoModel.getParentId() == 0){ - return ResultUtil.error("类别标志不能为空!"); - } - if(StringUtils.isBlank(reasonAnnoModel.getTypeName())){ - return ResultUtil.error("类别名称不能为空!"); - } - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - String creater = user.getUserId().toString(); - if(user.getRoleId() == 0){ - creater = "-1"; - } - Emr_Reason_Anno_Model isFlag = null; - if(StringUtils.isNoneBlank(reasonAnnoModel.getTypeFlag())){ - //验证类别名称是否重复 - isFlag = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(creater, reasonAnnoModel.getTypeFlag(),null,null); - } - Emr_Reason_Anno_Model annoModel = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(creater, null,reasonAnnoModel.getTypeName(),reasonAnnoModel.getParentId()); - //判断id是否有值，为null添加，否则更新 - if(null == reasonAnnoModel.getId()){ - if(isFlag == null){ - if(annoModel == null){ - if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){ - return ResultUtil.error("类别标志不能重复!"); - } - annotationTemplateService.addAnno(reasonAnnoModel,request); - }else{ - return ResultUtil.error("类别名称不能重复!"); + public ResultUtil addAnoType(Emr_Reason_Anno_Model reasonAnnoModel, HttpServletRequest request) throws Exception{ + if(StringUtils.isBlank(reasonAnnoModel.getTypeFlag()) && reasonAnnoModel.getParentId() == 0){ + return ResultUtil.error("类别标志不能为空!"); + } + if(StringUtils.isBlank(reasonAnnoModel.getTypeName())){ + return ResultUtil.error("类别名称不能为空!"); + } + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + String creater = user.getUserId().toString(); + if(user.getRoleId() == 0){ + creater = "-1"; + } + Emr_Reason_Anno_Model isFlag = null; + if(StringUtils.isNoneBlank(reasonAnnoModel.getTypeFlag())){ + //验证类别名称是否重复 + isFlag = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(creater, reasonAnnoModel.getTypeFlag(),null,null); + } + Emr_Reason_Anno_Model annoModel = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(creater, null,reasonAnnoModel.getTypeName(),reasonAnnoModel.getParentId()); + //判断id是否有值，为null添加，否则更新 + if(null == reasonAnnoModel.getId()){ + if(isFlag == null){ + if(annoModel == null){ + if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){ + return ResultUtil.error("类别标志不能重复!"); } + annotationTemplateService.addAnno(reasonAnnoModel,request); }else{ - return ResultUtil.error("类别标志不能重复!"); + return ResultUtil.error("类别名称不能重复!"); } }else{ - if(null != isFlag && !isFlag.getId().equals(reasonAnnoModel.getId())){ - return ResultUtil.error("类别标志不能重复!"); + return ResultUtil.error("类别标志不能重复!"); + } + }else{ + if(null != isFlag && !isFlag.getId().equals(reasonAnnoModel.getId())){ + return ResultUtil.error("类别标志不能重复!"); + }else{ + if(null != annoModel && !annoModel.getId().equals(reasonAnnoModel.getId())){ + return ResultUtil.error("类别名称不能重复!"); }else{ - if(null != annoModel && !annoModel.getId().equals(reasonAnnoModel.getId())){ - return ResultUtil.error("类别名称不能重复!"); - }else{ - Emr_Reason_Anno_Model reason = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "reason",null,null); - Emr_Reason_Anno_Model anno = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "anno",null,null); - if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){ - if(null != reason && !reason.getId().equals(reasonAnnoModel.getId())){ - return ResultUtil.error("类别标志不能重复!"); - } - if(null != anno && !anno.getId().equals(reasonAnnoModel.getId())){ - return ResultUtil.error("类别标志不能重复!"); - } + Emr_Reason_Anno_Model reason = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "reason",null,null); + Emr_Reason_Anno_Model anno = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "anno",null,null); + if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){ + if(null != reason && !reason.getId().equals(reasonAnnoModel.getId())){ + return ResultUtil.error("类别标志不能重复!"); + } + if(null != anno && !anno.getId().equals(reasonAnnoModel.getId())){ + return ResultUtil.error("类别标志不能重复!"); } - annotationTemplateService.updateAnno(reasonAnnoModel,request); } + annotationTemplateService.updateAnno(reasonAnnoModel,request); } } - ResultUtil result = new ResultUtil(); - result.setCode(0); - result.setMsg(reasonAnnoModel.getId().toString()); - return result; - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存失败，请联系超管!"); } + ResultUtil result = new ResultUtil(); + result.setCode(0); + result.setMsg(reasonAnnoModel.getId().toString()); + return result; } /** @@ -201,31 +196,26 @@ public class AnnotationTemplateController { @OptionalLog(module = "保存",methods = "原因及批注模板",fieldName = "content") @RequestMapping("addAnno") @ResponseBody - public ResultUtil addAnno(Emr_Reason_Anno_Model reasonAnnoModel,HttpServletRequest request){ + public ResultUtil addAnno(Emr_Reason_Anno_Model reasonAnnoModel,HttpServletRequest request) throws Exception{ Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); String creater = user.getUserName(); //根据类别验证内容是否是否存在 - try { - Emr_Reason_Anno_Model model = annoModelMapper.checkContentByParentId(creater, reasonAnnoModel); - //判断id是否有值，为null添加，否则更新 - if(null == reasonAnnoModel.getId()){ - if(model == null){ - annotationTemplateService.addAnno(reasonAnnoModel,request); - }else{ - return ResultUtil.error("相同模板类别该内容已存在!"); - } + Emr_Reason_Anno_Model model = annoModelMapper.checkContentByParentId(creater, reasonAnnoModel); + //判断id是否有值，为null添加，否则更新 + if(null == reasonAnnoModel.getId()){ + if(model == null){ + annotationTemplateService.addAnno(reasonAnnoModel,request); }else{ - if(null != model && !model.getId().equals(reasonAnnoModel.getId())){ - return ResultUtil.error("相同模板类别该内容已存在!"); - }else{ - annotationTemplateService.updateAnno(reasonAnnoModel,request); - } + return ResultUtil.error("相同模板类别该内容已存在!"); + } + }else{ + if(null != model && !model.getId().equals(reasonAnnoModel.getId())){ + return ResultUtil.error("相同模板类别该内容已存在!"); + }else{ + annotationTemplateService.updateAnno(reasonAnnoModel,request); } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存失败，请联系超管!"); } + return ResultUtil.ok(); } /** @@ -243,14 +233,9 @@ public class AnnotationTemplateController { @OptionalLog(module = "删除",methods = "原因及批注模板") @RequestMapping("deleteAnoType") @ResponseBody - public ResultUtil deleteAnoType(Integer id){ - try { - annotationTemplateService.deleteByPrimaryKey(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + public ResultUtil deleteAnoType(Integer id) throws Exception{ + annotationTemplateService.deleteByPrimaryKey(id); + return ResultUtil.ok(); } /** diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java index d4db5b0..92a9254 100644 --- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java +++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java @@ -119,76 +119,71 @@ public class ApproveController { @OptionalLog(module = "保存",methods = "查询页面保存借阅申请") @RequestMapping("addApplyApprove") @ResponseBody - public ResultUtil addApplyApprove(Emr_Apply_Approve applyApprove, String patientIds,HttpServletRequest request){ - try{ - boolean flag = FormTokenFlagUtil.isFlag(request); - if (!flag) { - return ResultUtil.error("请不要重复提交!"); - } - List commomtables = commomMapper.selectAllByPatients(patientIds); - if(null != commomtables && !commomtables.isEmpty()) { - Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //查询是否未过期 - List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(), patientIds, applyApprove.getApplyType()); - if (null != approves && !approves.isEmpty()) { - if (commomtables.size() == 1) { - return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); - } - for (int i = 0; i < commomtables.size(); i++) { - //剩下的批量添加 - for (int j = 0; j < approves.size(); j++) { - if (approves.get(j).getPatientId().equals(commomtables.get(i).getPatientId())) { - //移除 - commomtables.remove(i); - continue; - } + public ResultUtil addApplyApprove(Emr_Apply_Approve applyApprove, String patientIds,HttpServletRequest request) throws Exception{ + boolean flag = FormTokenFlagUtil.isFlag(request); + if (!flag) { + return ResultUtil.error("请不要重复提交!"); + } + List commomtables = commomMapper.selectAllByPatients(patientIds); + if(null != commomtables && !commomtables.isEmpty()) { + Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //查询是否未过期 + List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(), patientIds, applyApprove.getApplyType()); + if (null != approves && !approves.isEmpty()) { + if (commomtables.size() == 1) { + return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); + } + for (int i = 0; i < commomtables.size(); i++) { + //剩下的批量添加 + for (int j = 0; j < approves.size(); j++) { + if (approves.get(j).getPatientId().equals(commomtables.get(i).getPatientId())) { + //移除 + commomtables.remove(i); + continue; } } } - if (null != commomtables && !commomtables.isEmpty()) { - applyApprove.setApplyer(powerUser.getUserName()); - applyApprove.setApplyTime(fmt.format(new Date())); - List list = new ArrayList<>(); - ///查询表列数 - int colCount = commomMapper.selectColByTableName("emr_apply_approve"); - int simpleInsertCount = 2100/colCount; - for (int i = 0; i < commomtables.size(); i++) { - //处理批量添加sql太长问题，设定个数为180 - if(null != list && i > 0 && list.size()%simpleInsertCount == 0){ - list.clear(); - } - Emr_Apply_Approve applyApproveInsert = new Emr_Apply_Approve(); - BeanUtils.copyProperties(applyApprove, applyApproveInsert); - BeanUtils.copyProperties(commomtables.get(i), applyApproveInsert); - if(StringUtils.isNotBlank(commomtables.get(i).getDisDate())){ - applyApproveInsert.setDisDate(DateUtils.strToDateLong(commomtables.get(i).getDisDate())); - } - list.add(applyApproveInsert); - if(null != list && list.size() == 1 && list.get(0).getId() != null){ - applyApproveService.updateEmrApplyApprove(list.get(0)); - }else{ - //是180的倍数或最后一个 - if(null != list && (list.size()%simpleInsertCount == 0 || i == commomtables.size() - 1)){ - applyApproveService.SimpleInsert(list); - } - } + } + if (null != commomtables && !commomtables.isEmpty()) { + applyApprove.setApplyer(powerUser.getUserName()); + applyApprove.setApplyTime(fmt.format(new Date())); + List list = new ArrayList<>(); + ///查询表列数 + int colCount = commomMapper.selectColByTableName("emr_apply_approve"); + int simpleInsertCount = 2100/colCount; + for (int i = 0; i < commomtables.size(); i++) { + //处理批量添加sql太长问题，设定个数为180 + if(null != list && i > 0 && list.size()%simpleInsertCount == 0){ + list.clear(); } - //推送给权限系统下发审批人通知 - String applyStateTemp = "2"; - if(applyApprove.getApplyState().equals(applyStateTemp)){ - sendPowerApproveInterface(applyApprove.getApplyType(),commomtables.size()); + Emr_Apply_Approve applyApproveInsert = new Emr_Apply_Approve(); + BeanUtils.copyProperties(applyApprove, applyApproveInsert); + BeanUtils.copyProperties(commomtables.get(i), applyApproveInsert); + if(StringUtils.isNotBlank(commomtables.get(i).getDisDate())){ + applyApproveInsert.setDisDate(DateUtils.strToDateLong(commomtables.get(i).getDisDate())); + } + list.add(applyApproveInsert); + if(null != list && list.size() == 1 && list.get(0).getId() != null){ + applyApproveService.updateEmrApplyApprove(list.get(0)); + }else{ + //是180的倍数或最后一个 + if(null != list && (list.size()%simpleInsertCount == 0 || i == commomtables.size() - 1)){ + applyApproveService.SimpleInsert(list); + } } - } else { - return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); } - return ResultUtil.ok(); - }else{ - return ResultUtil.error("请至少选中一个!"); + //推送给权限系统下发审批人通知 + String applyStateTemp = "2"; + if(applyApprove.getApplyState().equals(applyStateTemp)){ + sendPowerApproveInterface(applyApprove.getApplyType(),commomtables.size()); + } + } else { + return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); } - }catch(Exception e){ - e.printStackTrace(); - return ResultUtil.error("出错了,请联系系统管理员!"); + return ResultUtil.ok(); + }else{ + return ResultUtil.error("请至少选中一个!"); } } @@ -302,129 +297,119 @@ public class ApproveController { @OptionalLog(module = "保存",methods = "收藏页面与添加申请页面借阅申请",fieldName = "inpatientNo",tableName = "emr_apply_approve") @RequestMapping("addApply") @ResponseBody - public ResultUtil addApply(Emr_Apply_Approve applyApprove,String startTime2,String endTime2,HttpServletRequest request){ - try{ - Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - if(StringUtils.isBlank(applyApprove.getPatientId())){ - if(null != applyApprove.getAdmissTimes() && StringUtils.isNotBlank(applyApprove.getInpatientNo())&&StringUtils.isNotBlank(applyApprove.getName())){ - //如果patientId不存在，通过病案号，姓名，住院次数查询patientId - List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),startTime2,endTime2); - if(null != patientIdList && !patientIdList.isEmpty()){ - if(patientIdList.size() == 1){ - applyApprove.setPatientId(patientIdList.get(0)); - }else{ - return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); - } + public ResultUtil addApply(Emr_Apply_Approve applyApprove,String startTime2,String endTime2,HttpServletRequest request) throws Exception{ + Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + if(StringUtils.isBlank(applyApprove.getPatientId())){ + if(null != applyApprove.getAdmissTimes() && StringUtils.isNotBlank(applyApprove.getInpatientNo())&&StringUtils.isNotBlank(applyApprove.getName())){ + //如果patientId不存在，通过病案号，姓名，住院次数查询patientId + List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),startTime2,endTime2); + if(null != patientIdList && !patientIdList.isEmpty()){ + if(patientIdList.size() == 1){ + applyApprove.setPatientId(patientIdList.get(0)); }else{ - return ResultUtil.error("查询无该病案!"); + return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); } }else{ return ResultUtil.error("查询无该病案!"); } + }else{ + return ResultUtil.error("查询无该病案!"); } - //查询通过审批且未过期的patientId集合 - //通过patientId查询病案对象获取和出院时间 - List commomVos = commomMapper.selectAllByPatients("'"+applyApprove.getPatientId()+"'"); - BeanUtils.copyProperties(commomVos.get(0),applyApprove); - String patientId = "'" + applyApprove.getPatientId() + "'"; - List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(),patientId,applyApprove.getApplyType()); - if(null != approves && !approves.isEmpty()){ - return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); + } + //查询通过审批且未过期的patientId集合 + //通过patientId查询病案对象获取和出院时间 + List commomVos = commomMapper.selectAllByPatients("'"+applyApprove.getPatientId()+"'"); + BeanUtils.copyProperties(commomVos.get(0),applyApprove); + String patientId = "'" + applyApprove.getPatientId() + "'"; + List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(),patientId,applyApprove.getApplyType()); + if(null != approves && !approves.isEmpty()){ + return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!"); + } + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + applyApprove.setDisDate(fmt.parse(commomVos.get(0).getDisDate())); + Integer id = applyApprove.getId(); + //存在则更新，不存在新增 + if(id != null){ + //若是确认提交,将审核信息置空 + if("2".equals(applyApprove.getApplyState())){ + applyApprove.setApprover(""); + applyApprove.setApproveTime(""); + applyApprove.setApproveState(""); + applyApprove.setApproveNotes(""); } - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - applyApprove.setDisDate(fmt.parse(commomVos.get(0).getDisDate())); - Integer id = applyApprove.getId(); - //存在则更新，不存在新增 - if(id != null){ - //若是确认提交,将审核信息置空 - if("2".equals(applyApprove.getApplyState())){ - applyApprove.setApprover(""); - applyApprove.setApproveTime(""); - applyApprove.setApproveState(""); - applyApprove.setApproveNotes(""); - } - applyApproveService.updateEmrApplyApprove(applyApprove); - }else{ - boolean flag = FormTokenFlagUtil.isFlag(request); - if (flag) { - applyApproveService.addEmrApplyApprove(applyApprove,request); - //是确认提交情况下发送通知 - String applyStateTemp = "2"; - if(applyApprove.getApplyState().equals(applyStateTemp)){ - sendPowerApproveInterface(applyApprove.getApplyType(),1); - } - }else{ - return ResultUtil.error("请不要重复提交!"); + applyApproveService.updateEmrApplyApprove(applyApprove); + }else{ + boolean flag = FormTokenFlagUtil.isFlag(request); + if (flag) { + applyApproveService.addEmrApplyApprove(applyApprove,request); + //是确认提交情况下发送通知 + String applyStateTemp = "2"; + if(applyApprove.getApplyState().equals(applyStateTemp)){ + sendPowerApproveInterface(applyApprove.getApplyType(),1); } + }else{ + return ResultUtil.error("请不要重复提交!"); } - return ResultUtil.ok(); - }catch(Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错了,请联系系统管理员!"); } + return ResultUtil.ok(); } //脐血库 @OptionalLog(module = "保存",methods = "收藏页面与添加申请页面借阅申请",fieldName = "inpatientNo",tableName = "emr_apply_approve") @RequestMapping("addApplyBlood") @ResponseBody - public ResultUtil addApplyBlood(Emr_Apply_Approve applyApprove,String startTime2,String endTime2,HttpServletRequest request){ - try{ - Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - if(StringUtils.isBlank(applyApprove.getPatientId())){ - if(StringUtils.isNotBlank(applyApprove.getInpatientNo())&&StringUtils.isNotBlank(applyApprove.getName())){ - //如果patientId不存在，通过病案号，姓名，住院次数查询patientId - List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),startTime2,endTime2); - if(null != patientIdList && !patientIdList.isEmpty()){ - if(patientIdList.size() == 1){ - applyApprove.setPatientId(patientIdList.get(0)); - }else{ - return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); - } + public ResultUtil addApplyBlood(Emr_Apply_Approve applyApprove,String startTime2,String endTime2,HttpServletRequest request) throws Exception{ + Power_User powerUser = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + if(StringUtils.isBlank(applyApprove.getPatientId())){ + if(StringUtils.isNotBlank(applyApprove.getInpatientNo())&&StringUtils.isNotBlank(applyApprove.getName())){ + //如果patientId不存在，通过病案号，姓名，住院次数查询patientId + List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(applyApprove.getAdmissTimes(), applyApprove.getInpatientNo(), applyApprove.getName(),startTime2,endTime2); + if(null != patientIdList && !patientIdList.isEmpty()){ + if(patientIdList.size() == 1){ + applyApprove.setPatientId(patientIdList.get(0)); }else{ - return ResultUtil.error("查询无该档案!"); + return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); } }else{ return ResultUtil.error("查询无该档案!"); } + }else{ + return ResultUtil.error("查询无该档案!"); } - //查询通过审批且未过期的patientId集合 - //通过patientId查询病案对象获取和出院时间 - List commomVos = commomMapper.selectAllByPatients("'"+applyApprove.getPatientId()+"'"); - BeanUtils.copyProperties(commomVos.get(0),applyApprove); - String patientId = "'" + applyApprove.getPatientId() + "'"; - List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(),patientId,applyApprove.getApplyType()); - if(null != approves && !approves.isEmpty()){ - return ResultUtil.error("该档案另一个申请还处于有效期，无须重复申请!"); + } + //查询通过审批且未过期的patientId集合 + //通过patientId查询病案对象获取和出院时间 + List commomVos = commomMapper.selectAllByPatients("'"+applyApprove.getPatientId()+"'"); + BeanUtils.copyProperties(commomVos.get(0),applyApprove); + String patientId = "'" + applyApprove.getPatientId() + "'"; + List approves = applyApproveMapper.selectPatientIdsByUserAndApplyStatus(powerUser.getUserName(),patientId,applyApprove.getApplyType()); + if(null != approves && !approves.isEmpty()){ + return ResultUtil.error("该档案另一个申请还处于有效期，无须重复申请!"); + } + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //applyApprove.setDisDate(fmt.parse(commomVos.get(0).getDisDate())); + Integer id = applyApprove.getId(); + //存在则更新，不存在新增 + if(id != null){ + //若是确认提交,将审核信息置空 + if("2".equals(applyApprove.getApplyState())){ + applyApprove.setApprover(""); + applyApprove.setApproveTime(""); + applyApprove.setApproveState(""); + applyApprove.setApproveNotes(""); } - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //applyApprove.setDisDate(fmt.parse(commomVos.get(0).getDisDate())); - Integer id = applyApprove.getId(); - //存在则更新，不存在新增 - if(id != null){ - //若是确认提交,将审核信息置空 - if("2".equals(applyApprove.getApplyState())){ - applyApprove.setApprover(""); - applyApprove.setApproveTime(""); - applyApprove.setApproveState(""); - applyApprove.setApproveNotes(""); - } - applyApproveService.updateEmrApplyApprove(applyApprove); + applyApproveService.updateEmrApplyApprove(applyApprove); + }else{ + boolean flag = FormTokenFlagUtil.isFlag(request); + if (flag) { + applyApproveService.addEmrApplyApprove(applyApprove,request); }else{ - boolean flag = FormTokenFlagUtil.isFlag(request); - if (flag) { - applyApproveService.addEmrApplyApprove(applyApprove,request); - }else{ - return ResultUtil.error("请不要重复提交!"); - } - + return ResultUtil.error("请不要重复提交!"); } - return ResultUtil.ok(); - }catch(Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错了,请联系系统管理员!"); + } + return ResultUtil.ok(); } /** @@ -537,14 +522,9 @@ public class ApproveController { @OptionalLog(module = "删除",methods = "删除借阅申请",fieldName = "inpatientNo",tableName = "emr_apply_approve") @RequestMapping("deleteApproveById/{id}") @ResponseBody - public ResultUtil deleteApproveById(@PathVariable("id") Integer id){ - try{ - applyApproveService.deleteByPrimaryKey(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("删除失败，请联系超管!"); - } + public ResultUtil deleteApproveById(@PathVariable("id") Integer id) throws Exception{ + applyApproveService.deleteByPrimaryKey(id); + return ResultUtil.ok(); } /** @@ -742,26 +722,21 @@ public class ApproveController { @OptionalLog(module = "保存",methods = "批注借阅审批申请") @RequestMapping(value = "updateApprove") @ResponseBody - public ResultUtil updateApprove(Emr_Apply_Approve applyApprove,HttpServletRequest request){ - try{ - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - String userName = user.getUserName(); - applyApprove.setApprover(userName); - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); - applyApprove.setApproveTime(fmt.format(new Date())); - applyApproveService.updateEmrApplyApprove(applyApprove); - return ResultUtil.ok(); - }catch(Exception e){ - e.printStackTrace(); - return ResultUtil.error("批注失败，请联系超管!"); - } + public ResultUtil updateApprove(Emr_Apply_Approve applyApprove,HttpServletRequest request) throws Exception{ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + String userName = user.getUserName(); + applyApprove.setApprover(userName); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + applyApprove.setApproveTime(fmt.format(new Date())); + applyApproveService.updateEmrApplyApprove(applyApprove); + return ResultUtil.ok(); } @RequiresPermissions("/approve/updateApprove") @OptionalLog(module = "保存",methods = "批注借阅审批申请") @RequestMapping("updateApproves") @ResponseBody - public ResultUtil updateApprovs(String[] ids, String state, String note, HttpServletRequest request){ + public ResultUtil updateApprovs(String[] ids, String state, String note, HttpServletRequest request) throws Exception{ Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); String userName = user.getUserName(); if (null != ids || ids.length > 0){ diff --git a/src/main/java/com/emr/controller/emrApprove/CollectionController.java b/src/main/java/com/emr/controller/emrApprove/CollectionController.java index a8e5052..9357c16 100644 --- a/src/main/java/com/emr/controller/emrApprove/CollectionController.java +++ b/src/main/java/com/emr/controller/emrApprove/CollectionController.java @@ -138,18 +138,13 @@ public class CollectionController { */ @RequestMapping("checkTypeFlagOrTypeName") @ResponseBody - public ResultUtil checkTypeFlagOrTypeName(Emr_Collect emrCollect,HttpServletRequest request){ - try { - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - Emr_Collect emr_collect = emrCollectMapper.checkTypeFlagOrTypeName(user.getUserId(), emrCollect.getCollectTypeFlag(), emrCollect.getCollectTypeName()); - if(null != emr_collect){ - return ResultUtil.error(); - } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("查询失败,请联系系统管理员"); + public ResultUtil checkTypeFlagOrTypeName(Emr_Collect emrCollect,HttpServletRequest request) throws Exception{ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + Emr_Collect emr_collect = emrCollectMapper.checkTypeFlagOrTypeName(user.getUserId(), emrCollect.getCollectTypeFlag(), emrCollect.getCollectTypeName()); + if(null != emr_collect){ + return ResultUtil.error(); } + return ResultUtil.ok(); } /** @@ -167,42 +162,37 @@ public class CollectionController { @OptionalLog(module = "保存",methods = "收藏类别",fieldName = "collectTypeName") @RequestMapping("addCollectType") @ResponseBody - public ResultUtil addCollectType(Emr_Collect emrCollect,HttpServletRequest request){ - try { - //验证类别名称是否重复 - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - Integer userId = user.getUserId(); - Emr_Collect collect = emrCollectMapper.checkCollectTypeNameByCreaterAndTypeName(userId, emrCollect.getCollectTypeName()); - Emr_Collect collect1 = emrCollectMapper.checkTypeFlagOrTypeName(userId, emrCollect.getCollectTypeFlag(),null); - //判断id是否有值，为null添加，否则更新 - if(null == emrCollect.getId()){ - if(collect != null){ - return ResultUtil.error("类别名称不能重复!"); - } - if(collect1 != null){ - return ResultUtil.error("类别标志不能重复!"); - } - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - emrCollectService.addCollect(emrCollect,request); - }else{ - return ResultUtil.error("请不要重复提交!"); - } + public ResultUtil addCollectType(Emr_Collect emrCollect,HttpServletRequest request) throws Exception{ + //验证类别名称是否重复 + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + Integer userId = user.getUserId(); + Emr_Collect collect = emrCollectMapper.checkCollectTypeNameByCreaterAndTypeName(userId, emrCollect.getCollectTypeName()); + Emr_Collect collect1 = emrCollectMapper.checkTypeFlagOrTypeName(userId, emrCollect.getCollectTypeFlag(),null); + //判断id是否有值，为null添加，否则更新 + if(null == emrCollect.getId()){ + if(collect != null){ + return ResultUtil.error("类别名称不能重复!"); + } + if(collect1 != null){ + return ResultUtil.error("类别标志不能重复!"); + } + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + emrCollectService.addCollect(emrCollect,request); }else{ - if(null != collect && !collect.getId().equals(emrCollect.getId())){ - return ResultUtil.error("类别名称不能重复!"); - } - if(null != collect1 && !collect1.getId().equals(emrCollect.getId())){ - return ResultUtil.error("类别标志不能重复!"); - } - emrCollectService.updateCollect(emrCollect,request); - + return ResultUtil.error("请不要重复提交!"); } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存失败，请联系超管!"); + }else{ + if(null != collect && !collect.getId().equals(emrCollect.getId())){ + return ResultUtil.error("类别名称不能重复!"); + } + if(null != collect1 && !collect1.getId().equals(emrCollect.getId())){ + return ResultUtil.error("类别标志不能重复!"); + } + emrCollectService.updateCollect(emrCollect,request); + } + return ResultUtil.ok(); } /** @@ -221,14 +211,9 @@ public class CollectionController { @OptionalLog(module = "删除",methods = "收藏类别",fieldName = "collectTypeName",tableName = "emr_collect") @RequestMapping("deleteCollectType") @ResponseBody - public ResultUtil deleteCollectType(Integer id){ - try { - emrCollectService.deleteByPrimaryKey(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + public ResultUtil deleteCollectType(Integer id) throws Exception{ + emrCollectService.deleteByPrimaryKey(id); + return ResultUtil.ok(); } //加载收藏类别 @@ -259,56 +244,51 @@ public class CollectionController { @OptionalLog(module = "保存",methods = "个人收藏",fieldName = "name") @RequestMapping("addCollect") @ResponseBody - public ResultUtil addCollect(Emr_Collect emrCollect,String name,String startTime2,String endTime2,HttpServletRequest request){ + public ResultUtil addCollect(Emr_Collect emrCollect,String name,String startTime2,String endTime2,HttpServletRequest request) throws Exception{ Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); Integer userId = user.getUserId(); - try{ - String patientId = emrCollect.getPatientId(); - //根据同一病案查询标题是否存在 - Emr_Collect isPatientId = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); - if(emrCollect.getId() == null) { - if(isPatientId != null){ - return ResultUtil.error("该病案已收藏!"); - }else{ - if(StringUtils.isBlank(emrCollect.getPatientId())){ - //patientId为空，为未指定病案添加收藏，根据病案号和住院次数查询，并设置admissId,patientId - List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(emrCollect.getAdmissTimes(), emrCollect.getInpatientNo(), name,startTime2,endTime2); - if(null != patientIdList && !patientIdList.isEmpty()){ - if(patientIdList.size() == 1){ - patientId = patientIdList.get(0); - Emr_Collect isPatientId1 = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); - if (isPatientId1 != null) { - return ResultUtil.error("该病案已收藏!"); - } - emrCollect.setPatientId(patientId); - emrCollect.setAdmissId(emrCollect.getAdmissId()); - }else{ - return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); + String patientId = emrCollect.getPatientId(); + //根据同一病案查询标题是否存在 + Emr_Collect isPatientId = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); + if(emrCollect.getId() == null) { + if(isPatientId != null){ + return ResultUtil.error("该病案已收藏!"); + }else{ + if(StringUtils.isBlank(emrCollect.getPatientId())){ + //patientId为空，为未指定病案添加收藏，根据病案号和住院次数查询，并设置admissId,patientId + List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(emrCollect.getAdmissTimes(), emrCollect.getInpatientNo(), name,startTime2,endTime2); + if(null != patientIdList && !patientIdList.isEmpty()){ + if(patientIdList.size() == 1){ + patientId = patientIdList.get(0); + Emr_Collect isPatientId1 = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); + if (isPatientId1 != null) { + return ResultUtil.error("该病案已收藏!"); } + emrCollect.setPatientId(patientId); + emrCollect.setAdmissId(emrCollect.getAdmissId()); }else{ - return ResultUtil.error("查无该病案，请重新填写病案号和患者姓名和次数!"); + return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); } - } - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - emrCollectService.addCollect(emrCollect,request); - return ResultUtil.ok(); }else{ - return ResultUtil.error("请不要重复提交!"); + return ResultUtil.error("查无该病案，请重新填写病案号和患者姓名和次数!"); } } - }else{ - if(null != isPatientId && !isPatientId.getId().equals(emrCollect.getId())){ - return ResultUtil.error("该病案已收藏!"); - }else{ - //修改 - emrCollectService.updateCollect(emrCollect,request); + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + emrCollectService.addCollect(emrCollect,request); return ResultUtil.ok(); + }else{ + return ResultUtil.error("请不要重复提交!"); } } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); + }else{ + if(null != isPatientId && !isPatientId.getId().equals(emrCollect.getId())){ + return ResultUtil.error("该病案已收藏!"); + }else{ + //修改 + emrCollectService.updateCollect(emrCollect,request); + return ResultUtil.ok(); + } } } @@ -317,56 +297,51 @@ public class CollectionController { @OptionalLog(module = "保存",methods = "个人收藏",fieldName = "name") @RequestMapping("addCollectBlood") @ResponseBody - public ResultUtil addCollectBlood(Emr_Collect emrCollect,String name,String startTime2,String endTime2,HttpServletRequest request){ + public ResultUtil addCollectBlood(Emr_Collect emrCollect,String name,String startTime2,String endTime2,HttpServletRequest request) throws Exception{ Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); Integer userId = user.getUserId(); - try{ - List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(null, emrCollect.getInpatientNo(),name,startTime2,endTime2); - String patientId = ""; - if(null != patientIdList && !patientIdList.isEmpty()){ - if(patientIdList.size() == 1){ - patientId = patientIdList.get(0); - }else{ - return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); - } + List patientIdList = commomMapper.selectPatientIdByAdmissTimesAndInpatientNoAndName(null, emrCollect.getInpatientNo(),name,startTime2,endTime2); + String patientId = ""; + if(null != patientIdList && !patientIdList.isEmpty()){ + if(patientIdList.size() == 1){ + patientId = patientIdList.get(0); }else{ - return ResultUtil.error("查询无该档案!"); + return ResultUtil.error("查询结果不唯一,符合条件共计"+patientIdList.size()+"条"); } - //根据同一病案查询标题是否存在 - Emr_Collect isPatientId = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); - if(emrCollect.getId() == null) { - if(isPatientId != null){ - return ResultUtil.error("该档案已收藏!"); - }else{ - if(StringUtils.isBlank(emrCollect.getPatientId())){ - //patientId为空，为未指定病案添加收藏，根据病案号和住院次数查询，并设置admissId,patientId - if(StringUtils.isNoneBlank(patientId)){ - emrCollect.setPatientId(patientId); - emrCollect.setAdmissId(emrCollect.getAdmissId()); - }else{ - return ResultUtil.error("查无该档案，请重新填写脐血编号和姓名!"); - } - } - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - emrCollectService.addCollect(emrCollect,request); - return ResultUtil.ok(); + }else{ + return ResultUtil.error("查询无该档案!"); + } + //根据同一病案查询标题是否存在 + Emr_Collect isPatientId = emrCollectMapper.selectCollectByUserIdAndPatientId(userId,patientId); + if(emrCollect.getId() == null) { + if(isPatientId != null){ + return ResultUtil.error("该档案已收藏!"); + }else{ + if(StringUtils.isBlank(emrCollect.getPatientId())){ + //patientId为空，为未指定病案添加收藏，根据病案号和住院次数查询，并设置admissId,patientId + if(StringUtils.isNoneBlank(patientId)){ + emrCollect.setPatientId(patientId); + emrCollect.setAdmissId(emrCollect.getAdmissId()); }else{ - return ResultUtil.error("请不要重复提交!"); + return ResultUtil.error("查无该档案，请重新填写脐血编号和姓名!"); } } - }else{ - if(null != isPatientId && !isPatientId.getId().equals(emrCollect.getId())){ - return ResultUtil.error("该档案已收藏!"); - }else{ - //修改 - emrCollectService.updateCollect(emrCollect,request); + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + emrCollectService.addCollect(emrCollect,request); return ResultUtil.ok(); + }else{ + return ResultUtil.error("请不要重复提交!"); } } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); + }else{ + if(null != isPatientId && !isPatientId.getId().equals(emrCollect.getId())){ + return ResultUtil.error("该档案已收藏!"); + }else{ + //修改 + emrCollectService.updateCollect(emrCollect,request); + return ResultUtil.ok(); + } } } @@ -575,13 +550,8 @@ public class CollectionController { @OptionalLog(module = "删除",methods = "个人收藏",fieldName = "inpatientNo",tableName = "emr_collect") @RequestMapping("deleteCollect/{id}") @ResponseBody - public ResultUtil deleteCollect(@PathVariable("id")Integer id){ - try{ - emrCollectService.deleteByPrimaryKey(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil deleteCollect(@PathVariable("id")Integer id) throws Exception{ + emrCollectService.deleteByPrimaryKey(id); + return ResultUtil.ok(); } } diff --git a/src/main/java/com/emr/controller/emrPdfWaterSet/PdfWaterSetController.java b/src/main/java/com/emr/controller/emrPdfWaterSet/PdfWaterSetController.java index 2c9e788..d409500 100644 --- a/src/main/java/com/emr/controller/emrPdfWaterSet/PdfWaterSetController.java +++ b/src/main/java/com/emr/controller/emrPdfWaterSet/PdfWaterSetController.java @@ -45,29 +45,24 @@ public class PdfWaterSetController { @RequestMapping(value="update",method= {RequestMethod.POST}) @ResponseBody public ResultUtil update(@RequestParam(required = false,value = "files") - MultipartFile files,EmrPdfWaterSet pdfWaterSet){ - try{ - //判断是否有选择图片 - if(null != files){ - EmrPdfWaterSet obj = pdfWaterSetMapper.selectByPrimaryKey(1); - String imgFile = obj.getImgFile(); - //删除原有图片，上传现在图片 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String realPath = request.getSession(). - getServletContext().getRealPath("/") + picPath; - String src = realPath + imgFile; - File file = new File(src); - if(file.isFile()){ - file.delete(); - } - String newSrc = realPath + pdfWaterSet.getImgFile(); - files.transferTo(new File(newSrc)); + MultipartFile files,EmrPdfWaterSet pdfWaterSet) throws Exception{ + //判断是否有选择图片 + if(null != files){ + EmrPdfWaterSet obj = pdfWaterSetMapper.selectByPrimaryKey(1); + String imgFile = obj.getImgFile(); + //删除原有图片，上传现在图片 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String realPath = request.getSession(). + getServletContext().getRealPath("/") + picPath; + String src = realPath + imgFile; + File file = new File(src); + if(file.isFile()){ + file.delete(); } - pdfWaterSetService.updatePdfWaterSet(pdfWaterSet); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错了,请联系系统管理员"); + String newSrc = realPath + pdfWaterSet.getImgFile(); + files.transferTo(new File(newSrc)); } + pdfWaterSetService.updatePdfWaterSet(pdfWaterSet); + return ResultUtil.ok(); } } diff --git a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java index 4b2c8a7..db7c205 100644 --- a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java +++ b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java @@ -103,15 +103,10 @@ public class PrintOrDownLoadInfoController { */ @RequestMapping("/printInfoList/getPrintCount") @ResponseBody - public ResultUtil getPrintCount(String patientId){ - try{ - //查询 - List list = printOrDownLoadInfoService.getPrintCount(patientId); - return ResultUtil.ok(list); - }catch (Exception e){ - e.printStackTrace(); - return null; - } + public ResultUtil getPrintCount(String patientId) throws Exception{ + //查询 + List list = printOrDownLoadInfoService.getPrintCount(patientId); + return ResultUtil.ok(list); } /** diff --git a/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java b/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java index 763b713..a05dea3 100644 --- a/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java +++ b/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java @@ -125,14 +125,9 @@ public class BackDatabaseController { @RequiresPermissions("/otherManage/deleteLogById") @RequestMapping("deleteLogById/{logId}") @ResponseBody - public ResultUtil deleteLogById(@PathVariable("logId")Integer logId){ - try{ - logService.deleteLogById(logId); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("删除失败，请联系超管!"); - } + public ResultUtil deleteLogById(@PathVariable("logId")Integer logId) throws Exception{ + logService.deleteLogById(logId); + return ResultUtil.ok(); } /** @@ -150,25 +145,20 @@ public class BackDatabaseController { @RequestMapping("deleteLogByIds/{ids}") @RequiresPermissions("/otherManage/deleteLogByIds") @ResponseBody - public ResultUtil deleteLogByIds(@PathVariable("ids")String ids){ - try{ - String[] idList = ids.split(","); - String str = ""; - for (int i = 0; i < idList.length; i++) { - if(StringUtils.isNoneBlank(idList[i])){ - if(i != idList.length - 1){ - str += idList[i] + ","; - }else{ - str += idList[i]; - } + public ResultUtil deleteLogByIds(@PathVariable("ids")String ids) throws Exception{ + String[] idList = ids.split(","); + String str = ""; + for (int i = 0; i < idList.length; i++) { + if(StringUtils.isNoneBlank(idList[i])){ + if(i != idList.length - 1){ + str += idList[i] + ","; + }else{ + str += idList[i]; } } - logService.deleteLogByIds(str); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("删除失败，请联系超管!"); } + logService.deleteLogByIds(str); + return ResultUtil.ok(); } /** diff --git a/src/main/java/com/emr/controller/otherManage/BloodAndAgreeStatusSetController.java b/src/main/java/com/emr/controller/otherManage/BloodAndAgreeStatusSetController.java index 069d978..99c7926 100644 --- a/src/main/java/com/emr/controller/otherManage/BloodAndAgreeStatusSetController.java +++ b/src/main/java/com/emr/controller/otherManage/BloodAndAgreeStatusSetController.java @@ -120,29 +120,24 @@ public class BloodAndAgreeStatusSetController { @RequestMapping("/blood/selectNameExist") @ResponseBody - public ResultUtil selectNameExist(String name,String code,Integer id){ - try { - List list = bloodAndAgreeStatusSetService.selectByCode(code,name); - if(null == id){ - //新增 - if(!CollectionUtils.isEmpty(list)){ - return ResultUtil.error("名称已存在"); - } - }else{ - //修改 - if(!CollectionUtils.isEmpty(list)){ - for(BloodAndAgreeStatusTree vo : list){ - if(!vo.getId().equals(id) && vo.getName().equals(name)){ - return ResultUtil.error("名称已存在"); - } + public ResultUtil selectNameExist(String name,String code,Integer id) throws Exception{ + List list = bloodAndAgreeStatusSetService.selectByCode(code,name); + if(null == id){ + //新增 + if(!CollectionUtils.isEmpty(list)){ + return ResultUtil.error("名称已存在"); + } + }else{ + //修改 + if(!CollectionUtils.isEmpty(list)){ + for(BloodAndAgreeStatusTree vo : list){ + if(!vo.getId().equals(id) && vo.getName().equals(name)){ + return ResultUtil.error("名称已存在"); } } } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("查询出错了,请联系系统管理员"); } + return ResultUtil.ok(); } /************************公共部分结束**********************************/ diff --git a/src/main/java/com/emr/controller/otherManage/CommomSetController.java b/src/main/java/com/emr/controller/otherManage/CommomSetController.java index 022df5c..173c0bf 100644 --- a/src/main/java/com/emr/controller/otherManage/CommomSetController.java +++ b/src/main/java/com/emr/controller/otherManage/CommomSetController.java @@ -31,39 +31,34 @@ public class CommomSetController { @RequestMapping("updateCommomSet") @ResponseBody - public ResultUtil updateCommomSet(EmrComomSet comomSet){ - try{ - //判断图片根目录的合法性 - String newPicRoot = comomSet.getNewPicRoot(); - newPicRoot = newPicRoot.trim(); - //验证目录是否正确 - String fileRegex = "^[A-z]:\\\\([^|>\\|](\\x20|[^\\s\\\\/:\\*\\?\\\"<>\\|])*[^\\s\\\\/:\\*\\?\\\"<>\\|\\.]$"); - if(!flag){ - return ResultUtil.error("不能存在特殊符号/ \\ \": | * ? < >"); - } + public ResultUtil updateCommomSet(EmrComomSet comomSet) throws Exception{ + //判断图片根目录的合法性 + String newPicRoot = comomSet.getNewPicRoot(); + newPicRoot = newPicRoot.trim(); + //验证目录是否正确 + String fileRegex = "^[A-z]:\\\\([^|>\\|](\\x20|[^\\s\\\\/:\\*\\?\\\"<>\\|])*[^\\s\\\\/:\\*\\?\\\"<>\\|\\.]$"); + if(!flag){ + return ResultUtil.error("不能存在特殊符号/ \\ \": | * ? < >"); } } - //验证盘符是否存在d:/ - String str = newPicRoot.substring(0,1) + ":/"; - if(!new File(str).exists()){ - return ResultUtil.error(newPicRoot.substring(0,1) + "盘符不存在!"); - } - comomSet.setNewPicRoot(newPicRoot); - commomSetService.update(comomSet); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("保存出错了,请联系系统管理员"); } + //验证盘符是否存在d:/ + String str = newPicRoot.substring(0,1) + ":/"; + if(!new File(str).exists()){ + return ResultUtil.error(newPicRoot.substring(0,1) + "盘符不存在!"); + } + comomSet.setNewPicRoot(newPicRoot); + commomSetService.update(comomSet); + return ResultUtil.ok(); } @RequestMapping(value = "getCommomSetList") diff --git a/src/main/java/com/emr/controller/printing/PrintingController.java b/src/main/java/com/emr/controller/printing/PrintingController.java index d41af75..dd7f1c9 100644 --- a/src/main/java/com/emr/controller/printing/PrintingController.java +++ b/src/main/java/com/emr/controller/printing/PrintingController.java @@ -156,16 +156,12 @@ public class PrintingController { */ @RequestMapping("checkTypeFlagByCreater") @ResponseBody - public ResultUtil checkTypeFlagByCreater(String typeFlag,HttpServletRequest request){ - try { Emr_Type type = emrTypeService.checkTypeFlagByCreater(typeFlag,request); - if(null == type){ - return ResultUtil.ok(); - }else{ - return ResultUtil.error("该类别标识已存在！"); - } - }catch (Exception e){ - e.printStackTrace(); - return null; + public ResultUtil checkTypeFlagByCreater(String typeFlag,HttpServletRequest request) throws Exception{ + Emr_Type type = emrTypeService.checkTypeFlagByCreater(typeFlag,request); + if(null == type){ + return ResultUtil.ok(); + }else{ + return ResultUtil.error("该类别标识已存在！"); } } @@ -183,16 +179,12 @@ public class PrintingController { */ @RequestMapping("checkTypeNameByCreater") @ResponseBody - public ResultUtil checkTypeNameByCreater(String typeName,HttpServletRequest request){ - try { Emr_Type type = emrTypeService.checkTypeNameByCreater(typeName,request); - if(null == type){ - return ResultUtil.ok(); - }else{ - return ResultUtil.error("该类别名称已存在！"); - } - }catch (Exception e){ - e.printStackTrace(); - return null; + public ResultUtil checkTypeNameByCreater(String typeName,HttpServletRequest request) throws Exception{ + Emr_Type type = emrTypeService.checkTypeNameByCreater(typeName,request); + if(null == type){ + return ResultUtil.ok(); + }else{ + return ResultUtil.error("该类别名称已存在！"); } } @@ -212,29 +204,24 @@ public class PrintingController { @OptionalLog(module = "新增",methods = "打印类别",fieldName = "typeName") @RequestMapping("addEmrType") @ResponseBody - public ResultUtil addEmrType(Emr_Type emrType,HttpServletRequest request){ - try{ - boolean flag = FormTokenFlagUtil.isFlag(request); - if(!flag){ - return ResultUtil.error("请不要重复提交!"); - } - Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); - Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); - if (null != type && !type.getId().equals(emrType.getId())) { - return ResultUtil.error("该类别名称已存在！"); - } - if (null != type1 && !type1.getId().equals(emrType.getId())) { - return ResultUtil.error("该类别标志已存在！"); - } - if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())){ - emrTypeService.addEmrType(emrType,request); - return ResultUtil.ok(emrType.getId()); - }else{ - return ResultUtil.error("类别标志或类别名称不能为空!"); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("添加失败，请联系超管！"); + public ResultUtil addEmrType(Emr_Type emrType,HttpServletRequest request) throws Exception{ + boolean flag = FormTokenFlagUtil.isFlag(request); + if(!flag){ + return ResultUtil.error("请不要重复提交!"); + } + Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); + Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); + if (null != type && !type.getId().equals(emrType.getId())) { + return ResultUtil.error("该类别名称已存在！"); + } + if (null != type1 && !type1.getId().equals(emrType.getId())) { + return ResultUtil.error("该类别标志已存在！"); + } + if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())){ + emrTypeService.addEmrType(emrType,request); + return ResultUtil.ok(emrType.getId()); + }else{ + return ResultUtil.error("类别标志或类别名称不能为空!"); } } @@ -254,25 +241,20 @@ public class PrintingController { @OptionalLog(module = "修改",methods = "打印类别",fieldName = "typeName") @RequestMapping("updateEmrType") @ResponseBody - public ResultUtil updateEmrType(Emr_Type emrType,Integer selectFlagId,Model model,HttpServletRequest request){ - try{ - if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())) { - Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); - Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); - if (null != type && !type.getId().equals(emrType.getId())) { - return ResultUtil.error("该类别名称已存在！"); - } - if (null != type1 && !type1.getId().equals(emrType.getId())) { - return ResultUtil.error("该类别标志已存在！"); - } - emrTypeService.updateEmrType(emrType, selectFlagId, request); - return ResultUtil.ok(); - }else{ - return ResultUtil.error("类别标志或类别名称不能为空!"); + public ResultUtil updateEmrType(Emr_Type emrType,Integer selectFlagId,HttpServletRequest request) throws Exception{ + if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())) { + Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request); + Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request); + if (null != type && !type.getId().equals(emrType.getId())) { + return ResultUtil.error("该类别名称已存在！"); } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error("修改失败，请联系超管！"); + if (null != type1 && !type1.getId().equals(emrType.getId())) { + return ResultUtil.error("该类别标志已存在！"); + } + emrTypeService.updateEmrType(emrType, selectFlagId, request); + return ResultUtil.ok(); + }else{ + return ResultUtil.error("类别标志或类别名称不能为空!"); } } @@ -292,14 +274,9 @@ public class PrintingController { @OptionalLog(module = "删除",methods = "打印类别",fieldName = "typeName",tableName = "emr_type") @RequestMapping("deleteEmrType") @ResponseBody - public ResultUtil deleteEmrType(Integer id){ - try{ - emrTypeService.deleteEmrType(id); - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil deleteEmrType(Integer id) throws Exception{ + emrTypeService.deleteEmrType(id); + return ResultUtil.ok(); } /** @@ -363,20 +340,15 @@ public class PrintingController { @OptionalLog(module = "保存",methods = "打印用途管理分配") @RequestMapping(value="addTypeRelated") @ResponseBody - public ResultUtil addTypeRelated(Integer typeId,String selects,HttpServletRequest request){ - try { - //先删除后添加 - typeRelatedService.deleteByTypeId(typeId); - if(StringUtils.isNotBlank(selects)){ - String[] selectList = selects.split(","); - typeRelatedService.SimpleInsert(selectList,typeId,request); - return ResultUtil.ok(); - }else{ - return ResultUtil.error("至少选中一个!"); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); + public ResultUtil addTypeRelated(Integer typeId,String selects,HttpServletRequest request) throws Exception{ + //先删除后添加 + typeRelatedService.deleteByTypeId(typeId); + if(StringUtils.isNotBlank(selects)){ + String[] selectList = selects.split(","); + typeRelatedService.SimpleInsert(selectList,typeId,request); + return ResultUtil.ok(); + }else{ + return ResultUtil.error("至少选中一个!"); } } @@ -394,28 +366,23 @@ public class PrintingController { */ @RequestMapping(value="udpateCheckByEmrType/{id}") @ResponseBody - public ResultUtil udpateCheckByEmrType(@PathVariable("id") Integer id,HttpServletRequest request){ - try { - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - Emr_Type type = emrTypeService.selectByPrimaryKey(id); - //判断是系统管理员，不建议乱修改客户选中的 - if(user.getRoleId() == 0 && !type.getCreater().equals(user.getUserName())){ - return ResultUtil.error("修改失败,该类别为客户创建,不建议修改!"); - } - Emr_Type oldFlagType = emrTypeService.selectFlagExist(request); - if(null == oldFlagType || (null != oldFlagType && !type.getId().equals(oldFlagType.getId()))){ - //原来的更新为不选中，现在的改为选中 - type.setSelectFlag(1); - if(null == oldFlagType){ - emrTypeService.updateEmrType(type,null,request); - }else{ - emrTypeService.updateEmrType(type,oldFlagType.getId(),request); - } + public ResultUtil udpateCheckByEmrType(@PathVariable("id") Integer id,HttpServletRequest request) throws Exception{ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + Emr_Type type = emrTypeService.selectByPrimaryKey(id); + //判断是系统管理员，不建议乱修改客户选中的 + if(user.getRoleId() == 0 && !type.getCreater().equals(user.getUserName())){ + return ResultUtil.error("修改失败,该类别为客户创建,不建议修改!"); + } + Emr_Type oldFlagType = emrTypeService.selectFlagExist(request); + if(null == oldFlagType || (null != oldFlagType && !type.getId().equals(oldFlagType.getId()))){ + //原来的更新为不选中，现在的改为选中 + type.setSelectFlag(1); + if(null == oldFlagType){ + emrTypeService.updateEmrType(type,null,request); + }else{ + emrTypeService.updateEmrType(type,oldFlagType.getId(),request); } - return ResultUtil.ok(); - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); } + return ResultUtil.ok(); } } diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java index a6c4eeb..57cd6f7 100644 --- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java +++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java @@ -149,17 +149,12 @@ public class TemplateSearchController { */ @RequestMapping("checkName") @ResponseBody - public ResultUtil checkName(Integer parentId, String columnName) { - try{ - Integer id = customizeMapper.selectListCheckName(parentId, columnName); - if (id != null) { - return ResultUtil.error(); - } else { - return ResultUtil.ok(); - } - }catch (Exception e){ - e.printStackTrace(); + public ResultUtil checkName(Integer parentId, String columnName) throws Exception{ + Integer id = customizeMapper.selectListCheckName(parentId, columnName); + if (id != null) { return ResultUtil.error(); + } else { + return ResultUtil.ok(); } } @@ -177,16 +172,11 @@ public class TemplateSearchController { */ @RequestMapping("checkColumnExist") @ResponseBody - public ResultUtil checkColumnExist(String columnValue, String tableValue,Integer id) { - try { - Integer existId = customizeMapper.checkColumnExist(columnValue, tableValue); - if (existId == null || id.equals(existId)) { - return ResultUtil.ok(); - } else { - return ResultUtil.error(); - } - }catch (Exception e){ - e.printStackTrace(); + public ResultUtil checkColumnExist(String columnValue, String tableValue,Integer id) throws Exception{ + Integer existId = customizeMapper.checkColumnExist(columnValue, tableValue); + if (existId == null || id.equals(existId)) { + return ResultUtil.ok(); + } else { return ResultUtil.error(); } } @@ -207,28 +197,23 @@ public class TemplateSearchController { @OptionalLog(module = "新增",methods = "自定义模板",fieldName = "columnName") @RequestMapping("addTemplate") @ResponseBody - public ResultUtil addTemplate(Emr_Customize customize,HttpServletRequest request) { - try { - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - if(StringUtils.isBlank(customize.getColumnName())){ - return ResultUtil.error("字段名/模板名不能为空!"); - } - if(customize.getParentId() == null){ - customize.setParentId(0); - } - Integer id = customizeMapper.selectListCheckName(customize.getParentId(), customize.getColumnName()); - if (id != null) { - return ResultUtil.error("字段名/模板名不能重复!"); - } - templateSearchService.addTemplate(customize,request); - return ResultUtil.ok(customize.getId()); - }else{ - return ResultUtil.error("请不要重复提交!"); + public ResultUtil addTemplate(Emr_Customize customize,HttpServletRequest request) throws Exception{ + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + if(StringUtils.isBlank(customize.getColumnName())){ + return ResultUtil.error("字段名/模板名不能为空!"); } - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("添加失败，请联系超管!"); + if(customize.getParentId() == null){ + customize.setParentId(0); + } + Integer id = customizeMapper.selectListCheckName(customize.getParentId(), customize.getColumnName()); + if (id != null) { + return ResultUtil.error("字段名/模板名不能重复!"); + } + templateSearchService.addTemplate(customize,request); + return ResultUtil.ok(customize.getId()); + }else{ + return ResultUtil.error("请不要重复提交!"); } } @@ -248,21 +233,16 @@ public class TemplateSearchController { @OptionalLog(module = "修改",methods = "自定义模板",fieldName = "columnName") @RequestMapping("updateTemplate") @ResponseBody - public ResultUtil updateTemplate(Emr_Customize customize,HttpServletRequest request) { - try { - if(null == customize.getParentId()){ - customize.setParentId(0); - } - Integer id = customizeMapper.selectListCheckName(customize.getParentId(), customize.getColumnName()); - if(null != id && !id.equals(customize.getId())){ - return ResultUtil.error("字段名已存在!"); - } - templateSearchService.updateTemplate(customize,request); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("修改失败，请联系超管！"); + public ResultUtil updateTemplate(Emr_Customize customize,HttpServletRequest request) throws Exception{ + if(null == customize.getParentId()){ + customize.setParentId(0); } + Integer id = customizeMapper.selectListCheckName(customize.getParentId(), customize.getColumnName()); + if(null != id && !id.equals(customize.getId())){ + return ResultUtil.error("字段名已存在!"); + } + templateSearchService.updateTemplate(customize,request); + return ResultUtil.ok(); } /** @@ -312,14 +292,9 @@ public class TemplateSearchController { @OptionalLog(module = "删除",methods = "自定义模板",fieldName = "columnName",tableName = "emr_customize") @RequestMapping("deleteTemplate") @ResponseBody - public ResultUtil deleteTemplate(Integer id) { - try { - templateSearchService.deleteTemplate(id); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil deleteTemplate(Integer id) throws Exception{ + templateSearchService.deleteTemplate(id); + return ResultUtil.ok(); } /***************************************自定义模板选择********************************************/ @@ -388,22 +363,17 @@ public class TemplateSearchController { */ @RequestMapping("checkModleFlag") @ResponseBody - public ResultUtil checkModleFlag(String modleFlag,HttpServletRequest request) { + public ResultUtil checkModleFlag(String modleFlag,HttpServletRequest request) throws Exception{ if ("系统默认模板".equals(modleFlag)) { return ResultUtil.error("该模板标识已存在！"); } Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); String creater = user.getUserId().toString(); - try { - Emr_Modle modle = emrModleMapper.checkModleFlag(creater, modleFlag); - if(modle == null){ - return ResultUtil.ok(); - }else{ - return ResultUtil.error("该模板标识已存在！"); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); + Emr_Modle modle = emrModleMapper.checkModleFlag(creater, modleFlag); + if(modle == null){ + return ResultUtil.ok(); + }else{ + return ResultUtil.error("该模板标识已存在！"); } } @@ -421,22 +391,17 @@ public class TemplateSearchController { */ @RequestMapping("checkModleName") @ResponseBody - public ResultUtil checkModleName(String modleName,HttpServletRequest request) { + public ResultUtil checkModleName(String modleName,HttpServletRequest request) throws Exception{ if ("系统默认模板".equals(modleName)) { return ResultUtil.error("该模板名称已存在！"); } Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); String creater = user.getUserId().toString(); - try { - Emr_Modle modle = emrModleMapper.checkModleName(creater, modleName); - if(modle == null){ - return ResultUtil.ok(); - }else{ - return ResultUtil.error("该模板名称已存在！"); - } - }catch (Exception e){ - e.printStackTrace(); - return ResultUtil.error(); + Emr_Modle modle = emrModleMapper.checkModleName(creater, modleName); + if(modle == null){ + return ResultUtil.ok(); + }else{ + return ResultUtil.error("该模板名称已存在！"); } } @@ -456,22 +421,17 @@ public class TemplateSearchController { @OptionalLog(module = "新增",methods = "自定义模板分类",fieldName = "modleName") @RequestMapping("addTemplateSelect") @ResponseBody - public ResultUtil addTemplateSelect(Emr_Modle emrModle,HttpServletRequest request) { - try { - if(StringUtils.isNotBlank(emrModle.getModleName()) && StringUtils.isNotBlank(emrModle.getModleFlag())){ - boolean flag = FormTokenFlagUtil.isFlag(request); - if(flag){ - templateSearchService.addTemplateSelect(emrModle,request); - return ResultUtil.ok(emrModle.getId()); - }else{ - return ResultUtil.error("请不要重复提交!"); - } + public ResultUtil addTemplateSelect(Emr_Modle emrModle,HttpServletRequest request) throws Exception{ + if(StringUtils.isNotBlank(emrModle.getModleName()) && StringUtils.isNotBlank(emrModle.getModleFlag())){ + boolean flag = FormTokenFlagUtil.isFlag(request); + if(flag){ + templateSearchService.addTemplateSelect(emrModle,request); + return ResultUtil.ok(emrModle.getId()); }else{ - return ResultUtil.error("模板标识或模板名称不能为空!"); + return ResultUtil.error("请不要重复提交!"); } - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("添加错误，请联系超管!"); + }else{ + return ResultUtil.error("模板标识或模板名称不能为空!"); } } @@ -556,33 +516,28 @@ public class TemplateSearchController { @OptionalLog(module = "修改",methods = "自定义模板分类",fieldName = "modleName") @RequestMapping("updateTemplateSelect") @ResponseBody - public ResultUtil updateTemplateSelect(Emr_Modle modle, Integer selectFlagId,HttpServletRequest request) { - try { - if("系统默认模板".equals(modle.getModleFlag())){ - return ResultUtil.error("该模板标识已存在！"); + public ResultUtil updateTemplateSelect(Emr_Modle modle, Integer selectFlagId,HttpServletRequest request) throws Exception{ + if("系统默认模板".equals(modle.getModleFlag())){ + return ResultUtil.error("该模板标识已存在！"); + } + if("系统默认模板".equals(modle.getModleName())){ + return ResultUtil.error("该模板名称已存在！"); + } + if(StringUtils.isNotBlank(modle.getModleFlag()) && StringUtils.isNotBlank(modle.getModleName())){ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + String creater = user.getUserId().toString(); + Emr_Modle emr_modle = emrModleMapper.checkModleFlag(creater, modle.getModleFlag()); + if(null != emr_modle && !emr_modle.getId().equals(modle.getId())){ + return ResultUtil.error("该模板标志已存在！"); } - if("系统默认模板".equals(modle.getModleName())){ + Emr_Modle emr_modle1 = emrModleMapper.checkModleName(creater, modle.getModleName()); + if(null != emr_modle1 && !emr_modle1.getId().equals(modle.getId())){ return ResultUtil.error("该模板名称已存在！"); } - if(StringUtils.isNotBlank(modle.getModleFlag()) && StringUtils.isNotBlank(modle.getModleName())){ - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - String creater = user.getUserId().toString(); - Emr_Modle emr_modle = emrModleMapper.checkModleFlag(creater, modle.getModleFlag()); - if(null != emr_modle && !emr_modle.getId().equals(modle.getId())){ - return ResultUtil.error("该模板标志已存在！"); - } - Emr_Modle emr_modle1 = emrModleMapper.checkModleName(creater, modle.getModleName()); - if(null != emr_modle1 && !emr_modle1.getId().equals(modle.getId())){ - return ResultUtil.error("该模板名称已存在！"); - } - templateSearchService.updateTemplateSelect(modle, selectFlagId,request); - return ResultUtil.ok(); - }else{ - return ResultUtil.error("模板标志或模板名称不能为空!"); - } - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("更新错误！请联系超管"); + templateSearchService.updateTemplateSelect(modle, selectFlagId,request); + return ResultUtil.ok(); + }else{ + return ResultUtil.error("模板标志或模板名称不能为空!"); } } @@ -600,28 +555,23 @@ public class TemplateSearchController { */ @RequestMapping("/udpateCheckByModle/{id}") @ResponseBody - public ResultUtil udpateCheckByModle(@PathVariable("id")Integer id,HttpServletRequest request) { - try { - //查询默认的，将默认的取消 - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - String creater = user.getUserName(); - Emr_Modle flagModle = emrModleMapper.selectFlagExist(creater); - //将此设为默认 - Emr_Modle modle = emrModleMapper.selectByPrimaryKey(id); - if(id == 1 || modle.getCreater().equals(creater)){ - if(flagModle != null){ - flagModle.setSelectFlag(0); - templateSearchService.updateTemplateSelect(flagModle,request); - } - modle.setSelectFlag(1); - templateSearchService.updateTemplateSelect(modle,request); - return ResultUtil.ok(); - }else{ - return ResultUtil.error("修改失败,该模板为客户创建,不建议修改"); + public ResultUtil udpateCheckByModle(@PathVariable("id")Integer id,HttpServletRequest request) throws Exception{ + //查询默认的，将默认的取消 + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + String creater = user.getUserName(); + Emr_Modle flagModle = emrModleMapper.selectFlagExist(creater); + //将此设为默认 + Emr_Modle modle = emrModleMapper.selectByPrimaryKey(id); + if(id == 1 || modle.getCreater().equals(creater)){ + if(flagModle != null){ + flagModle.setSelectFlag(0); + templateSearchService.updateTemplateSelect(flagModle,request); } - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error("更新错误！请联系超管"); + modle.setSelectFlag(1); + templateSearchService.updateTemplateSelect(modle,request); + return ResultUtil.ok(); + }else{ + return ResultUtil.error("修改失败,该模板为客户创建,不建议修改"); } } @@ -641,14 +591,9 @@ public class TemplateSearchController { @OptionalLog(module = "删除",methods = "自定义模板分类",fieldName = "modleName",tableName = "emr_modle") @RequestMapping("deleteTemplateSelect") @ResponseBody - public ResultUtil deleteTemplateSelect(Integer id) { - try { - templateSearchService.deleteTemplateSelect(id); - return ResultUtil.ok(); - } catch (Exception e) { - e.printStackTrace(); - return ResultUtil.error(); - } + public ResultUtil deleteTemplateSelect(Integer id) throws Exception{ + templateSearchService.deleteTemplateSelect(id); + return ResultUtil.ok(); } /** @@ -750,7 +695,7 @@ public class TemplateSearchController { @OptionalLog(module = "保存",methods = "自定义模板分配") @RequestMapping("addModleRelated") @ResponseBody - public ResultUtil addModleRelated(Integer modleId, String checks,HttpServletRequest request) { + public ResultUtil addModleRelated(Integer modleId, String checks,HttpServletRequest request) throws Exception{ if(modleId != null && StringUtils.isNotBlank(checks)){ try { templateSearchService.addModleRelated(modleId, checks,request); @@ -991,6 +936,8 @@ public class TemplateSearchController { Integer unlockOper = 0; Integer borrowingOper = 0; Integer downloadOper = 0; + Integer editOper = 0; + Integer delOper = 0; for(String menu : menus){ if(StringUtils.isNotBlank(menu)){ if("/commom/addLockByPatientId".equals(menu)){ @@ -1005,6 +952,12 @@ public class TemplateSearchController { if("/commom/downloadPdf".equals(menu)){ downloadOper = 1; } + if("/commom/updateRecord".equals(menu)){ + editOper = 1; + } + if("/commom/deleteRecord".equals(menu)){ + delOper = 1; + } } } List distributions = new ArrayList<>(); @@ -1017,6 +970,8 @@ public class TemplateSearchController { commom.setUnlockOper(unlockOper); commom.setBorrowingOper(borrowingOper); commom.setDownloadOper(downloadOper); + commom.setEditOper(editOper); + commom.setDelOper(delOper); if(null != distributions && !distributions.isEmpty() || user.getRoleId() == 0){ commom.setIsShowDetail(1); } @@ -1437,17 +1392,12 @@ public class TemplateSearchController { @OptionalLog(module = "新增",methods = "病案查询页面病案锁定") @RequestMapping("addLockByPatientId") @ResponseBody - public ResultUtil addLockByPatientId(String patientIds,HttpServletRequest request){ - try{ - List commomtables = commomMapper.selectAllByPatients(patientIds); - if(null != commomtables && !commomtables.isEmpty()){ - lockService.insert(commomtables,request); - return ResultUtil.ok(); - }else{ - return null; - } - }catch(Exception e){ - e.printStackTrace(); + public ResultUtil addLockByPatientId(String patientIds,HttpServletRequest request) throws Exception{ + List commomtables = commomMapper.selectAllByPatients(patientIds); + if(null != commomtables && !commomtables.isEmpty()){ + lockService.insert(commomtables,request); + return ResultUtil.ok(); + }else{ return null; } } @@ -1468,19 +1418,14 @@ public class TemplateSearchController { @OptionalLog(module = "修改",methods = "病案查询页面病案锁定") @RequestMapping("updateLockByPatientId") @ResponseBody - public ResultUtil updateLockByPatientId(String patientId,HttpServletRequest request){ - try{ - if(StringUtils.isNoneBlank(patientId)){ - Emr_Lock lock = lockMapper.selectLockByPatientId(patientId,1); - if(null != lock){ - lockService.udpate(lock,request); - } - return ResultUtil.ok(); - }else{ - return null; + public ResultUtil updateLockByPatientId(String patientId,HttpServletRequest request) throws Exception{ + if(StringUtils.isNoneBlank(patientId)){ + Emr_Lock lock = lockMapper.selectLockByPatientId(patientId,1); + if(null != lock){ + lockService.udpate(lock,request); } - }catch(Exception e){ - e.printStackTrace(); + return ResultUtil.ok(); + }else{ return null; } } @@ -1501,16 +1446,11 @@ public class TemplateSearchController { @OptionalLog(module = "批量修改",methods = "病案查询页面病案锁定") @RequestMapping("updateLockByPatientIds") @ResponseBody - public ResultUtil updateLockByPatientIds(String patientIds,HttpServletRequest request){ - try{ - if(StringUtils.isNoneBlank(patientIds)){ - lockService.udpateUnlockByPatients(patientIds,request); - return ResultUtil.ok(); - }else{ - return null; - } - }catch(Exception e){ - e.printStackTrace(); + public ResultUtil updateLockByPatientIds(String patientIds,HttpServletRequest request) throws Exception{ + if(StringUtils.isNoneBlank(patientIds)){ + lockService.udpateUnlockByPatients(patientIds,request); + return ResultUtil.ok(); + }else{ return null; } } diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index db222d9..eb6e2f7 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -4,7 +4,6 @@ import com.emr.vo.commomSearch.CommomTree; import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.FontVo.FontCommom; import org.apache.ibatis.annotations.Param; -import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -61,7 +60,7 @@ public interface CommomMapper { /** * isExistInpatient 根据条件查询该病案是否存在 * */ - int isExistInpatient(FontCommom record); + List isExistInpatient(FontCommom record); int insertSelective(CommomVo record); diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index 572c91f..967aa86 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -12,6 +12,7 @@ import com.emr.service.tScanAssort.T_Scan_AssortService; import com.emr.util.UUIDUtils; import com.emr.util.img2PdfUtil; import com.emr.vo.FontVo.ScanAssortVo; +import com.emr.vo.Msg; import com.emr.vo.User; import com.emr.vo.commomSearch.CommomBlood; import com.emr.vo.commomSearch.CommomVo; @@ -25,16 +26,17 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.multipart.commons.CommonsMultipartResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; +import java.util.*; /** * @ProjectName: @@ -98,6 +100,12 @@ public class CommomService { return userIds; } + /** + * 获取所属医院下所有用户不包括admin + * @param userName + * @param request + * @return + */ public List getUserList(String userName,HttpServletRequest request){ List userList = new ArrayList<>(); try { @@ -130,60 +138,39 @@ public class CommomService { return userList; } - public String updatePic(MultipartFile[] files, String patientId, String assortId) throws Exception{ - //查询目录 - CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId); - String path = commomVo.getNewPath(); - //不存在的话,组织存放目录 - if(StringUtils.isBlank(path)){ - //查询设置的根目录 - EmrComomSet emrComomSet = commomSetService.selectByPrimaryKey(1); - String newPicRoot = emrComomSet.getNewPicRoot(); - if(StringUtils.isBlank(newPicRoot)){ - return "目录未设置,请先前往参数设置页面设置图片存在根目录!"; - } - //组织存放目录 - //D:\新图像\202005\GDZT20120916076-2a41fe252a024978af7098afcf52ca1a - //格式化年月 - SimpleDateFormat fmt = new SimpleDateFormat("yyyyMM"); - path = newPicRoot + "/" + fmt.format(new Date()) + "/" + commomVo.getInpatientNo() + "-" + patientId; - //保存至commomtable表 - commomVo.setNewPath(path); - commomMapper.updateByPrimaryKeySelective(commomVo); - } - //该目录不存在，创建目录 - if(!new File(path).isDirectory()){ - new File(path).mkdirs(); - } - SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - //定义批量添加进图片明细表集合 - List insertList = new ArrayList<>(); - for (int i = 0; i < files.length; i++) { - String fullName = files[i].getOriginalFilename(); - String src = path + "/" + fullName; - File file = new File(src); - //判断是否存在，存在文件加日期 - if (file.exists()) { - //原始名 - String baseName = FilenameUtils.getBaseName(files[i].getOriginalFilename()); - //扩展名 - String ext = FilenameUtils.getExtension(files[i].getOriginalFilename()); - fullName = baseName + "_" + fmt.format(new Date()) + "." + ext; + /** + * 病案预览页面新增图片 + * @param files + * @param patientId + * @param assortId + * @return + * @throws Exception + */ + public ResultUtil updatePic(MultipartFile[] files, String patientId, String assortId) throws Exception { + if (null != files) { + //查询目录 + CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId); + ResultUtil resultUtil = selectRootPath(patientId, commomVo.getInpatientNo()); + if (resultUtil.getCode().equals(0)) { + String path = resultUtil.getMsg(); + //保存至commomtable表 + commomVo.setNewPath(path); + commomMapper.updateByPrimaryKeySelective(commomVo); + List fileList = CollectionUtils.arrayToList(files); + //定义批量添加进图片明细表集合 + List insertList = getScanAssortListByUpdatePic(fileList, patientId, assortId, path); + //批量新增图片记录 + scanAssortService.SimpleInsert(insertList); + return ResultUtil.ok(); + } else { + return resultUtil; } - src = path + "/" + fullName; - //上传图片 - files[i].transferTo(new File(src)); - T_Scan_Assort scanAssort = new T_Scan_Assort(); - scanAssort.setPatientId(patientId); - scanAssort.setAssortId(assortId); - scanAssort.setScanPage(fullName); - scanAssort.setSource(Short.valueOf("2")); - insertList.add(scanAssort); } - scanAssortService.SimpleInsert(insertList); return null; } + + //脐血库显示pdf public void showRecordContentBlood(String patientId, String scanPages, String sources, String flag, HttpServletResponse response) throws Exception{ String pdfName = "档案管理PDF"; if (StringUtils.isNotBlank(patientId)) { @@ -230,16 +217,23 @@ public class CommomService { } } + /** + * 修改病案备注 + * @param commomVo + */ + public void updateRecordReMark(CommomVo commomVo){ + commomMapper.updateRecordReMark(commomVo); + } /** * 脐血库新增档案 * @param commomBlood */ - public String addRecordBlood(CommomBlood commomBlood) { + public ResultUtil addRecordBlood(CommomBlood commomBlood, HttpServletRequest request) throws Exception{ + //获取patientId + String patientId = UUIDUtils.getUUID(); //复制到commomVo CommomVo commomVo = new CommomVo(); BeanUtils.copyProperties(commomBlood,commomVo); - //生成patientId - String patientId = UUIDUtils.getUUID(); commomVo.setPatientId(patientId); //设置创建时间到dis_date SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -247,16 +241,75 @@ public class CommomService { //设置初始化is_oper=1 commomVo.setIsOper("1"); //设置图片根目录 - //selectRootPath(patientId,) - //保存至commomtable表 - //commomVo.setNewPath(path); + ResultUtil resultUtil = selectRootPath(patientId, commomBlood.getInpatientNo()); + String root = ""; + if(resultUtil.getCode().equals(0)){ + root = resultUtil.getMsg(); + commomVo.setNewPath(root); + }else{ + return resultUtil; + } + //批量上传图片 + List scanAssorts = addRecordUpdatePic(patientId, root, request); //新增 commomMapper.insertSelective(commomVo); - return null; + //批量新增图片记录 + scanAssortService.SimpleInsert(scanAssorts); + return ResultUtil.ok(); + } + + //新增档案时图片返回图片记录方法 + private List addRecordUpdatePic(String patientId,String root,HttpServletRequest request) throws Exception{ + //获取文件上下文 + CommonsMultipartResolver multipartResolver=new CommonsMultipartResolver( + request.getSession().getServletContext()); + //定义图片集合 + List scanAssorts = new ArrayList<>(); + // 判断是否是多数据段提交格式 + if (multipartResolver.isMultipart(request)) { + //获取文件request + MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest)request; + //获取图片Map + MultiValueMap multiFileMap = multiRequest.getMultiFileMap(); + //取出图片map集合 + Set keySet = multiFileMap.keySet(); + //遍历图片map + for (String assortId : keySet) { + //获取分类图片集合 + List multipartFiles = multiFileMap.get(assortId); + scanAssorts.addAll(getScanAssortListByUpdatePic(multipartFiles,patientId,assortId,root)); + } + } + return scanAssorts; + } + + //封装批量上传图片，返回上传图片记录 + private List getScanAssortListByUpdatePic(List multipartFiles,String patientId,String assortId,String root) throws Exception{ + List scanAssorts = new ArrayList<>(); + //遍历分类图片集合 + for(MultipartFile pic : multipartFiles){ + //定义对象 + T_Scan_Assort scanAssort = new T_Scan_Assort(); + String picName = pic.getOriginalFilename(); + //判断图片名称是否存在，存在重命名 + picName = getPicName(root, picName, pic); + //组织绝对路径 + String src = root + "\\" + picName; + //上传图片 + pic.transferTo(new File(src)); + //设置进对象 + scanAssort.setPatientId(patientId); + scanAssort.setAssortId(assortId); + scanAssort.setScanPage(picName); + scanAssort.setSource(Short.valueOf("2")); + scanAssort.setIsDel(Short.valueOf("0")); + scanAssorts.add(scanAssort); + } + return scanAssorts; } //封装组织新增图片根目录 - public ResultUtil selectRootPath(String patientId,String inpatientId){ + private ResultUtil selectRootPath(String patientId,String inpatientId){ //查询设置的根目录 EmrComomSet emrComomSet = commomSetService.selectByPrimaryKey(1); String newPicRoot = emrComomSet.getNewPicRoot(); @@ -267,6 +320,46 @@ public class CommomService { //D:\新图像\202005\GDZT20120916076-2a41fe252a024978af7098afcf52ca1a //格式化年月 SimpleDateFormat fmt1 = new SimpleDateFormat("yyyyMM"); - return ResultUtil.ok(newPicRoot + "/" + fmt1.format(new Date()) + "/" + inpatientId + "-" + patientId); + String path = newPicRoot + "\\" + fmt1.format(new Date()) + "\\" + inpatientId + "-" + patientId; + //该目录不存在，创建目录 + if (!new File(path).isDirectory()) { + new File(path).mkdirs(); + } + return ResultUtil.ok(path); + } + + //验证图片是否存在，存在重命名 + private String getPicName(String root,String fullName,MultipartFile pic){ + SimpleDateFormat fmt = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + String src = root + "\\" + fullName; + File file = new File(src); + //判断是否存在，存在文件加日期 + if (file.exists()) { + //原始名 + String baseName = FilenameUtils.getBaseName(pic.getOriginalFilename()); + //扩展名 + String ext = FilenameUtils.getExtension(pic.getOriginalFilename()); + fullName = baseName + "_" + fmt.format(new Date()) + "." + ext; + } + return fullName; + } + + /** + * 修改档案 + * @param commomVo + */ + public void updateRecord(CommomVo commomVo){ + commomMapper.updateByPrimaryKeySelective(commomVo); + } + /** + * 删除档案 + * @param patientId + */ + public void deleteRecord(String patientId){ + //删除操作修改isOper的状态为-1 + CommomVo commomVo = new CommomVo(); + commomVo.setPatientId(patientId); + commomVo.setIsOper("-1"); + commomMapper.updateRecordReMark(commomVo); } } diff --git a/src/main/java/com/emr/service/emrLock/EmrLockServiceImpl.java b/src/main/java/com/emr/service/emrLock/EmrLockServiceImpl.java index 53b5a9d..04aee46 100644 --- a/src/main/java/com/emr/service/emrLock/EmrLockServiceImpl.java +++ b/src/main/java/com/emr/service/emrLock/EmrLockServiceImpl.java @@ -55,7 +55,7 @@ public class EmrLockServiceImpl{ int simpleInsertCount = 2100/colCount; for (int i = 0; i < commomtables.size(); i++) { //处理批量添加sql太长问题，设定个数为180 - if(null != list && i > 0 && list.size()%simpleInsertCount == 0){ + if(i != 0 && list.size()%simpleInsertCount == 0){ list.clear(); } Emr_Lock lock = new Emr_Lock(); @@ -72,7 +72,7 @@ public class EmrLockServiceImpl{ lock.setLockState(1); list.add(lock); //是180的倍数或最后一个 - if(null != list && (list.size()%simpleInsertCount == 0 || i == commomtables.size() - 1)){ + if(list.size()%simpleInsertCount == 0 || i == commomtables.size() - 1){ lockMapper.SimpleInsert(list); } } diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java index b5dbc1d..7a0ac10 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortService.java @@ -11,7 +11,7 @@ public interface T_Scan_AssortService { int SimpleUpdate(String patientId,String assortId,List list); int SimpleUpdateByPatientIdAndScanPages(String patientId,String newAssortId,String scanPages); int SimpleDelByPatientIdAndScanPages(String patientId,String scanPages); - int SimpleInsert(List list); + void SimpleInsert(List list); List selectPicPaths(String patientId,String scanPages,String flag); diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java index a08aba3..6c84a1c 100644 --- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java +++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java @@ -1,13 +1,18 @@ package com.emr.service.tScanAssort; +import com.emr.dao.CommomMapper; import com.emr.dao.tScanAssort.T_Scan_AssortMapper; +import com.emr.entity.recordLock.Emr_Lock; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.ScanAssortVo; import com.emr.vo.commomSearch.CommomVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -27,6 +32,8 @@ import java.util.List; public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ @Autowired private T_Scan_AssortMapper scanAssortMapper; + @Autowired + private CommomMapper commomMapper; @Override public void updateByPrimaryKeySelective(T_Scan_Assort newAssort, T_Scan_Assort oldAssort) { scanAssortMapper.updateByPrimaryKeySelective(newAssort,oldAssort); @@ -48,8 +55,25 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService{ } @Override - public int SimpleInsert(List list) { - return scanAssortMapper.SimpleInsert(list); + public void SimpleInsert(List list) { + if(!CollectionUtils.isEmpty(list)) { + //根据字段多少批量新增 + ///查询表列数 + int colCount = commomMapper.selectColByTableName("t_scan_assort"); + int simpleInsertCount = 2100 / colCount; + List scanAssorts = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + //处理批量添加sql太长问题，设定个数为180 + if (i != 0 && list.size() % simpleInsertCount == 0) { + scanAssorts.clear(); + } + scanAssorts.add(list.get(i)); + //是180的倍数或最后一个 + if (list.size() % simpleInsertCount == 0 || i == list.size() - 1) { + scanAssortMapper.SimpleInsert(scanAssorts); + } + } + } } @Override diff --git a/src/main/java/com/emr/vo/commomSearch/CommomBlood.java b/src/main/java/com/emr/vo/commomSearch/CommomBlood.java index 557f434..529f173 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomBlood.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomBlood.java @@ -19,6 +19,8 @@ import javax.validation.constraints.NotBlank; */ @Data public class CommomBlood { + private String patientId; + @NotBlank(message = "脐血编号不能为空") @Length(max = 15,message = "字符不能超过15个字符") private String inpatientNo;//脐血编号 diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java index 4f47165..4446702 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java @@ -143,6 +143,10 @@ public class CommomVo { private Integer lockStatus=0;//锁定状态 + private Integer editOper=0;//可修改 + + private Integer delOper=0;//可删除 + private String diagCode;//诊断编号 private String diagName;//诊断名称 @@ -1882,4 +1886,20 @@ public class CommomVo { public void setIsDownload(Integer isDownload) { this.isDownload = isDownload; } + + public Integer getEditOper() { + return editOper; + } + + public void setEditOper(Integer editOper) { + this.editOper = editOper; + } + + public Integer getDelOper() { + return delOper; + } + + public void setDelOper(Integer delOper) { + this.delOper = delOper; + } } \ No newline at end of file diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index f35fdcf..75ca6af 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -532,6 +532,9 @@ main_diag_code, + + new_path, + @@ -594,6 +597,9 @@ #{mainDiagCode,jdbcType=NVARCHAR}, + + #{newPath,jdbcType=NVARCHAR}, + @@ -658,6 +664,9 @@ new_path = #{newPath,jdbcType=NVARCHAR}, + + main_diag_code = #{mainDiagCode,jdbcType=NVARCHAR}, + where patient_id = #{patientId,jdbcType=VARCHAR} @@ -1187,9 +1196,9 @@ - SELECT - count(1) + * FROM commomtable LEFT JOIN @@ -1197,6 +1206,7 @@ ON commomtable.patient_id = commomtable1.patient_id + commomtable.is_oper != -1 AND commomtable.patient_id = #{patientId} @@ -1259,8 +1269,16 @@ AS commom - - update commomtable set memo = #{memo} + + update commomtable + + + memo = #{memo}, + + + is_oper = #{isOper}, + + where patient_id = #{patientId} \ No newline at end of file diff --git a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml index 08fb6a4..90cb327 100644 --- a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml +++ b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml @@ -204,4 +204,8 @@ update t_scan_assort set is_del = 0 where patient_id = #{patientId} and scan_page in (${scanPages}) + + + delete from t_scan_assort where patient_id = #{patientId} + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp index 292af36..2ee4376 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/annotationTemplate/annotationTemplateList.jsp @@ -26,10 +26,10 @@ .searchDiv{ padding-top:5px; height:30px; + text-align: right; } .searchInput{ width: 18%; - margin-left: 18px; } .searchElement{ width: 34%; @@ -52,7 +52,6 @@ } /**表格div*/ .tableDiv{ - padding-top:15px; margin-left:1%; } /***模态1*/ @@ -111,7 +110,7 @@
-
+
@@ -147,7 +146,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp index d6d2770..f9240f3 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveList/approveList1.jsp @@ -28,23 +28,22 @@ } .mainDiv{ background-color: #fff; - height:100%; } /**搜索区*/ .searchDiv{ padding-top:5px; height: 30px; + text-align: right; } .searchDiv1{ margin-top: 10px; height: 30px; + text-align: right; } .tableDiv{ width: 100%; - height: 100%; background-color: #fff; margin-left: 1%; - padding-top:5px; } .dateSearchDiv{ width:29%; @@ -201,7 +200,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp index 642baee..e1097b4 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList1.jsp @@ -27,20 +27,20 @@ } .mainDiv{ background-color: #fff; - height:100%; } /**搜索区*/ .searchDiv{ padding-top:1%; height: 30px; + text-align: right; } .searchDiv1{ padding-top:2%; height: 30px; + text-align: right; } .tableDiv{ width:100%; - height:100%; background-color: #fff; margin-left: 1%; } @@ -71,16 +71,10 @@ } /**查询按钮组*/ .btnsDiv{ - height:5%; + height:30px; } .btn{ margin-right:3%; - margin-left: 2%; - } - .btns{ - float:right; - margin-right:3%; - margin-bottom: 1%; } .pagination{ margin:0!important; @@ -185,7 +179,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp index c4c45cb..7d5fe98 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage1.jsp @@ -33,16 +33,17 @@ /**搜索区*/ .mainDiv{ background-color: #fff; - height:100%; } .searchDiv{ padding-top:5px; height:30px; + text-align: right; } .searchDiv1{ margin-top: 10px; margin-left: 14px; height:30px; + text-align: right; } /**查询按钮组*/ .btnsDiv{ @@ -62,7 +63,7 @@ } .dateSearchInput{ width:37%; - margin-left:3%; + margin-left:5px; } .dateLabelDiv{ width: 20%; @@ -87,12 +88,11 @@ /**搜索按钮div*/ .searchBtnDiv{ float:left; - margin-left: 20px; + margin-left: 74px; height:15px; } #tableDiv{ margin-left:15px; - margin-top:10px; } /***模态1*/ .line1{ @@ -169,7 +169,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp index dff4ce6..708b9a6 100644 --- a/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp +++ b/src/main/webapp/WEB-INF/views/distributionManage/roleDistributionManage.jsp @@ -96,49 +96,59 @@
-
-
-
-
- -
-
- -
-
+ +
+
+
-
-
-
- +
+
+
+
+
+ +
+
+ +
+
-
- +
+
+
+ +
+
+ +
+
+
+
+ + + +
+ +
+ +
+
-
- - - - -
-
- -
- -
-
diff --git a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp index 794e785..4ac43bc 100644 --- a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp +++ b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp @@ -98,8 +98,8 @@
diff --git a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp index 48ffccd..ada820f 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp @@ -33,7 +33,7 @@ } .dateSearchInput{ width:30%; - margin-left:2%; + margin-left:5px; } .dateLabelDiv{ width: 30%; @@ -42,6 +42,7 @@ .searchInput{ width:21%; margin-left: 5px; + text-align: right; } .searchElement{ width:40%; diff --git a/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp b/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp index d891915..a3629a1 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/funGroupDistribution.jsp @@ -26,7 +26,6 @@ /**搜索区*/ .mainDiv{ background-color: #fff; - height:100%; } .searchDiv{ padding-top:10px; @@ -44,6 +43,7 @@ margin-left: 10%; } .dateSearchDiv{ + text-align: right; width:34%; } .dateSearchInput{ @@ -55,6 +55,7 @@ } /*搜索区域*/ .searchInput{ + text-align: right; width:18%; } /*搜索区域labelDiv*/ @@ -71,7 +72,6 @@ } #tableDiv{ margin-left:12px; - margin-top:5px; } .pagination{ margin:0!important; diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList1.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList1.jsp index 0533807..93933bb 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList1.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomList1.jsp @@ -21,24 +21,15 @@ - -