diff --git a/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java b/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java index a1b442c..d94ab41 100644 --- a/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java +++ b/lis-common/src/main/java/com/czlis/common/utils/lisinterface/LisInterfaceUtil.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.interfaceCommon.mapper.LisInterfaceMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; @@ -36,6 +37,7 @@ public class LisInterfaceUtil { * @param inValue * @return */ + @Transactional(rollbackFor = Exception.class) public Result invokeSP(String type,String inValue){ Map map = new HashMap<>(); map.put("invalue",inValue); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java index 77a9347..5dc5540 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ComDictServiceImpl.java @@ -44,31 +44,42 @@ public class ComDictServiceImpl implements ComDictService { return comDictMapper.getComDictList(comDict); } + /** + * 增加字典信息 + * @param comDict + * @return + */ @Transactional(rollbackFor = Exception.class) @Override public Result insertComDict(ComDict comDict) { String pinyin = PinyinUtil.getFirstLetter(comDict.getZdmc(), ""); //拼音首字母 - if(pinyin.length() >= 9) { - pinyin = pinyin.substring(0, 9); + if (pinyin.length() >= 9) { + pinyin = pinyin.substring(0, 9); } comDict.setZjf(pinyin); comDict.setZdbz("N"); int row = comDictMapper.insertComDict(comDict); - if(row > 0){ + if (row > 0) { List comDictList = comDictMapper.getComDictList(comDict); - ComDictUtils.setDictCache(comDict.getZdlb(),comDictList); + ComDictUtils.setDictCache(comDict.getZdlb(), comDictList); } return null; } + /** + * 导入数据 + * @param comDictList + * @param updateDlCeshi + * @return + */ @Transactional(rollbackFor = Exception.class) @Override - public Result insertComDictList(List comDictList,boolean updateDlCeshi) { - int row = 0, fail = 0,row0=0; - String zdlb = "", pinyin = "",zddh="",yljg="",zdbz=""; + public Result insertComDictList(List comDictList, boolean updateDlCeshi) { + int row = 0, fail = 0, row0 = 0; + String zdlb = "", pinyin = "", zddh = "", yljg = "", zdbz = ""; //判断传入的List 是否为空 if (StringUtils.isNull(comDictList) || comDictList.size() == 0) { - return new Result("-1","导入数据不能为空！"); + return new Result("-1", "导入数据不能为空！"); } //定义失败条数，接收导入失败数据量 int failureNum = 0; @@ -77,8 +88,8 @@ public class ComDictServiceImpl implements ComDictService { zdlb = comDict.getZdlb(); zddh = comDict.getZddh(); //是否覆盖数据,不覆盖跳过 - row0 = comDictMapper.getCountById(zdlb,zddh); - if(row0 > 0 && updateDlCeshi==false) continue; + row0 = comDictMapper.getCountById(zdlb, zddh); + if (row0 > 0 && updateDlCeshi == false) continue; pinyin = PinyinUtil.getFirstLetter(comDict.getZdmc(), ""); //拼音首字母 if (pinyin.length() >= 9) { @@ -88,21 +99,20 @@ public class ComDictServiceImpl implements ComDictService { yljg = comDict.getYljg(); zdbz = comDict.getZdbz(); - if(yljg == null || yljg.equals("")) comDict.setYljg("1"); - if(zdbz == null || zdbz.equals("")) comDict.setZdbz("N"); - if (row0>0) { + if (yljg == null || yljg.equals("")) comDict.setYljg("1"); + if (zdbz == null || zdbz.equals("")) comDict.setZdbz("N"); + if (row0 > 0) { row = comDictMapper.updateComDict(comDict); - } - else{ + } else { row = comDictMapper.insertComDict(comDict); } if (row > 0) failureNum++; } if (failureNum > 0) { - ComDict comDict0=new ComDict(); + ComDict comDict0 = new ComDict(); comDict0.setZdlb(zdlb); List comDictList1 = comDictMapper.getComDictList(comDict0); - ComDictUtils.setDictCache(comDict0.getZdlb(),comDictList1); + ComDictUtils.setDictCache(comDict0.getZdlb(), comDictList1); if (failureNum == comDictList.size()) { return new Result("0", "数据已全部导入成功！共 " + comDictList.size() + " 条"); } else { @@ -115,29 +125,28 @@ public class ComDictServiceImpl implements ComDictService { } - @Transactional(rollbackFor = Exception.class) @Override public Result delComDict(ComDict comDict) { String zdlb = comDict.getZdlb(); String zddh = comDict.getZddh(); String yljg = comDict.getYljg(); - if(zdlb == null || zdlb.equals("")) return new Result("-1","字典类别不能为空！"); - if(zddh == null || zddh.equals("")) return new Result("-1","字典代号不能为空！"); - if(yljg == null || yljg.equals("")) return new Result("-1","医疗机构不能为空！"); + if (zdlb == null || zdlb.equals("")) return new Result("-1", "字典类别不能为空！"); + if (zddh == null || zddh.equals("")) return new Result("-1", "字典代号不能为空！"); + if (yljg == null || yljg.equals("")) return new Result("-1", "医疗机构不能为空！"); int row = comDictMapper.delComDict(comDict); - return new Result("0","删除成功！"); + return new Result("0", "删除成功！"); } @Transactional(rollbackFor = Exception.class) @Override public Result updateComDict(ComDict comDict) { int row = comDictMapper.updateComDict(comDict); - if(row > 0) { + if (row > 0) { List comDictList = comDictMapper.getComDictList(comDict); - ComDictUtils.setDictCache(comDict.getZdlb(),comDictList); + ComDictUtils.setDictCache(comDict.getZdlb(), comDictList); } - return new Result("0","修改成功！"); + return new Result("0", "修改成功！"); } } diff --git a/mzcx/src/main/java/com/czlis/mzcx/MZCXController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java similarity index 85% rename from mzcx/src/main/java/com/czlis/mzcx/MZCXController.java rename to mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java index 16a01f3..3d6181b 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -1,4 +1,4 @@ -package com.czlis.mzcx; +package com.czlis.mzcx.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java new file mode 100644 index 0000000..c447703 --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/controller/ZybgcxController.java @@ -0,0 +1,62 @@ +package com.czlis.zybgcx.controller; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.zybgcx.pojo.Web_getReportsList; +import com.czlis.zybgcx.pojo.Web_getResultMed; +import com.czlis.zybgcx.service.ZybgcxService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 住院报告查询 + */ +@Api(tags = "住院报告查询") +@RestController +@RequestMapping("/report") +@Slf4j +public class ZybgcxController extends BaseController { + + @Autowired + private ZybgcxService zybgcxService; + + /** + * 获取报告信息 + * @param webGetReportsList + * @return + */ + @ApiOperation("获取报告信息") + @PostMapping("/ReportList") + public TableDataInfo getPatReportList(@RequestBody Web_getReportsList webGetReportsList){ + startPage(); + List patList = zybgcxService.getPatList(webGetReportsList); + return getDataTable(patList); + } + + /** + * 获取微生物报告信息 + * @param webGetResultMed + * @return + */ + @PostMapping("/MedList") + public Result getResultMed(@RequestBody Web_getResultMed webGetResultMed){ + return null; + } + + + /** + * 打印报告单 + * @param bgdh + * @return + */ + @GetMapping("print") + public Result printReport(String bgdh){ + return null; + } +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java new file mode 100644 index 0000000..2763851 --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/mapper/ZybgcxMapper.java @@ -0,0 +1,9 @@ +package com.czlis.zybgcx.mapper; + +import com.czlis.zybgcx.pojo.Web_getReportsList; + +import java.util.List; + +public interface ZybgcxMapper { + List getReportsList(Web_getReportsList getReportsList); +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java new file mode 100644 index 0000000..bcd6608 --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java @@ -0,0 +1,38 @@ +package com.czlis.zybgcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Web_getReportsList { + private String yljg; + private Date jyrq; + private String jyrqname; + private String yq; + private String ybh; + private String yblx; + private String brxm; + private String brdh; + private String ch; + private String zd; + private String sqh; + private String ksdh; + private String jzbz; + private String alarmflag; + private String dybz; + private String nl; + private String ksname; + private String brlyname; + private String brxbname; + private String yblxname; + private String sjysname; + private String yqmc; + private String yqdl; + private String sqdh; + +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java new file mode 100644 index 0000000..91c67e6 --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getResultMed.java @@ -0,0 +1,31 @@ +package com.czlis.zybgcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class Web_getResultMed { + private String bgdh; + private String brdh; + private String xmmc; + private String ywmc; + private Date jyrq; + private String yq; + private String ybh; + private String xmdh; + private Integer xh; + private String ywdh; + private String mic; + private String rad; + private String csjg; + private String jgbz; + private String bz; + private String txtresult; + private String textresult1; + +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java new file mode 100644 index 0000000..d220739 --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/ZybgcxService.java @@ -0,0 +1,9 @@ +package com.czlis.zybgcx.service; + +import com.czlis.zybgcx.pojo.Web_getReportsList; + +import java.util.List; + +public interface ZybgcxService { + List getPatList(Web_getReportsList webGetReportsList); +} diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java new file mode 100644 index 0000000..f8161fd --- /dev/null +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java @@ -0,0 +1,32 @@ +package com.czlis.zybgcx.service.impl; + +import com.czlis.zybgcx.mapper.ZybgcxMapper; +import com.czlis.zybgcx.pojo.Web_getReportsList; +import com.czlis.zybgcx.service.ZybgcxService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +@Service +@Slf4j +public class ZybgcxServcieImpl implements ZybgcxService { + + @Autowired + private ZybgcxMapper zybgcxMapper; + + + /** + * 获取报告信息 + * @param webGetReportsList + * @return + */ + @Override + public List getPatList(Web_getReportsList webGetReportsList) { + return zybgcxMapper.getReportsList(webGetReportsList); + } + + +} diff --git a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml new file mode 100644 index 0000000..de00733 --- /dev/null +++ b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml @@ -0,0 +1,22 @@ + + + + + + select * from web_getReportsList + + + + + + \ No newline at end of file diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java index 4187c32..b23a791 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java +++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java @@ -28,7 +28,6 @@ public class ZycxServiceImpl implements ZycxService { return zycxMapper.getSQDInfo(labReqmain); } - @Transactional @Override public Result createSQD(String dept, String userid, String st, String et, String yljg) { Map map = new HashMap<>(); diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index 315aa61..1be459e 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -5,21 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from lab_reqmain + select a.*,b.sflbmc,b.sampletips from lab_reqmain a,lab_feeitemclass b where a.bgddh = b.sflbdh