From 0acc1ebcf0fc19399a773ff7f5771e15a63d6648 Mon Sep 17 00:00:00 2001 From: hcy <314517173@qq.com> Date: Mon, 19 Aug 2024 16:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=98=E9=9B=85=E9=99=84=E4=BA=8C=E7=97=85?= =?UTF-8?q?=E4=BE=8B=E5=A4=8D=E5=8D=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/FontController.java | 87 +++++++++++++------ .../java/com/emr/controller/UrlFilter.java | 2 +- .../emr/dao/recordType/Emr_TypeMapper.java | 6 ++ .../dao/tScanAssort/T_Scan_AssortMapper.java | 10 +++ .../java/com/emr/dto/PatInfoEmrTypeDto.java | 17 ++++ .../service/recordType/EmrTypeService.java | 6 ++ .../recordType/EmrTypeServiceImpl.java | 6 ++ .../tScanAssort/T_Scan_AssortService.java | 10 +++ .../tScanAssort/T_Scan_AssortServiceImpl.java | 61 +++++++++++-- .../java/com/emr/vo/PatInfoEmrTypeVo.java | 15 ++++ src/main/java/com/emr/vo/PatScanAssort.java | 11 +++ src/main/java/com/emr/vo/PatScanAssortVo.java | 13 +++ .../java/com/emr/vo/emrType/EmrTypeFeVo.java | 10 +++ .../mapper/recordType/Emr_TypeMapper.xml | 3 + .../tScanAssort/T_Scan_AssortMapper.xml | 26 ++++++ 15 files changed, 251 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/emr/dto/PatInfoEmrTypeDto.java create mode 100644 src/main/java/com/emr/vo/PatInfoEmrTypeVo.java create mode 100644 src/main/java/com/emr/vo/PatScanAssort.java create mode 100644 src/main/java/com/emr/vo/PatScanAssortVo.java create mode 100644 src/main/java/com/emr/vo/emrType/EmrTypeFeVo.java diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 9f1c300..c84617d 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -10,6 +10,7 @@ import com.emr.dao.commomSearch.ScanPathMapper; import com.emr.dao.emrPdfWaterSet.EmrPdfWaterSetMapper; import com.emr.dao.recordLock.Emr_LockMapper; import com.emr.dao.tScanAssort.T_Scan_AssortMapper; +import com.emr.dto.PatInfoEmrTypeDto; import com.emr.entity.Power_User; import com.emr.entity.Zd_Assort; import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet; @@ -26,9 +27,11 @@ import com.emr.util.HttpClientUtils; import com.emr.util.Jpg2PdfUtil; import com.emr.vo.*; import com.emr.vo.FontVo.*; +import com.emr.vo.FontVo.ScanAssortVo; import com.emr.vo.commomSearch.CommomTree; import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.commomSearch.ScanPathVo; +import com.emr.vo.emrType.EmrTypeFeVo; import com.lowagie.text.Document; import com.lowagie.text.Image; import com.lowagie.text.Utilities; @@ -320,12 +323,12 @@ public class FontController { for (ArchiveMasterVo archiveMaster : list) { String masterId = archiveMaster.getId(); List pdfPaths = archiveDetailMapper.selectPDFRATH2(masterId, "7A9C621E3F4F4C9CA95292141C5E15E8"); - if (pdfPaths!=null||pdfPaths.isEmpty()){ - String newPath = "D:\\jiashi\\copy" + File.separator + archiveMaster.getName() + "-" + archiveMaster.getInpNo()+"-知情同意书"; + if (pdfPaths != null || pdfPaths.isEmpty()) { + String newPath = "D:\\jiashi\\copy" + File.separator + archiveMaster.getName() + "-" + archiveMaster.getInpNo() + "-知情同意书"; if (!new File(newPath).isDirectory()) { new File(newPath).mkdirs(); } - for (String pdfPath:pdfPaths){ + for (String pdfPath : pdfPaths) { String newSrc = newPath + File.separator + new File(pdfPath).getName(); try (InputStream inputStream = new FileInputStream(pdfPath); OutputStream outputStream = new FileOutputStream(newSrc)) { @@ -598,6 +601,7 @@ public class FontController { } return Msg.fail(); } + /** * @description: 批量导出国家病历 * @params: taskid @@ -607,23 +611,25 @@ public class FontController { */ @ResponseBody @RequestMapping(value = "BatchExportPdf") - public String batchExportPdf(int taskId) throws Exception { + public String batchExportPdf(int taskId) throws Exception { return batchExportService.batchExportPdf(taskId); } /** * 下载pdf病例到本地 + * * @param taskId * @param response */ @ResponseBody @RequestMapping(value = "downloadPdfZip", produces = {"text/json;charset=UTF-8"}, method = RequestMethod.POST) - public String downloadPdfZip(int taskId,HttpServletResponse response) throws IOException { - return batchExportService.downloadPdfZip(taskId,response); + public String downloadPdfZip(int taskId, HttpServletResponse response) throws IOException { + return batchExportService.downloadPdfZip(taskId, response); } /** * 湘雅二医院根据病案号返回患者病案信息 + * * @param patientId 病案号 * @return Msg */ @@ -639,58 +645,59 @@ public class FontController { /** * 广总血透接口 + * * @param // hemodialysisId 血透ID * @return String */ @RequestMapping(value = "commomListqf", method = RequestMethod.GET) public String commomListqf(Model model, HttpServletRequest request, @RequestParam("dataSource") String dataSource, - @RequestParam(value="hemodialysisId",required = false) String hemodialysisId, - @RequestParam(value="admissId",required = false) String admissId, - @RequestParam(value="outpatientNo",required = false) String outpatientNo) { + @RequestParam(value = "hemodialysisId", required = false) String hemodialysisId, + @RequestParam(value = "admissId", required = false) String admissId, + @RequestParam(value = "outpatientNo", required = false) String outpatientNo) { String userName = ObjectUtils.isEmpty(request.getParameter("userName")) ? "admin" : request.getParameter("userName"); - Map params = new HashMap<>(); + Map params = new HashMap<>(); params.put("userName", userName); params.put("userPwd", "123456"); String result = HttpClientUtils.doPost(POWER_URLHEAD + "/login", params); JSONObject jsonObject = JSONObject.parseObject(result); String token = jsonObject.getString("token"); - if(!ObjectUtils.isEmpty(token)){ + if (!ObjectUtils.isEmpty(token)) { this.getUserInfo(request, token, userName); //查询表格配置表的数据，根据配置动态显示表格字段 - Map tableConfigMap = commomMapper.queryTableConfig(dataSource); - if(!ObjectUtils.isEmpty(tableConfigMap)){ + Map tableConfigMap = commomMapper.queryTableConfig(dataSource); + if (!ObjectUtils.isEmpty(tableConfigMap)) { //血透ID 广总血透接口的参数 - model.addAttribute("hemodialysisId",hemodialysisId); + model.addAttribute("hemodialysisId", hemodialysisId); //住院号 - model.addAttribute("admissId",admissId); + model.addAttribute("admissId", admissId); //门诊号 - model.addAttribute("outpatientNo",outpatientNo); + model.addAttribute("outpatientNo", outpatientNo); //获取数据来源 - model.addAttribute("dataSource",dataSource); + model.addAttribute("dataSource", dataSource); //获取需要查询字段 - model.addAttribute("tableQueryField",tableConfigMap.get("tableField")); + model.addAttribute("tableQueryField", tableConfigMap.get("tableField")); //显示查询字段，并转为驼峰格式 model.addAttribute("tableField", ObjectUtils.isEmpty(tableConfigMap.get("tableField")) ? "" : DateUtils.toCamelCase(tableConfigMap.get("tableField").toString())); //获取查询字段中文名称 - model.addAttribute("tableFieldName",tableConfigMap.get("tableFieldName")); + model.addAttribute("tableFieldName", tableConfigMap.get("tableFieldName")); //获取排序字段，可点击表头列实现排序 - model.addAttribute("sortField",ObjectUtils.isEmpty(tableConfigMap.get("sortField")) ? "" : DateUtils.toCamelCase(tableConfigMap.get("sortField").toString())); + model.addAttribute("sortField", ObjectUtils.isEmpty(tableConfigMap.get("sortField")) ? "" : DateUtils.toCamelCase(tableConfigMap.get("sortField").toString())); //获取默认排序字段 - request.getSession().setAttribute("defaultSortField",tableConfigMap.get("defaultSortField")); + request.getSession().setAttribute("defaultSortField", tableConfigMap.get("defaultSortField")); //获取默认排序字段方式 - request.getSession().setAttribute("defaultSortFieldType",tableConfigMap.get("defaultSortFieldType")); + request.getSession().setAttribute("defaultSortFieldType", tableConfigMap.get("defaultSortFieldType")); } return "recordManage/commomSearch/commomListqf"; - }else{ + } else { model.addAttribute("msg", "模拟登录失败"); return "font/msg"; } } - public void getUserInfo(HttpServletRequest request, String token, String userName){ + public void getUserInfo(HttpServletRequest request, String token, String userName) { //创建连接工厂 JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance(); //创建客户端 @@ -703,7 +710,7 @@ public class FontController { } catch (Exception e) { e.printStackTrace(); } finally { - if(null != client) { + if (null != client) { client.destroy(); } } @@ -722,4 +729,34 @@ public class FontController { Subject subject = SecurityUtils.getSubject(); subject.login(userToken); } + + /** + * 查询打印用途类别信息（湘雅二医院） + * + * @param + * @return Msg + */ + @RequestMapping(value = "getEmrTypeList", method = RequestMethod.GET) + @ResponseBody + public Msg getEmrTypeList() { + List list = emrTypeService.getEmrTypeList(); + return Msg.successData(list); + } + + /** + * 根据病案打印用途分类对象查询病案分类页码数（湘雅二医院） + * + * @param patInfoEmrTypeDto + * @return Msg + */ + @RequestMapping(value = "getScanAssortPageByPatEmrType", method = RequestMethod.POST) + @ResponseBody + public Msg getScanAssortByPatInfoEmrType(@RequestBody PatInfoEmrTypeDto patInfoEmrTypeDto) { + if (ObjectUtils.isEmpty(patInfoEmrTypeDto) && StringUtils.isNotBlank(patInfoEmrTypeDto.getInpatientNo()) + && StringUtils.isNotBlank(patInfoEmrTypeDto.getDisDate()) && StringUtils.isNotBlank(patInfoEmrTypeDto.getName()) && ObjectUtils.isEmpty(patInfoEmrTypeDto.getEmrTypeIds())) { + return Msg.fail("传参不能为空"); + } + List patInfoEmrTypeVos = tScanAssortService.getScanAssortPageByPatEmrType(patInfoEmrTypeDto); + return Msg.successData(patInfoEmrTypeVos); + } } diff --git a/src/main/java/com/emr/controller/UrlFilter.java b/src/main/java/com/emr/controller/UrlFilter.java index 5ccea05..c884807 100644 --- a/src/main/java/com/emr/controller/UrlFilter.java +++ b/src/main/java/com/emr/controller/UrlFilter.java @@ -49,7 +49,7 @@ public class UrlFilter implements Filter { //从session中取token String token = (String) request.getSession().getAttribute("token"); //静态资源不拦截验证 - if(url.endsWith(".css")||url.endsWith(".js")||url.endsWith(".jpg") + if(url.endsWith(".css")||url.endsWith(".js")||url.endsWith(".jpg")||url.endsWith(".tif") ||url.endsWith(".gif")||url.endsWith(".png") || url.endsWith(".ico")||url.endsWith(".pdf")){ chain.doFilter(request, response); response.setHeader("Access-Control-Allow-Origin", "*"); diff --git a/src/main/java/com/emr/dao/recordType/Emr_TypeMapper.java b/src/main/java/com/emr/dao/recordType/Emr_TypeMapper.java index 15ca5db..197fd29 100644 --- a/src/main/java/com/emr/dao/recordType/Emr_TypeMapper.java +++ b/src/main/java/com/emr/dao/recordType/Emr_TypeMapper.java @@ -1,6 +1,7 @@ package com.emr.dao.recordType; import com.emr.entity.recordType.Emr_Type; +import com.emr.vo.emrType.EmrTypeFeVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +37,9 @@ public interface Emr_TypeMapper { * 验证该用户创建的类别标识是否存在 * */ Emr_Type checkTypeFlagByCreater(@Param("creater") String creater,@Param("typeFlag") String typeFlag); + + /** + * 查询打印用途类别信息（湘雅二医院） + * */ + List getEmrTypeList(); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java index 8e3307a..0fa7b70 100644 --- a/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java +++ b/src/main/java/com/emr/dao/tScanAssort/T_Scan_AssortMapper.java @@ -1,8 +1,11 @@ package com.emr.dao.tScanAssort; +import com.emr.dto.PatInfoEmrTypeDto; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.FontCommom; import com.emr.vo.FontVo.ScanAssortVo; +import com.emr.vo.PatInfoEmrTypeVo; +import com.emr.vo.PatScanAssortVo; import com.emr.vo.PatientAssortVo; import com.emr.vo.ZhFyImageVo; import com.emr.vo.commomSearch.CommomVo; @@ -58,4 +61,11 @@ public interface T_Scan_AssortMapper { * @return */ List getAssortListByPatientAssortPage(@Param("patientId") String patientId, @Param("assortId") String assortId, @Param("scanPage") String scanPage); + + /** + * 根据病案打印用途分类对象查询病案分类页码数（湘雅二医院） + * @param patInfoEmrTypeDto + * @return + */ + List getScanAssortPageByPatEmrTyp(PatInfoEmrTypeDto patInfoEmrTypeDto); } \ No newline at end of file diff --git a/src/main/java/com/emr/dto/PatInfoEmrTypeDto.java b/src/main/java/com/emr/dto/PatInfoEmrTypeDto.java new file mode 100644 index 0000000..424c2e2 --- /dev/null +++ b/src/main/java/com/emr/dto/PatInfoEmrTypeDto.java @@ -0,0 +1,17 @@ +package com.emr.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class PatInfoEmrTypeDto { + + private String inpatientNo; //病案号 + private String name; //患者姓名 + private String disDate; //出院日期 + + List emrTypeIds; //打印用途分类ids + +} + diff --git a/src/main/java/com/emr/service/recordType/EmrTypeService.java b/src/main/java/com/emr/service/recordType/EmrTypeService.java index 9402b1f..d757d3a 100644 --- a/src/main/java/com/emr/service/recordType/EmrTypeService.java +++ b/src/main/java/com/emr/service/recordType/EmrTypeService.java @@ -1,6 +1,7 @@ package com.emr.service.recordType; import com.emr.entity.recordType.Emr_Type; +import com.emr.vo.emrType.EmrTypeFeVo; import org.apache.ibatis.annotations.Param; import javax.servlet.http.HttpServletRequest; @@ -33,4 +34,9 @@ public interface EmrTypeService { * 验证该用户创建的类别标识是否存在 * */ Emr_Type checkTypeFlagByCreater(String typeFlag,HttpServletRequest request); + + /** + * 查询打印用途类别信息（湘雅二医院） + * */ + List getEmrTypeList(); } diff --git a/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java b/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java index 292422a..64a891d 100644 --- a/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java +++ b/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java @@ -6,6 +6,7 @@ import com.emr.entity.Power_User; import com.emr.entity.recordType.Emr_Type; import com.emr.entity.recordType.Emr_Type_Related; import com.emr.service.CommomService; +import com.emr.vo.emrType.EmrTypeFeVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,6 +86,11 @@ public class EmrTypeServiceImpl implements EmrTypeService { return emrTypeMapper.checkTypeFlagByCreater(creater,typeFlag); } + @Override + public List getEmrTypeList() { + return emrTypeMapper.getEmrTypeList(); + } + @Override public void addEmrType(Emr_Type emrType,HttpServletRequest request) { Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); 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 a32af2f..56b36a9 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 @@ -1,11 +1,14 @@ package com.emr.service.tScanAssort; +import com.emr.dto.PatInfoEmrTypeDto; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.vo.FontVo.ScanAssortVo; +import com.emr.vo.PatInfoEmrTypeVo; import com.emr.vo.PatientAssortVo; import com.emr.vo.ZhFyImageVo; import java.util.List; +import java.util.Map; public interface T_Scan_AssortService { void updateByPrimaryKeySelective(T_Scan_Assort newAssort,T_Scan_Assort oldAssort); @@ -32,4 +35,11 @@ public interface T_Scan_AssortService { * @return */ List getAssortListByPatientAssortPage(String patientId, String assortId, String scanPage); + + /** + * 根据病案打印用途分类对象查询病案分类页码数（湘雅二医院） + * @param patInfoEmrTypeDto + * @return + */ + List getScanAssortPageByPatEmrType(PatInfoEmrTypeDto patInfoEmrTypeDto); } 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 ad12385..aa91403 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 @@ -2,22 +2,23 @@ package com.emr.service.tScanAssort; import com.emr.dao.CommomMapper; import com.emr.dao.tScanAssort.T_Scan_AssortMapper; +import com.emr.dto.PatInfoEmrTypeDto; import com.emr.entity.tScanAssort.T_Scan_Assort; +import com.emr.vo.*; import com.emr.vo.FontVo.ScanAssortVo; -import com.emr.vo.IndexFds; -import com.emr.vo.PatientAssortVo; -import com.emr.vo.PicListVo; -import com.emr.vo.ZhFyImageVo; +import com.emr.vo.commomSearch.CommomTree; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.DigestUtils; +import org.springframework.util.ObjectUtils; import java.io.File; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @ProjectName: @@ -198,6 +199,54 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService { return scanAssortMapper.getAssortListByPatientAssortPage(patientId, assortId, scanPage); } + @Override + public List getScanAssortPageByPatEmrType(PatInfoEmrTypeDto patInfoEmrTypeDto) { + List patScanAssortVos = scanAssortMapper.getScanAssortPageByPatEmrTyp(patInfoEmrTypeDto); + //按打印用途分组去重 + Map> groupMap = patScanAssortVos.stream() + .collect(Collectors.groupingBy(PatScanAssortVo::getTypeId, + Collectors.toCollection(() -> new LinkedHashSet<>()))); + //病案分类去重 + List patInfoEmrTypeVoList = new ArrayList<>(); + //返回病案分类对象 + PatInfoEmrTypeVo patInfoEmrTypeVo = null; + for (Map.Entry> map : groupMap.entrySet()) { + Integer typeId = map.getKey(); + Set dataList = map.getValue(); + + //打印用途分类下病案总页数 + int pageTotal = 0; + //病案分类列表 + List patScanAssortList = new ArrayList<>(); + PatScanAssort patScanAssort = null; + //转换成病案分类List + for (PatScanAssortVo scanAssortVo : dataList) { + String assortId = scanAssortVo.getAssortId(); + String assortName = scanAssortVo.getAssortName(); + //病案分类页数 + int pageNumber = 0; + for (PatScanAssortVo assortVo : patScanAssortVos) { + if (!ObjectUtils.isEmpty(scanAssortVo.getTypeId()) && StringUtils.isNotBlank(assortVo.getAssortId()) && assortVo.getAssortId().equals(assortId) && assortVo.getTypeId().equals(typeId)) { + pageNumber++; + } + } + patScanAssort = new PatScanAssort(); + patScanAssort.setAssortId(assortId); + patScanAssort.setAssortName(assortName); + patScanAssort.setPageNumber(pageNumber); + patScanAssortList.add(patScanAssort); + pageTotal += pageNumber; + } + + patInfoEmrTypeVo = new PatInfoEmrTypeVo(); + patInfoEmrTypeVo.setScanAssortList(patScanAssortList); + patInfoEmrTypeVo.setPageTotal(pageTotal); + patInfoEmrTypeVo.setTypeId(typeId); + patInfoEmrTypeVoList.add(patInfoEmrTypeVo); + } + return patInfoEmrTypeVoList; + } + private String selectRootByNotWater(String srcPath) { //获取盘符 String str = srcPath.substring(0, 1).toUpperCase(); diff --git a/src/main/java/com/emr/vo/PatInfoEmrTypeVo.java b/src/main/java/com/emr/vo/PatInfoEmrTypeVo.java new file mode 100644 index 0000000..4e7d793 --- /dev/null +++ b/src/main/java/com/emr/vo/PatInfoEmrTypeVo.java @@ -0,0 +1,15 @@ +package com.emr.vo; + +import lombok.Data; + +import java.util.List; + +@Data +public class PatInfoEmrTypeVo { + + private List scanAssortList; //分类列表 + + private Integer pageTotal; //总页数 + + private Integer typeId; +} diff --git a/src/main/java/com/emr/vo/PatScanAssort.java b/src/main/java/com/emr/vo/PatScanAssort.java new file mode 100644 index 0000000..ffda2ad --- /dev/null +++ b/src/main/java/com/emr/vo/PatScanAssort.java @@ -0,0 +1,11 @@ +package com.emr.vo; + +import lombok.Data; + +@Data +public class PatScanAssort { + + private String assortId; //分类id + private String assortName; //分类名称 + private Integer pageNumber; //分类页数 +} diff --git a/src/main/java/com/emr/vo/PatScanAssortVo.java b/src/main/java/com/emr/vo/PatScanAssortVo.java new file mode 100644 index 0000000..53d6bbb --- /dev/null +++ b/src/main/java/com/emr/vo/PatScanAssortVo.java @@ -0,0 +1,13 @@ +package com.emr.vo; + +import lombok.Data; + +@Data +public class PatScanAssortVo { + + private String assortId; //分类id + private String assortName; //分类名称 + private Integer pageNumber; //分类页数 + private Integer typeId; //分类类型 + +} diff --git a/src/main/java/com/emr/vo/emrType/EmrTypeFeVo.java b/src/main/java/com/emr/vo/emrType/EmrTypeFeVo.java new file mode 100644 index 0000000..a5011a9 --- /dev/null +++ b/src/main/java/com/emr/vo/emrType/EmrTypeFeVo.java @@ -0,0 +1,10 @@ +package com.emr.vo.emrType; + +import lombok.Data; + +@Data +public class EmrTypeFeVo { + + private Integer id; + private String typeName; +} diff --git a/src/main/resources/mapper/recordType/Emr_TypeMapper.xml b/src/main/resources/mapper/recordType/Emr_TypeMapper.xml index 1173588..3ed3f79 100644 --- a/src/main/resources/mapper/recordType/Emr_TypeMapper.xml +++ b/src/main/resources/mapper/recordType/Emr_TypeMapper.xml @@ -204,4 +204,7 @@ type_flag = #{typeFlag} + \ 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 a620377..ed2cd9b 100644 --- a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml +++ b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml @@ -298,6 +298,32 @@ and t.scan_page = #{scanPage} and t.is_del = 0 + update t_scan_assort set is_del = 0 where patient_id = #{patientId}