diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMedResult.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMedResult.java new file mode 100644 index 0000000..79c4351 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmMedResult.java @@ -0,0 +1,15 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XmMedResult { + private String ywdh; + private String resultflag; + private String medresult; + private String bz; +} diff --git a/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java b/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java index 1807afd..a0b3c1a 100644 --- a/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java +++ b/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java @@ -85,5 +85,33 @@ public enum BusinessType { * 删除对照16 */ DELETE_VS, + /** + * 修改明细17 + */ + UPDATE_DETAIL, + /** + * 审核18 + */ + CHECK, + /** + * 初审19 + */ + CHECK1, + /** + * 取消审核20 + */ + UNCHECK, + /** + * 取消初审21 + */ + UNCHECK1, + /** + * 登记22 + */ + UNCHECK_REGISTER, + /** + * 危急值登记 23 + */ + CRITICAL_REGISTER, } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index a605252..fae83af 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.SysLoginParam; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; import com.czlis.interfaceCommon.utils.LoginConfigParamUtil; import com.czlis.liswork.mapper.LisWorkMapper; import com.czlis.liswork.service.LabPatService; @@ -147,6 +148,7 @@ public class LisWorkController extends BaseController { return labResultService.getresultinfo(jyrq, yq, ybh); } + @Log(title = "主界面",businessType = BusinessType.DELETE_DETAIL) @ApiOperation("删除检验结果") @PostMapping("/deleteresult") public Result deleteresult(@RequestBody List labResultlist) { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index bf9559a..3d56e71 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -1,10 +1,12 @@ package com.czlis.liswork.controller.work; import cn.hutool.core.bean.BeanUtil; +import com.czlis.common.annotation.Log; import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; +import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.ServletUtils; import com.czlis.liswork.service.LisWorkOperService; import io.swagger.annotations.Api; @@ -18,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; + @Slf4j @RestController @RequestMapping("/lisworkoper") @@ -27,78 +30,109 @@ public class LisWorkOperController extends BaseController { @Autowired private LisWorkOperService lisWorkOperService; - + @Log(title = "主界面",businessType = BusinessType.INSERT) @ApiOperation(("新增病人信息")) @GetMapping("/newpat") - public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh){ - return lisWorkOperService.newPatInfo(jyrq,ybh,sqh,yq); + public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh) { + return lisWorkOperService.newPatInfo(jyrq, ybh, sqh, yq); } /** * 修改病人信息 + * * @param * @return */ + @Log(title = "主界面",businessType = BusinessType.UPDATE) @ApiOperation("修改病人信息") @PostMapping("/changepat") - public Result changePat(@RequestBody LabPat labPat){ - if(labPat==null){return new Result("-1","入参为空,修改失败");} - if(labPat.getYq()==null){return new Result("-1","入参为空,修改失败");} + public Result changePat(@RequestBody LabPat labPat) { + if (labPat == null) { + return new Result("-1", "入参为空,修改失败"); + } + if (labPat.getYq() == null) { + return new Result("-1", "入参为空,修改失败"); + } return lisWorkOperService.changePat(labPat); } + + @Log(title = "主界面",businessType = BusinessType.UPDATE) + @ApiOperation("修改病人信息,输入病人代号需要单独处理") @GetMapping("/changepatcolumn") - public Result changepatcolumn(Date jyrq,String yq, String ybh,String column,String value){ - if(column==null){return new Result("-1","入参为空,修改失败");} - if(yq==null){return new Result("-1","入参为空,修改失败");} - if(ybh==null){return new Result("-1","入参为空,修改失败");} - return lisWorkOperService.changePatColumn(jyrq, yq,ybh,column,value); + public Result changepatcolumn(Date jyrq, String yq, String ybh, String column, String value) { + if (column == null) { + return new Result("-1", "入参为空,修改失败"); + } + if (yq == null) { + return new Result("-1", "入参为空,修改失败"); + } + if (ybh == null) { + return new Result("-1", "入参为空,修改失败"); + } + return lisWorkOperService.changePatColumn(jyrq, yq, ybh, column, value); } + + @Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL) @ApiOperation("修改病人结果") @PostMapping("/changeresult") - public Result changeresult(@RequestBody LabResult labResult){ + public Result changeresult(@RequestBody LabResult labResult) { return lisWorkOperService.changeresult(labResult); } - @ApiOperation("修改病人结果") + + @Log(title = "主界面",businessType = BusinessType.INSERT_DETAIL) + @ApiOperation("新增病人结果") @PostMapping("/newresult") - public Result newresult(@RequestBody LabResult labResult){ + public Result newresult(@RequestBody LabResult labResult) { return lisWorkOperService.newresult(labResult); } /** * 审核报告 + * * @param jyrq 检验日期 - * @param yq 仪器 - * @param ybh 样本号 + * @param yq 仪器 + * @param ybh 样本号 * @param yhdh 核对医生 * @return */ + @Log(title = "主界面",businessType = BusinessType.CHECK) @ApiOperation("审核报告") @GetMapping("/check2") - public Result check2( Date jyrq, String yq, String ybh, String yhdh){ - return lisWorkOperService.confirm(jyrq, yq, ybh, yhdh); + public Result check2(Date jyrq, String yq, String ybh, String yhdh) { + return lisWorkOperService.confirm(jyrq, yq, ybh, yhdh); } + + @Log(title = "主界面",businessType = BusinessType.CHECK1) @ApiOperation("初审报告") @GetMapping("/check1") - public Result check1( Date jyrq, String yq, String ybh, String yhdh){ - return lisWorkOperService.confirm1(jyrq, yq, ybh, yhdh); + public Result check1(Date jyrq, String yq, String ybh, String yhdh) { + return lisWorkOperService.confirm1(jyrq, yq, ybh, yhdh); } + @Log(title = "主界面",businessType = BusinessType.UNCHECK) @ApiOperation("取消审核") @GetMapping("/uncheck2") - public Result uncheck2( Date jyrq, String yq, String ybh, String yhdh){ - return lisWorkOperService.unconfirm(jyrq, yq, ybh, yhdh); + public Result uncheck2(Date jyrq, String yq, String ybh, String yhdh) { + return lisWorkOperService.unconfirm(jyrq, yq, ybh, yhdh); } + @Log(title = "主界面",businessType = BusinessType.UNCHECK1) @ApiOperation("取消初审") @GetMapping("/uncheck1") - public Result uncheck1( Date jyrq, String yq, String ybh, String yhdh){ - return lisWorkOperService.unconfirm1(jyrq, yq, ybh, yhdh); + public Result uncheck1(Date jyrq, String yq, String ybh, String yhdh) { + return lisWorkOperService.unconfirm1(jyrq, yq, ybh, yhdh); } + + @Log(title = "主界面",businessType = BusinessType.UNCHECK_REGISTER) + @ApiOperation("解除审核原因登记") @GetMapping("/unconfirmlog") - public Result unconfirmlog( Date jyrq, String yq, String ybh, String yhdh,String reason){ - return lisWorkOperService.unconfirmlog(jyrq, yq, ybh, yhdh,reason); + public Result unconfirmlog(Date jyrq, String yq, String ybh, String yhdh, String reason) { + return lisWorkOperService.unconfirmlog(jyrq, yq, ybh, yhdh, reason); } + + @Log(title = "主界面",businessType = BusinessType.CRITICAL_REGISTER) + @ApiOperation("登记危急值") @GetMapping("/reglimit") - public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String qrr,String phone,String tzfs){ - return lisWorkOperService.reglimit(jyrq, yq, ybh, yhdh,qrr,phone,tzfs); + public Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String qrr, String phone, String tzfs) { + return lisWorkOperService.reglimit(jyrq, yq, ybh, yhdh, qrr, phone, tzfs); } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java index 6aca13d..581153a 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java @@ -3,6 +3,7 @@ package com.czlis.liswork.controller.xtwh; import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMed; +import com.czlis.common.core.domain.entity.lis.XmMedResult; import com.czlis.common.enums.BusinessType; import com.czlis.liswork.service.XmMedService; import io.swagger.annotations.Api; @@ -41,4 +42,40 @@ public class XmMedController { public Result delete(XmMed xmMed){ return xmMedService.delete(xmMed); } + + /** + * 后端没有查出来数据，前端要写死这几个值，后端返回有值，查询出来就是后端的值 + * 8046 I 中介 + * 8046 N 无 + * 8046 R 耐药 + * 8046 S 敏感 + * @param xmMedResult + * @return + */ + @ApiOperation("获取常见结果") + @GetMapping("/queryCommResult") + public Result queryCommonResult(XmMedResult xmMedResult){ + return xmMedService.queryCommonResult(xmMedResult); + } + + @Log(title = "抗生素常见结果",businessType = BusinessType.INSERT) + @ApiOperation("新增常见结果") + @PostMapping("/addCommResult") + public Result addCommResult(@RequestBody XmMedResult xmMedResult){ + return xmMedService.addCommResult(xmMedResult); + } + + @Log(title = "抗生素常见结果",businessType = BusinessType.UPDATE) + @ApiOperation("修改常见结果") + @PostMapping("/updateCommResult") + public Result updateCommResult(XmMedResult xmMedResult){ + return xmMedService.updateCommResult(xmMedResult); + } + + @Log(title = "抗生素常见结果",businessType = BusinessType.DELETE) + @ApiOperation("删除常见结果") + @GetMapping("/deleteCommResult") + public Result deleteCommResult(XmMedResult xmMedResult){ + return xmMedService.deleteCommResult(xmMedResult); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/XmMedMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/XmMedMapper.java index 1c4ef75..7199f84 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/XmMedMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/XmMedMapper.java @@ -1,6 +1,7 @@ package com.czlis.liswork.mapper.xtwh; import com.czlis.common.core.domain.entity.lis.XmMed; +import com.czlis.common.core.domain.entity.lis.XmMedResult; import java.util.List; @@ -12,4 +13,12 @@ public interface XmMedMapper { void delete(XmMed xmMed); void update(XmMed xmMed); + + List queryCommonResult(XmMedResult xmMedResult); + + void addCommResult(XmMedResult xmMedResult); + + void updateCommResult(XmMedResult xmMedResult); + + void deleteCommResult(XmMedResult xmMedResult); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmMedService.java b/liswork/src/main/java/com/czlis/liswork/service/XmMedService.java index 454b97d..2939c28 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/XmMedService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/XmMedService.java @@ -2,6 +2,7 @@ package com.czlis.liswork.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMed; +import com.czlis.common.core.domain.entity.lis.XmMedResult; import java.util.List; @@ -11,4 +12,12 @@ public interface XmMedService { Result add(List xmMed); Result delete(XmMed xmMed); + + Result queryCommonResult(XmMedResult xmMedResult); + + Result addCommResult(XmMedResult xmMedResult); + + Result updateCommResult(XmMedResult xmMedResult); + + Result deleteCommResult(XmMedResult xmMedResult); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedServiceImpl.java index 093cb8f..0ec869c 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/XmMedServiceImpl.java @@ -3,6 +3,7 @@ package com.czlis.liswork.service.impl.xtwh; import cn.hutool.extra.pinyin.PinyinUtil; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMed; +import com.czlis.common.core.domain.entity.lis.XmMedResult; import com.czlis.liswork.mapper.xtwh.XmMedMapper; import com.czlis.liswork.service.XmMedService; import lombok.extern.slf4j.Slf4j; @@ -46,4 +47,28 @@ public class XmMedServiceImpl implements XmMedService { xmMedMapper.delete(xmMed); return new Result("0","删除数据成功！"); } + + @Override + public Result queryCommonResult(XmMedResult xmMedResult) { + List xmMedResultList = xmMedMapper.queryCommonResult(xmMedResult); + return new Result("0","获取数据成功",xmMedResultList); + } + + @Override + public Result addCommResult(XmMedResult xmMedResult) { + xmMedMapper.addCommResult(xmMedResult); + return new Result("0","新增成功！"); + } + + @Override + public Result updateCommResult(XmMedResult xmMedResult) { + xmMedMapper.updateCommResult(xmMedResult); + return new Result("0","修改成功！"); + } + + @Override + public Result deleteCommResult(XmMedResult xmMedResult) { + xmMedMapper.deleteCommResult(xmMedResult); + return null; + } } diff --git a/liswork/src/main/resources/mapper/XmMedMapper.xml b/liswork/src/main/resources/mapper/XmMedMapper.xml index 89d1c17..7b99bbe 100644 --- a/liswork/src/main/resources/mapper/XmMedMapper.xml +++ b/liswork/src/main/resources/mapper/XmMedMapper.xml @@ -94,4 +94,26 @@ where ywdh = #{ywdh} + + + + + insert into xm_med_result( + ywdh,resultflag,medresult,bz + )values( + #{ywdh},#{resultflag},#{medresult},#{bz} + ) + + + + update xm_med_result set resultflag = #{resultflag} ,medresult = #{medresult} + ,bz = #{bz} + where ywdh = #{ywdh} + + + + delete from xm_med_result where ywdh = #{ywdh} + diff --git a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml index a335359..44406f6 100644 --- a/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml +++ b/zybgcx/src/main/resources/mapper/ZybgcxMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"