From b86fff9a80ab1c954f9aed226a9bb3157df6aae1 Mon Sep 17 00:00:00 2001 From: tangw Date: Fri, 4 Jul 2025 00:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=95=B4=E5=90=88=E4=B8=BB?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=89=8D=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/LabPat.java | 3 +- .../common/core/domain/entity/LabResult.java | 10 +- .../interfaceCommon/mapper/LabPatMapper.java | 15 +- .../mapper/LabResultMapper.java | 15 + .../interfaceCommon/utils/CommonUtil.java | 56 ++- .../main/resources/mapper/LabPatMapper.xml | 231 +++++++++++- .../main/resources/mapper/LabResultMapper.xml | 349 ++++++++++++++++++ .../controller/dict/DictController.java | 13 +- .../controller/dict/InstrController.java | 8 +- .../controller/work/LisWorkController.java | 44 ++- .../czlis/liswork/mapper/LisWorkMapper.java | 8 +- .../liswork/mapper/xtwh/InstrMapper.java | 2 + .../czlis/liswork/service/InstrService.java | 7 +- .../czlis/liswork/service/LabPatService.java | 21 ++ .../liswork/service/LabResultService.java | 17 + .../czlis/liswork/service/LisWorkService.java | 5 +- .../service/impl/ComDictServiceImpl.java | 42 ++- .../service/impl/InstrServiceImpl.java | 5 + .../service/impl/LabPatServiceImpl.java | 77 ++++ .../liswork/service/impl/LabResultImpl.java | 86 +++++ .../service/impl/LisWorkOperServiceImpl.java | 2 +- .../service/impl/LisWorkServiceImpl.java | 55 +-- .../src/main/resources/mapper/InstrMapper.xml | 7 +- .../main/resources/mapper/LisWorkMapper.xml | 57 ++- 24 files changed, 1037 insertions(+), 98 deletions(-) create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java create mode 100644 lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml create mode 100644 liswork/src/main/java/com/czlis/liswork/service/LabPatService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/LabResultService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java index 904784d..e8c1988 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabPat.java @@ -2,6 +2,7 @@ package com.czlis.common.core.domain.entity; import com.czlis.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,6 +13,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor public class LabPat extends BaseEntity { + @JsonFormat(pattern = "yyyy-MM-dd") private Date jyrq; private String yq; private String ybh; @@ -76,5 +78,4 @@ public class LabPat extends BaseEntity { - } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java index dbf4659..2687b63 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/LabResult.java @@ -2,6 +2,7 @@ package com.czlis.common.core.domain.entity; import com.czlis.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,6 +13,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor public class LabResult extends BaseEntity { + @JsonFormat(pattern = "yyyy-MM-dd") private Date jyrq; private String yq; private String ybh; @@ -30,9 +32,9 @@ public class LabResult extends BaseEntity { private String refs; private String flag; private String dw; - private String result_flag; - private String alarm_flag; - private String redo_flag; + private String resultFlag; + private String alarmFlag; + private String redoFlag; private String sqxmdh; - + private String xmmc; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java index 2646bd4..db2f4ff 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatMapper.java @@ -1,12 +1,23 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.LabPat; +import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; public interface LabPatMapper { - List getLabPatList(String sqh); - LabPat getLabPatOne(Date jyrq, String yq,String ybh); + List getLabPatListBySqh(String sqh); + LabPat getLabPatOne(@Param("jyrq") Date jyrq, @Param("yq")String yq,@Param("ybh") String ybh); void insertLabPat(LabPat labPat); + List getSampleList(@Param("jyrq") Date jyrq, @Param("yq") String yq); + List getSampleListday(@Param("yq") String yq,@Param("days")Long days); + List getLabPat(LabPat labPat); + int delLabPat(@Param("jyrq") String jyrq, @Param("yq") String yq,@Param("ybh") String ybh); + int updateLabPat(LabPat labPat); + //根据主键判断是否存在数据 + int getCountByKey(@Param("jyrq") String jyrq, @Param("yq") String yq,@Param("ybh") String ybh) ; + //根据编号查sqh + String getSqhByKey(@Param("jyrq")String jyrq,@Param("yq") String yq,@Param("ybh") String ybh); + } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java new file mode 100644 index 0000000..6ece443 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabResultMapper.java @@ -0,0 +1,15 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.LabResult; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +public interface LabResultMapper { + List getLabResultList(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh") String ybh); + List getLabResult(@Param("jyrq") Date jyrq, @Param("yq") String yq,@Param("ybh") String ybh,@Param("xmdh") String xmdh); + int insertLabResult(LabResult labResult); + int delLabResult(LabResult labResult); + int updateLabResult(LabResult labResult); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index 03d30ea..afabee0 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -1,8 +1,11 @@ package com.czlis.interfaceCommon.utils; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.LabPat; import com.czlis.common.core.domain.entity.LabReqmain; +import com.czlis.common.core.domain.entity.LabResult; import com.czlis.interfaceCommon.mapper.*; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -22,34 +25,47 @@ public class CommonUtil { CommonMapper commonMapper; @Autowired ComDictMapper comDictMapper; - - + @Autowired + private LabResultMapper labResultMapper; + //====检验主表操作方法集合=== public LabPat getLabPatOne(Date jyrq, String yq, String ybh){ return labPatMapper.getLabPatOne(jyrq, yq, ybh); } - - public String getComOptValue(String yq,String xxdh){ - return comOptMapper.getComOptValue(yq,xxdh); - } - + public List getLabPatListBySqh(String sqh){return labPatMapper.getLabPatListBySqh(sqh);} + public List getLabPatList(LabPat labPat) {return labPatMapper.getLabPat(labPat);} + @Transactional(rollbackFor = Exception.class) + public int insertLabPat(LabPat labPat) {return labPatMapper.updateLabPat(labPat);} + @Transactional(rollbackFor = Exception.class) + public int delLabPat(LabPat labPat){return labPatMapper.updateLabPat(labPat);} + @Transactional(rollbackFor = Exception.class) + public int updateLabPat(LabPat labPat){return labPatMapper.updateLabPat(labPat);} + public int getCountByKey(String jyrq, String yq,String ybh) {return labPatMapper.getCountByKey(jyrq,yq,ybh);} + public String getSqhByKey(String jyrq,String yq,String ybh){return labPatMapper.getSqhByKey(jyrq,yq,ybh);} + //申请单主表方法集合 public LabReqmain getLabReqmainOne(String sqh){ return labReqmainMapper.getLabReqmainOne(sqh); } + //申请单明细表集合 - public List getLabPatList(String sqh){ - return labPatMapper.getLabPatList(sqh); - } - - + //====检验结果表操作方法集合=== + public List getLabResult(Date jyrq, String yq, String ybh, String xmdh) {return labResultMapper.getLabResult(jyrq, yq, ybh,xmdh);} + public List getLabResultList(Date jyrq, String yq, String ybh) {return labResultMapper.getLabResultList(jyrq, yq, ybh);} @Transactional(rollbackFor = Exception.class) - public void insertLabPat(LabPat labPat){ - labPatMapper.insertLabPat(labPat); - } + public int insertLabResult(LabResult labResult) {return labResultMapper.updateLabResult(labResult);} + public List getresultinfo(Date jyrq, String yq, String ybh) {return labResultMapper.getLabResultList(jyrq, yq, ybh);} + @Transactional(rollbackFor = Exception.class) + public int delLabResult(LabResult labResult) {return labResultMapper.delLabResult(labResult);} + @Transactional(rollbackFor = Exception.class) + public int updateLabResult(LabResult labResult) {return labResultMapper.updateLabResult(labResult);} - public Date getCurrentTime(){ - return commonMapper.getCurrentTime(); - } + + //服务器时间方法 + public Date getCurrentTime(){return commonMapper.getCurrentTime();} + public String getCurrentDate(){return DateFormatUtils.format(commonMapper.getCurrentTime(), "yyyy-MM-dd");} + public String getCurrentDateTime(){return DateFormatUtils.format(commonMapper.getCurrentTime(), "yyyy-MM-dd HH:mm:ss");} + + //字典查询方法集合 public String getComDictNameById(String zdlb,String xxdh){ String zdmc = comDictMapper.getComDictNameById(zdlb,xxdh); if(zdmc == null || zdmc.equals("")){ @@ -67,4 +83,8 @@ public class CommonUtil { return zddh; } } + public String getComOptValue(String yq,String xxdh){ + return comOptMapper.getComOptValue(yq,xxdh); + } + } diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml index 16b168c..c6b963a 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -9,6 +9,29 @@ + + select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg from lab_pat + + + + + insert into lab_pat ( @@ -163,8 +186,212 @@ #{jyrq},#{yq},#{ybh} ) - - + + delete from lab_pat where yq = #{yq} and jyrq = #{jyrq} and ybh = #{ybh} + + + update lab_pat + + + wyh = #{wyh,jdbcType=VARCHAR}, + + + yblx = #{yblx,jdbcType=VARCHAR}, + + + fb = #{fb,jdbcType=VARCHAR}, + + + ksdh = #{ksdh,jdbcType=VARCHAR}, + + + sjys = #{sjys,jdbcType=VARCHAR}, + + + hdys = #{hdys,jdbcType=VARCHAR}, + + + yhdh = #{yhdh,jdbcType=VARCHAR}, + + + brdh = #{brdh,jdbcType=VARCHAR}, + + + brxm = #{brxm,jdbcType=VARCHAR}, + + + brxb = #{brxb,jdbcType=VARCHAR}, + + + brly = #{brly,jdbcType=VARCHAR}, + + + ch = #{ch,jdbcType=VARCHAR}, + + + nl = #{nl,jdbcType=INTEGER}, + + + nldw = #{nldw,jdbcType=VARCHAR}, + + + sqh = #{sqh,jdbcType=VARCHAR}, + + + sqsj = #{sqsj,jdbcType=TIMESTAMP}, + + + dysj = #{dysj,jdbcType=TIMESTAMP}, + + + dybz = #{dybz,jdbcType=CHAR}, + + + jgbz = #{jgbz,jdbcType=CHAR}, + + + bbbz = #{bbbz,jdbcType=CHAR}, + + + zd = #{zd,jdbcType=VARCHAR}, + + + bz = #{bz,jdbcType=VARCHAR}, + + + bz1 = #{bz1,jdbcType=VARCHAR}, + + + zjf = #{zjf,jdbcType=VARCHAR}, + + + cyrq = #{cyrq,jdbcType=TIMESTAMP}, + + + bq = #{bq,jdbcType=VARCHAR}, + + + czybh = #{czybh,jdbcType=VARCHAR}, + + + cjbw = #{cjbw,jdbcType=VARCHAR}, + + + jymd = #{jymd,jdbcType=VARCHAR}, + + + lastuser = #{lastuser,jdbcType=VARCHAR}, + + + lastdt = #{lastdt,jdbcType=TIMESTAMP}, + + + confirmer = #{confirmer,jdbcType=VARCHAR}, + + + confirmdt = #{confirmdt,jdbcType=TIMESTAMP}, + + + mzdy = #{mzdy,jdbcType=CHAR}, + + + fslx = #{fslx,jdbcType=CHAR}, + + + ybzt = #{ybzt,jdbcType=VARCHAR}, + + + instrid = #{instrid,jdbcType=VARCHAR}, + + + jzbz = #{jzbz,jdbcType=CHAR}, + + + sbbr = #{sbbr,jdbcType=VARCHAR}, + + + qrr = #{qrr,jdbcType=VARCHAR}, + + + qrsj = #{qrsj,jdbcType=TIMESTAMP}, + + + alarmflag = #{alarmflag,jdbcType=CHAR}, + + + alarmconfirm = #{alarmconfirm,jdbcType=VARCHAR}, + + + alarmconfirmdt = #{alarmconfirmdt,jdbcType=TIMESTAMP}, + + + shcs = #{shcs,jdbcType=INTEGER}, + + + sn_tss = #{snTss,jdbcType=VARCHAR}, + + + mzh = #{mzh,jdbcType=VARCHAR}, + + + yljg = #{yljg,jdbcType=VARCHAR}, + + + finish = #{finish,jdbcType=CHAR}, + + + send_flag = #{sendFlag,jdbcType=CHAR}, + + + sfzh = #{sfzh,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + phone1 = #{phone1,jdbcType=VARCHAR}, + + + addr = #{addr,jdbcType=VARCHAR}, + + + faultman = #{faultman,jdbcType=VARCHAR}, + + + fault = #{fault,jdbcType=CHAR}, + + + faults = #{faults,jdbcType=VARCHAR}, + + + faultdt = #{faultdt,jdbcType=TIMESTAMP}, + + + lstd = #{lstd,jdbcType=CHAR}, + + + zjlx = #{zjlx,jdbcType=VARCHAR}, + + + slzq = #{slzq,jdbcType=VARCHAR}, + + + uploaddate = #{uploaddate,jdbcType=TIMESTAMP}, + + + whonetupdate = #{whonetupdate,jdbcType=TIMESTAMP}, + + + checker = #{checker,jdbcType=VARCHAR}, + + + autojgbz = #{autojgbz,jdbcType=CHAR}, + + + where jyrq = #{jyrq} + and yq = #{yq,jdbcType=CHAR} + and ybh = #{ybh,jdbcType=VARCHAR} + diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml new file mode 100644 index 0000000..46aeaed --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/LabResultMapper.xml @@ -0,0 +1,349 @@ + + + + + + + delete from lab_result + where jyrq = #{jyrq} + and yq = #{yq,jdbcType=CHAR} + and ybh = #{ybh,jdbcType=VARCHAR} + and xmdh = #{xmdh,jdbcType=VARCHAR} + + + insert into lab_result (jyrq, yq, ybh, + xmdh, wyh, csjg, od, + cutoff, jgbz, bz1, bz2, + yhdh, instrid, operdt, + operna, refs, flag, + dw, result_flag, alarm_flag, + redo_flag, sqxmdh, redo_text, + bz3, textresult) + values (#{jyrq}, #{yq,jdbcType=CHAR}, #{ybh,jdbcType=VARCHAR}, + #{xmdh,jdbcType=VARCHAR}, #{wyh,jdbcType=VARCHAR}, #{csjg,jdbcType=VARCHAR}, #{od,jdbcType=VARCHAR}, + #{cutoff,jdbcType=VARCHAR}, #{jgbz,jdbcType=CHAR}, #{bz1,jdbcType=VARCHAR}, #{bz2,jdbcType=VARCHAR}, + #{yhdh,jdbcType=VARCHAR}, #{instrid,jdbcType=INTEGER}, #{operdt,jdbcType=TIMESTAMP}, + #{operna,jdbcType=VARCHAR}, #{refs,jdbcType=VARCHAR}, #{flag,jdbcType=VARCHAR}, + #{dw,jdbcType=VARCHAR}, #{resultFlag,jdbcType=CHAR}, #{alarmFlag,jdbcType=CHAR}, + #{redoFlag,jdbcType=CHAR}, #{sqxmdh,jdbcType=VARCHAR}, #{redoText,jdbcType=VARCHAR}, + #{bz3,jdbcType=VARCHAR}, #{textresult,jdbcType=LONGVARCHAR}) + + + insert into lab_result + + + jyrq, + + + yq, + + + ybh, + + + xmdh, + + + wyh, + + + csjg, + + + od, + + + cutoff, + + + jgbz, + + + bz1, + + + bz2, + + + yhdh, + + + instrid, + + + operdt, + + + operna, + + + refs, + + + flag, + + + dw, + + + result_flag, + + + alarm_flag, + + + redo_flag, + + + sqxmdh, + + + redo_text, + + + bz3, + + + textresult, + + + + + #{jyrq}, + + + #{yq,jdbcType=CHAR}, + + + #{ybh,jdbcType=VARCHAR}, + + + #{xmdh,jdbcType=VARCHAR}, + + + #{wyh,jdbcType=VARCHAR}, + + + #{csjg,jdbcType=VARCHAR}, + + + #{od,jdbcType=VARCHAR}, + + + #{cutoff,jdbcType=VARCHAR}, + + + #{jgbz,jdbcType=CHAR}, + + + #{bz1,jdbcType=VARCHAR}, + + + #{bz2,jdbcType=VARCHAR}, + + + #{yhdh,jdbcType=VARCHAR}, + + + #{instrid,jdbcType=INTEGER}, + + + #{operdt,jdbcType=TIMESTAMP}, + + + #{operna,jdbcType=VARCHAR}, + + + #{refs,jdbcType=VARCHAR}, + + + #{flag,jdbcType=VARCHAR}, + + + #{dw,jdbcType=VARCHAR}, + + + #{resultFlag,jdbcType=CHAR}, + + + #{alarmFlag,jdbcType=CHAR}, + + + #{redoFlag,jdbcType=CHAR}, + + + #{sqxmdh,jdbcType=VARCHAR}, + + + #{redoText,jdbcType=VARCHAR}, + + + #{bz3,jdbcType=VARCHAR}, + + + #{textresult,jdbcType=LONGVARCHAR}, + + + + + update lab_result + + + wyh = #{wyh,jdbcType=VARCHAR}, + + + csjg = #{csjg,jdbcType=VARCHAR}, + + + od = #{od,jdbcType=VARCHAR}, + + + cutoff = #{cutoff,jdbcType=VARCHAR}, + + + jgbz = #{jgbz,jdbcType=CHAR}, + + + bz1 = #{bz1,jdbcType=VARCHAR}, + + + bz2 = #{bz2,jdbcType=VARCHAR}, + + + yhdh = #{yhdh,jdbcType=VARCHAR}, + + + instrid = #{instrid,jdbcType=INTEGER}, + + + operdt = #{operdt,jdbcType=TIMESTAMP}, + + + operna = #{operna,jdbcType=VARCHAR}, + + + refs = #{refs,jdbcType=VARCHAR}, + + + flag = #{flag,jdbcType=VARCHAR}, + + + dw = #{dw,jdbcType=VARCHAR}, + + + result_flag = #{resultFlag,jdbcType=CHAR}, + + + alarm_flag = #{alarmFlag,jdbcType=CHAR}, + + + redo_flag = #{redoFlag,jdbcType=CHAR}, + + + sqxmdh = #{sqxmdh,jdbcType=VARCHAR}, + + + redo_text = #{redoText,jdbcType=VARCHAR}, + + + bz3 = #{bz3,jdbcType=VARCHAR}, + + + textresult = #{textresult,jdbcType=LONGVARCHAR}, + + + where jyrq = #{jyrq} + and yq = #{yq,jdbcType=CHAR} + and ybh = #{ybh,jdbcType=VARCHAR} + and xmdh = #{xmdh,jdbcType=VARCHAR} + + + update lab_result + set wyh = #{wyh,jdbcType=VARCHAR}, + csjg = #{csjg,jdbcType=VARCHAR}, + od = #{od,jdbcType=VARCHAR}, + cutoff = #{cutoff,jdbcType=VARCHAR}, + jgbz = #{jgbz,jdbcType=CHAR}, + bz1 = #{bz1,jdbcType=VARCHAR}, + bz2 = #{bz2,jdbcType=VARCHAR}, + yhdh = #{yhdh,jdbcType=VARCHAR}, + instrid = #{instrid,jdbcType=INTEGER}, + operdt = #{operdt,jdbcType=TIMESTAMP}, + operna = #{operna,jdbcType=VARCHAR}, + refs = #{refs,jdbcType=VARCHAR}, + flag = #{flag,jdbcType=VARCHAR}, + dw = #{dw,jdbcType=VARCHAR}, + result_flag = #{resultFlag,jdbcType=CHAR}, + alarm_flag = #{alarmFlag,jdbcType=CHAR}, + redo_flag = #{redoFlag,jdbcType=CHAR}, + sqxmdh = #{sqxmdh,jdbcType=VARCHAR}, + redo_text = #{redoText,jdbcType=VARCHAR}, + bz3 = #{bz3,jdbcType=VARCHAR}, + textresult = #{textresult,jdbcType=LONGVARCHAR} + where jyrq = #{jyrq} + and yq = #{yq,jdbcType=CHAR} + and ybh = #{ybh,jdbcType=VARCHAR} + and xmdh = #{xmdh,jdbcType=VARCHAR} + + + update lab_result + set wyh = #{wyh,jdbcType=VARCHAR}, + csjg = #{csjg,jdbcType=VARCHAR}, + od = #{od,jdbcType=VARCHAR}, + cutoff = #{cutoff,jdbcType=VARCHAR}, + jgbz = #{jgbz,jdbcType=CHAR}, + bz1 = #{bz1,jdbcType=VARCHAR}, + bz2 = #{bz2,jdbcType=VARCHAR}, + yhdh = #{yhdh,jdbcType=VARCHAR}, + instrid = #{instrid,jdbcType=INTEGER}, + operdt = #{operdt,jdbcType=TIMESTAMP}, + operna = #{operna,jdbcType=VARCHAR}, + refs = #{refs,jdbcType=VARCHAR}, + flag = #{flag,jdbcType=VARCHAR}, + dw = #{dw,jdbcType=VARCHAR}, + result_flag = #{resultFlag,jdbcType=CHAR}, + alarm_flag = #{alarmFlag,jdbcType=CHAR}, + redo_flag = #{redoFlag,jdbcType=CHAR}, + sqxmdh = #{sqxmdh,jdbcType=VARCHAR}, + redo_text = #{redoText,jdbcType=VARCHAR}, + bz3 = #{bz3,jdbcType=VARCHAR} + where jyrq = #{jyrq} + and yq = #{yq,jdbcType=CHAR} + and ybh = #{ybh,jdbcType=VARCHAR} + and xmdh = #{xmdh,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java index 8301d97..c96c416 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java @@ -68,23 +68,22 @@ public class DictController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response,ComDict comDict) { List list = comDictService.getComDictList(comDict); - ExcelUtil util = new ExcelUtil(ComDict.class); + ExcelUtil util = new ExcelUtil<>(ComDict.class); util.exportExcel(response, list, "字典数据"); } - @GetMapping("/importTemplate") + @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response){ ExcelUtil util = new ExcelUtil<>(ComDict.class); - util.exportExcel(response); + util.importTemplateExcel(response, "字典数据"); } @ApiOperation("导入字典") @PostMapping("/importData") - public Result importData(@RequestBody MultipartFile file,boolean updateDlCeshi) throws Exception{ - - ExcelUtil util = new ExcelUtil(ComDict.class); + public Result importData(MultipartFile file,boolean updateSupport) throws Exception{ + ExcelUtil util = new ExcelUtil<>(ComDict.class); List comDictList = util.importExcel(file.getInputStream()); log.info("调用导入字典{}",comDictList); - return comDictService.insertComDictList(comDictList,updateDlCeshi); + return comDictService.insertComDictList(comDictList,updateSupport); } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java index 167e794..f80f2bb 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java @@ -30,7 +30,13 @@ public class InstrController extends BaseController { List labInstrList = instrService.query(yq); return getDataTable(labInstrList); } - + @ApiOperation("按组查询数据") + @GetMapping("/querybylisgroup") + public TableDataInfo querybylisgroup(String lisgroup){ + startPage(); + List labInstrList = instrService.querybylisgroup(lisgroup); + return getDataTable(labInstrList); + } @ApiOperation("新增数据") @PostMapping("/add") public Result add(LabInstr labInstr){ 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 e632087..43ebbc3 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 @@ -1,15 +1,21 @@ package com.czlis.liswork.controller.work; import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.common.core.domain.entity.LabResult; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.liswork.service.LabPatService; +import com.czlis.liswork.service.LabResultService; import com.czlis.liswork.service.LisWorkService; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** @@ -17,11 +23,15 @@ import java.util.Date; */ @RestController @RequestMapping("/liswork") +@Slf4j public class LisWorkController extends BaseController { @Autowired private LisWorkService lisWorkService; - + @Autowired + private LabPatService labPatService; + @Autowired + private LabResultService labResultService; /** * 可操作仪器查询 * @return @@ -52,11 +62,15 @@ public class LisWorkController extends BaseController { */ @ApiOperation("获取样本列表") @GetMapping("/samplelist") - public Result getSampleList(Date jyrq,String yq,String days){ - return lisWorkService.getSampleList(jyrq,yq,days); + // public Result getSampleList(Date jyrq,String yq,Long days){ + // return lisWorkService.getSampleList(jyrq,yq,days); + // } + public TableDataInfo getsamplelist(Date jyrq,String yq,Long days){ + startPage(); + List labPatList = labPatService.getSampleList(jyrq,yq,days); + return getDataTable(labPatList); } - /** * 获取普通样本信息 * @param jyrq @@ -67,7 +81,8 @@ public class LisWorkController extends BaseController { @ApiOperation("获取普通样本信息") @GetMapping("/sampleinfo") public Result sampleInfo(Date jyrq,String yq,String ybh){ - return lisWorkService.sampleInfo(jyrq,yq,ybh); + + return labPatService.getLabPat(jyrq,yq,ybh); } /** @@ -89,5 +104,16 @@ public class LisWorkController extends BaseController { return lisWorkService.checkUser(yhdh,mm); } - + @GetMapping("/resultinfo") + public Result getresultinfo(LabResult labResult){ + Date jyrq=labResult.getJyrq(); + String yq=labResult.getYq(); + String ybh=labResult.getYbh(); + log.info("jyrq,{}",jyrq.toString()); + return labResultService.getresultinfo(jyrq,yq,ybh); + } + @PostMapping("/deleteresult") + public Result deleteresult(@RequestBody List labResultlist){ + return labResultService.delLabResultList(labResultlist); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java index 5ff571c..422230a 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java @@ -1,8 +1,8 @@ package com.czlis.liswork.mapper; import com.czlis.common.core.domain.entity.*; -import com.czlis.liswork.pojo.ComUsrpower; import com.czlis.liswork.pojo.LabPatInfo; +import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; @@ -10,9 +10,11 @@ import java.util.Map; public interface LisWorkMapper { List> getInstrdList(String userId); + List> getGroupInstrdList(@Param("userId") String userId, @Param("lisgroup") String lisgroup); List getInstrdConfig(String yq); - List getSampleList(Date jyrq, String yq, String days); - List sampleInfo(Date jyrq, String yq, String ybh); + List getSampleList(@Param("jyrq") Date jyrq, @Param("yq") String yq); + List getSampleListday(@Param("yq") String yq,@Param("days")Long days); + List getLabPat(@Param("jyrq") Date jyrq, @Param("yq") String yq,@Param("ybh")String ybh); List getLabPatList(LabPat labPat); List getLabResult(LabResult labResult); List getLabPatInfo(LabPatInfo labPatInfo); diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java index 74591dc..fa331a2 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/InstrMapper.java @@ -9,4 +9,6 @@ public interface InstrMapper { void add(LabInstr labInstr); void update(LabInstr labInstr); void delete(String yq); + + List querybylisgroup(String lisgroup); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/InstrService.java b/liswork/src/main/java/com/czlis/liswork/service/InstrService.java index b1e663c..90adc30 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/InstrService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/InstrService.java @@ -7,7 +7,12 @@ import java.util.List; public interface InstrService { List query(String yq); + Result add(LabInstr labInstr); + Result update(LabInstr labInstr); + Result delete(String yq); -} + + List querybylisgroup(String lisgroup); +} \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java b/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java new file mode 100644 index 0000000..1f48aaf --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/LabPatService.java @@ -0,0 +1,21 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; + +import java.util.Date; +import java.util.List; + +public interface LabPatService { + List getLabPatList(LabPat labPat); + List getSampleList(Date jyrq, String yq, Long days); + Result getLabPat(Date jyrq, String yq,String ybh); + Result insertLabPat(LabPat labPat); + Result delLabPat(LabPat labPat); + Result updateLabPat(LabPat labPat); + //根据主键判断是否存在数据 + int getCountById(String jyrq, String yq,String ybh) ; + //根据编号查sqh + String getSqhById(String jyrq,String yq,String ybh); + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java b/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java new file mode 100644 index 0000000..b32f5e2 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/LabResultService.java @@ -0,0 +1,17 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabResult; + +import java.util.Date; +import java.util.List; + +public interface LabResultService { + List getLabResultList(Date jyrq, String yq, String ybh); + Result getresultinfo(Date jyrq, String yq, String ybh); + List getLabResult(Date jyrq, String yq, String ybh,String xmdh); + Result insertLabResult(LabResult labResult); + Result delLabResult(LabResult labResult); + Result updateLabResult(LabResult labResult); + Result delLabResultList(List labResultlist); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java index 0e0734b..ef72046 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkService.java @@ -8,9 +8,10 @@ import java.util.Date; public interface LisWorkService { Result getInstrdList(Long userId); + Result getGroupInstrdList(Long userId,String groupId); Result getInstrdConfig(String yq); - Result getSampleList(Date jyrq, String yq, String days); - Result sampleInfo(Date jyrq, String yq, String ybh); + Result getSampleList(Date jyrq, String yq, Long days); + Result getLabPat(Date jyrq, String yq, String ybh); Result sampleMedInfo(Date jyrq, String yq, String ybh); Result checkUser(String yhdh, String mm); } 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 01f0953..f30e884 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 @@ -11,6 +11,7 @@ import com.czlis.liswork.service.ComDictService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -64,7 +65,7 @@ public class ComDictServiceImpl implements ComDictService { } /** - * 导入数据 + * 导入数据,事务查询方式为脏读,防止重复提交的数据存在 * @param comDictList * @param updateDlCeshi * @return @@ -72,10 +73,11 @@ public class ComDictServiceImpl implements ComDictService { @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 = ""; + int row, fail; + boolean haveRow =false; + String zdlb = "", pinyin, zddh, yljg, zdbz; //判断传入的List 是否为空 - if (StringUtils.isNull(comDictList) || comDictList.size() == 0) { + if (StringUtils.isNull(comDictList) || comDictList.isEmpty()) { return new Result("-1", "导入数据不能为空！"); } //定义失败条数，接收导入失败数据量 @@ -85,8 +87,9 @@ public class ComDictServiceImpl implements ComDictService { zdlb = comDict.getZdlb(); zddh = comDict.getZddh(); //是否覆盖数据,不覆盖跳过 - row0 = comDictMapper.getCountById(zdlb, zddh); - if (row0 > 0 && updateDlCeshi == false) continue; + int row0 = comDictMapper.getCountById(zdlb, zddh); + if (row0 != 0) {haveRow=true;} + if (haveRow && !updateDlCeshi) continue; pinyin = PinyinUtil.getFirstLetter(comDict.getZdmc(), ""); //拼音首字母 if (pinyin.length() >= 9) { @@ -96,13 +99,9 @@ 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) { - row = comDictMapper.updateComDict(comDict); - } else { - row = comDictMapper.insertComDict(comDict); - } + if (yljg == null || yljg.isEmpty()) comDict.setYljg("1"); + if (zdbz == null || zdbz.isEmpty()) comDict.setZdbz("N"); + row=updateComDictList(comDict,haveRow); if (row > 0) failureNum++; } if (failureNum > 0) { @@ -120,7 +119,22 @@ public class ComDictServiceImpl implements ComDictService { return new Result("-1", "导入失败!"); } } - + /** + * 批量更新,REQUIRES_NEW提交独立,保证部分成功部分失败互不影响 + * @param comDict + * @param haveRow + * @return + */ + @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW) + public int updateComDictList(ComDict comDict,boolean haveRow) { + int row; + if (haveRow) { + row = comDictMapper.updateComDict(comDict); + } else { + row = comDictMapper.insertComDict(comDict); + } + return row; + } @Transactional(rollbackFor = Exception.class) @Override diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java index dda9609..3fd389b 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/InstrServiceImpl.java @@ -24,6 +24,11 @@ public class InstrServiceImpl implements InstrService { return instrMapper.query(yq); } + @Override + public List querybylisgroup(String lisgroup) { + return instrMapper.querybylisgroup(lisgroup); + } + @Override public Result add(LabInstr labInstr) { instrMapper.add(labInstr); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java new file mode 100644 index 0000000..505e4f1 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LabPatServiceImpl.java @@ -0,0 +1,77 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabPat; +import com.czlis.liswork.service.LabPatService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.czlis.interfaceCommon.mapper.LabPatMapper; +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class LabPatServiceImpl implements LabPatService { + @Autowired + private LabPatMapper labPatMapper; + @Override + public List getLabPatList(LabPat labPat) { + return labPatMapper.getLabPat(labPat); + } + @Override + public List getSampleList(Date jyrq, String yq, Long days) { + if(days>1) { + return labPatMapper.getSampleListday(yq, days); + }else { + return labPatMapper.getSampleList(jyrq, yq); + } + } + @Override + public Result getLabPat(Date jyrq, String yq,String ybh) { + LabPat labPatlist=labPatMapper.getLabPatOne(jyrq,yq,ybh); + return new Result("0", "获取该样本数据成功！",labPatlist); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result insertLabPat(LabPat labPat) { + int row = labPatMapper.updateLabPat(labPat); + if (row > 0) + return new Result("0", "修改成功！"); + else + return new Result("-1", "修改失败！"); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result delLabPat(LabPat labPat){ + int row = labPatMapper.updateLabPat(labPat); + if (row > 0) + return new Result("0", "修改成功！"); + else + return new Result("-1", "修改失败！"); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result updateLabPat(LabPat labPat){ + int row = labPatMapper.updateLabPat(labPat); + if (row > 0) + return new Result("0", "修改成功！"); + else + return new Result("-1", "修改失败！"); + } + //根据主键判断是否存在数据 + @Transactional(rollbackFor = Exception.class) + @Override + public int getCountById(String jyrq, String yq,String ybh) { + return labPatMapper.getCountByKey(jyrq,yq,ybh); + } + //根据编号查sqh + @Transactional(rollbackFor = Exception.class) + @Override + public String getSqhById(String jyrq,String yq,String ybh){ + return labPatMapper.getSqhByKey(jyrq,yq,ybh); + } + + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java new file mode 100644 index 0000000..9013523 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LabResultImpl.java @@ -0,0 +1,86 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.LabResult; +import com.czlis.interfaceCommon.mapper.LabResultMapper; +import com.czlis.liswork.service.LabResultService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class LabResultImpl implements LabResultService { + @Autowired + private LabResultMapper labResultMapper; + @Override + public List getLabResult(Date jyrq, String yq, String ybh,String xmdh) { + return labResultMapper.getLabResult(jyrq, yq, ybh,xmdh); + } + @Override + public List getLabResultList(Date jyrq, String yq, String ybh) { + return labResultMapper.getLabResultList(jyrq, yq, ybh); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result insertLabResult(LabResult labResult) { + int row = labResultMapper.updateLabResult(labResult); + if (row > 0) + return new Result("0", "新增成功！"); + else + return new Result("-1", "新增失败！"); + } + @Override + public Result getresultinfo(Date jyrq, String yq, String ybh) { + List labResult=labResultMapper.getLabResultList(jyrq, yq, ybh); + return new Result("0", "查询成功！",labResult); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result delLabResult(LabResult labResult) { + + int row = labResultMapper.delLabResult(labResult); + if (row > 0) + return new Result("0", "删除成功！"); + else + return new Result("-1", "删除失败！"); + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result delLabResultList(List labResultlist) { + int row = 0, failureNum = 0, fail = 0; + String xmdh=""; + for (LabResult labResult : labResultlist) { + xmdh = labResult.getXmdh(); + if (xmdh == null || xmdh.isEmpty()){ + failureNum++; + continue; + } + row = labResultMapper.delLabResult(labResult); + if (row > 0) failureNum++; + } + if (failureNum ==0) return new Result("-1", "删除失败！"); + if (failureNum == labResultlist.size()) { + return new Result("0", "数据已删除！共 " + labResultlist.size() + " 条"); + } else { + fail = labResultlist.size() - failureNum; + return new Result("0", "数据部分删除！成功 " + failureNum + " 条,失败 " + fail + " 条"); + } + } + @Transactional(rollbackFor = Exception.class) + @Override + public Result updateLabResult(LabResult labResult) { + int row = labResultMapper.updateLabResult(labResult); + if (row > 0) + return new Result("0", "修改成功！"); + else + return new Result("-1", "修改失败！"); + } + + +} + diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 20f6fd3..abc39b4 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -109,7 +109,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { if(zt.equals("2")){ if(SP_GETTOWREQOK.equals("1")) return new Result("-1","当前条码已经上机！"); if(SP_GETTOWREQOKYQ.equals("1")){ - List labPatList = commonUtil.getLabPatList(sqh); + List labPatList = commonUtil.getLabPatListBySqh(sqh); for (LabPat labPat : labPatList) { String yq1 = labPat.getYq(); if(yq.equals(yq1)) return new Result("-1","该条码已经在当前仪器上机,不允许重复上机！"); diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index a4f6fba..1d8d478 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -4,8 +4,9 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.*; import com.czlis.liswork.mapper.LisWorkMapper; -import com.czlis.liswork.pojo.ComUsrpower; -import com.czlis.liswork.pojo.LabPatInfo; + +import com.czlis.liswork.mapper.xtwh.InstrMapper; +import com.czlis.liswork.pojo.LabInstr; import com.czlis.liswork.service.LisWorkService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,12 +21,25 @@ public class LisWorkServiceImpl implements LisWorkService { @Autowired private LisWorkMapper lisWorkMapper; + @Autowired + private InstrMapper instrMapper; @Override public Result getInstrdList(Long userId) { List> comUsrpowerList = lisWorkMapper.getInstrdList(String.valueOf(userId)); - return new Result("0","获取权限列表成功！",comUsrpowerList); + return new Result("0","获取仪器列表成功！",comUsrpowerList); } + @Override + public Result getGroupInstrdList(Long userId,String groupId) { + if(userId==1){ + List labInstr=instrMapper.querybylisgroup(groupId); + return new Result("0","获取分组仪器列表成功！",labInstr); + }else{ + List> comUsrpowerList = lisWorkMapper.getGroupInstrdList(String.valueOf(userId),groupId); + return new Result("0","获取分组仪器列表成功！",comUsrpowerList); + } + + } @Override public Result getInstrdConfig(String yq) { List instrdConfig = lisWorkMapper.getInstrdConfig(yq); @@ -33,33 +47,20 @@ public class LisWorkServiceImpl implements LisWorkService { } @Override - public Result getSampleList(Date jyrq, String yq, String days) { - LabPat labPat = new LabPat(); - labPat.setJyrq(jyrq); - labPat.setYq(yq); - List labPatList = lisWorkMapper.getLabPatList(labPat); - LabPatInfo labPatInfo = new LabPatInfo(); - labPatInfo.setJyrq(jyrq); - labPatInfo.setYq(yq); - List labPatInfoList = lisWorkMapper.getLabPatInfo(labPatInfo); - List> queryList = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("labPatInfoList",labPatInfoList); - map.put("labPatList",labPatList); - queryList.add(map); - return new Result("0","获取样本数据成功！",queryList); + public Result getSampleList(Date jyrq, String yq, Long days) { + if(days>1) { + List labPatListday = lisWorkMapper.getSampleListday(yq, days); + return new Result("0", "获取该样本数据成功！", labPatListday); + }else { + List labPatListday = lisWorkMapper.getSampleList(jyrq, yq); + return new Result("0", "获取该样本数据成功！", labPatListday); + } } - @Override - public Result sampleInfo(Date jyrq, String yq, String ybh) { - LabResult labResult = new LabResult(); - labResult.setJyrq(jyrq); - labResult.setYq(yq); - labResult.setYbh(ybh); - List labResultList = lisWorkMapper.getLabResult(labResult); - return new Result("0","获取该样本数据成功！",labResultList); + public Result getLabPat(Date jyrq, String yq, String ybh) { + List labPat = lisWorkMapper.getLabPat(jyrq, yq, ybh); + return new Result("0", "获取该样本数据成功！", labPat); } - @Override public Result sampleMedInfo(Date jyrq, String yq, String ybh) { LabResult labResult = new LabResult(); diff --git a/liswork/src/main/resources/mapper/InstrMapper.xml b/liswork/src/main/resources/mapper/InstrMapper.xml index 647170d..d23645b 100644 --- a/liswork/src/main/resources/mapper/InstrMapper.xml +++ b/liswork/src/main/resources/mapper/InstrMapper.xml @@ -9,7 +9,12 @@ and yq = #{yq} - + insert into lab_instr( yqmc, diff --git a/liswork/src/main/resources/mapper/LisWorkMapper.xml b/liswork/src/main/resources/mapper/LisWorkMapper.xml index 8c88ee3..7c17a90 100644 --- a/liswork/src/main/resources/mapper/LisWorkMapper.xml +++ b/liswork/src/main/resources/mapper/LisWorkMapper.xml @@ -2,13 +2,19 @@ - + + select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg from lab_pat + - + @@ -18,8 +24,21 @@ and ybh = #{ybh} and xmdh = #{xmdh} - - + + + and yq = #{yq} + and jyrq = #{jyrq} + + + + - +