From 9517d9a3edc828a654b84d588228acd42e98cc7a Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 20 Mar 2026 12:01:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=A5=E5=B9=B2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/RegHospitalMapper.xml | 7 +- .../RegTransitSampleController.java | 4 +- .../controller/dict/RegDictController.java | 9 ++- .../transitPF/mapper/RegDictMapper.java | 2 +- .../mapper/RegTransitSampleMapper.java | 2 +- .../transitPF/service/RegDictService.java | 4 +- .../service/RegTransitSampleService.java | 2 +- .../service/impl/RegDictServiceImpl.java | 26 +++++-- .../service/impl/RegInterfaceImpl.java | 41 +++++++++-- .../impl/RegTransitSampleServiceImpl.java | 71 +++++++++++++------ .../service/util/RequestInfoUtil.java | 18 +++++ .../main/resources/mapper/RegDictMapper.xml | 6 ++ .../resources/mapper/RegRequestInfoMapper.xml | 4 +- 13 files changed, 148 insertions(+), 48 deletions(-) diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml index 76b8e76..345b09d 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml @@ -39,11 +39,12 @@ @@ -51,13 +52,13 @@ diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java index fc6730a..f88fc6c 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java @@ -44,9 +44,9 @@ public class RegTransitSampleController extends BaseController { @ApiOperation("获取未签收的标本") @GetMapping("/querySampleSign") - public TableDataInfo getSampleSign(){ + public TableDataInfo getSampleSign(RegTransitSample regTransitSample){ startPage(); - List regTransitSampleList = regTransitSampleService.getSampleSign(); + List regTransitSampleList = regTransitSampleService.getSampleSign(regTransitSample); return getDataTable(regTransitSampleList); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java index 6d9abd1..f3597a6 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java @@ -38,14 +38,16 @@ public class RegDictController extends BaseController { @GetMapping("/list") public TableDataInfo list(RegDict post) { startPage(); - List list = regDictService.selectDictList(post); + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + List list = regDictService.selectDictList(post,loginYLJG); return getDataTable(list); } @ApiOperation("字典导出") @Log(title = SysLogConstants.DICT, businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RegDict post) { - List list = regDictService.selectDictList(post); + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + List list = regDictService.selectDictList(post,loginYLJG); ExcelUtil util = new ExcelUtil<>(RegDict.class); util.exportExcel(response, list, "字典数据"); } @@ -62,7 +64,8 @@ public class RegDictController extends BaseController { @ApiOperation("获取字典信息") @GetMapping("/getInfoOne") public Result getInfoOne(String dict_type){ - return regDictService.getInfoOne(dict_type); + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + return regDictService.getInfoOne(dict_type,loginYLJG); } /** diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java index 3a67967..0145a7b 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java @@ -79,7 +79,7 @@ public interface RegDictMapper { */ RegDict checkDictCodeUnique(@Param("dictCode") String DictCode,@Param("dictType") String dictType,@Param("hospital_id") int hospital_id); - List getInfoOne(String dict_type); + List getInfoOne(@Param("dict_type")String dict_type,@Param("hospital_id")String hospital_id); String getMaxDictCode(@Param("dict_type")String dict_type,@Param("hospital_id")String hospital_id); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java index f6675b5..b493e15 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java @@ -19,7 +19,7 @@ public interface RegTransitSampleMapper { void updateTest(@Param("checkPUR") String checkPUR,@Param("barcode") String barcode); - List getRegTransitSampleSign(); + List getRegTransitSampleSign(RegTransitSample regTransitSample); void updateRegTransitSample(RegTransitSample regTransitSample); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java index 961d5e8..549d869 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java @@ -13,7 +13,7 @@ public interface RegDictService { * @param Dict 字典信息 * @return 字典列表 */ - List selectDictList(RegDict Dict); + List selectDictList(RegDict Dict,String loginYLJG); /** * 查询所有字典 @@ -87,7 +87,7 @@ public interface RegDictService { */ int updateDict(RegDict Dict); - Result getInfoOne(String dictType); + Result getInfoOne(String dictType,String loginYLJG); AjaxResult getMaxDictCode(String dictType,String loginYLJG); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java index 6f8b917..5f469fd 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java @@ -11,7 +11,7 @@ public interface RegTransitSampleService { Result invoke(String jsonStr); - List getSampleSign(); + List getSampleSign(RegTransitSample regTransitSample); Result sampleSign(SampleSignVO sampleSignVO, String userId); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java index 0adbf51..b9b1536 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; import static com.transitPlatForm.common.core.domain.AjaxResult.success; @@ -28,6 +29,9 @@ public class RegDictServiceImpl implements RegDictService { @Autowired private CommonUtil commonUtil; + + private static final String[] ksdhArray = new String[]{"DEPT","DOCTOR"}; + /** * 查询字典信息集合 * @@ -35,7 +39,10 @@ public class RegDictServiceImpl implements RegDictService { * @return 字典信息集合 */ @Override - public List selectDictList(RegDict Dict) { + public List selectDictList(RegDict Dict,String loginYLJG) { + if(Arrays.stream(ksdhArray).anyMatch(Dict.getDictType()::equals)){ + Dict.setHospital_id(Integer.parseInt(loginYLJG)); + } return dictMapper.selectDictList(Dict); } @@ -115,7 +122,7 @@ public class RegDictServiceImpl implements RegDictService { int i = dictMapper.deleteDictById(DictId); //设置缓存 RegDict regDict = dictMapper.selectDictById(DictId); - RegDictCache.setDictCache(regDict.getDictType(),dictMapper.getInfoOne(regDict.getDictType())); + RegDictCache.setDictCache(regDict.getDictType(),dictMapper.getInfoOne(regDict.getDictType(),null)); return i; } @@ -159,7 +166,7 @@ public class RegDictServiceImpl implements RegDictService { } int i = dictMapper.insertDict(Dict); //设置缓存 - List regDictList = dictMapper.getInfoOne(Dict.getDictType()); + List regDictList = dictMapper.getInfoOne(Dict.getDictType(),null); RegDictCache.setDictCache(Dict.getDictType(),regDictList); return i; } @@ -174,17 +181,22 @@ public class RegDictServiceImpl implements RegDictService { public int updateDict(RegDict Dict) { int i = dictMapper.updateDict(Dict); //设置缓存 - List regDictList = dictMapper.getInfoOne(Dict.getDictType()); + List regDictList = dictMapper.getInfoOne(Dict.getDictType(),null); RegDictCache.setDictCache(Dict.getDictType(),regDictList); return i; } @Override - public Result getInfoOne(String dictType) { - List dictCacheList = RegDictCache.getDictCache(dictType); + public Result getInfoOne(String dictType,String loginYLJG) { + List dictCacheList = null; + if(Arrays.stream(ksdhArray).anyMatch(dictType::equals)){ + dictCacheList = dictMapper.getInfoOne(dictType,loginYLJG); + return new Result("0","获取数据成功！",dictCacheList); + } + dictCacheList = RegDictCache.getDictCache(dictType); if(dictCacheList == null) { //没取到缓存，则设置缓存 - dictCacheList = dictMapper.getInfoOne(dictType); + dictCacheList = dictMapper.getInfoOne(dictType,null); RegDictCache.setDictCache(dictType,dictCacheList); } return new Result("0","获取数据成功！",dictCacheList); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index 48502ba..795f58f 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -4,11 +4,14 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; +import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; import com.transitPlatForm.interfaceCommon.utils.CommonUtil; import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail; +import com.transitPlatForm.transitPF.service.util.RequestInfoUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -23,6 +26,8 @@ public class RegInterfaceImpl { RegTransitSampleMapper regTransitSampleMapper; @Autowired private CommonUtil commonUtil; + @Autowired + RequestInfoUtil requestInfoUtil; /** *{ @@ -131,6 +136,11 @@ public class RegInterfaceImpl { } } + /** + * 平台状态修改 + * @param jsonStr + * @return + */ public Result updateStatus(String jsonStr){ try{ JSONObject jsonObject = JSONUtil.parseObj(jsonStr); @@ -145,6 +155,10 @@ public class RegInterfaceImpl { List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample1); if(regTransitSampleList.size() <= 0) return new Result("-1","没有查到该标本的信息！"); String status = regTransitSampleList.get(0).getStatus(); + + String regApplyId = requestInfoUtil.getRegApplyId(barcode); + RegApply regApply = new RegApply(); + regApply.setApplyid(regApplyId); switch (statusParam){ case "20": //标本采集 if(Integer.parseInt(status) >= 20) continue;//return new Result("0","该标本已经采集！"); @@ -160,7 +174,9 @@ public class RegInterfaceImpl { regTransitSample20.setAffirmUserCode(affirmUserCode); regTransitSample20.setAffirmUserName(affirmUserName); regTransitSample20.setStatus("20"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample20); + + regApply.setStatus("20"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample20,regApply); case "30": //标本送检 Date sendPackTime = sampleSignVO.getSendPackTime(); String sendUserCode = sampleSignVO.getSendUserCode(); @@ -180,7 +196,9 @@ public class RegInterfaceImpl { return new Result("-1","日期时间格式不正确！"); } regTransitSample.setStatus("30"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample); + + regApply.setStatus("30"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply); break; case "40": //标本外送 break; @@ -198,7 +216,9 @@ public class RegInterfaceImpl { regTransitSample50.setSignInUserCode(signUserCode); regTransitSample50.setSignInUserName(signUserName); regTransitSample50.setStatus("50"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample50); + + regApply.setStatus("50"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample50,regApply); break; case "60": //上机检测 break; @@ -215,7 +235,9 @@ public class RegInterfaceImpl { regTransitSample70.setReportUserCode(reportUserCode); regTransitSample70.setReportUserName(reportUserName); regTransitSample70.setStatus("70"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample70); + + regApply.setStatus("70"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample70,regApply); break; case "90": //申请作废 Date cancelTime = sampleSignVO.getCancelTime(); @@ -230,7 +252,9 @@ public class RegInterfaceImpl { regTransitSample90.setCancelCode(cancelCode); regTransitSample90.setCancelName(cancelName); regTransitSample90.setStatus("90"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample90); + + regApply.setStatus("90"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample90,regApply); break; case "100": //标本退回 String backUserCode = sampleSignVO.getBackUserCode(); @@ -245,7 +269,9 @@ public class RegInterfaceImpl { regTransitSample100.setBackUserCode(backUserCode); regTransitSample100.setBackUserName(backUserName); regTransitSample100.setStatus("100"); - regTransitSampleMapper.updateRegTransitSample(regTransitSample100); + + regApply.setStatus("100"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample100,regApply); break; @@ -262,6 +288,9 @@ public class RegInterfaceImpl { } + + + public Result test(){ RegTransitSample regTransitSample = new RegTransitSample(); List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample); diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java index 2de4be9..ec24ff2 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.SysUser; +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.interfaceCommon.constants.LisinterfaceNameConstants; import com.transitPlatForm.interfaceCommon.pojo.inter.reg.GetRegInpInfo; import com.transitPlatForm.interfaceCommon.pojo.inter.reg.GetRegOutPatientInfo; @@ -14,6 +15,7 @@ import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; import com.transitPlatForm.transitPF.service.RegTransitSampleService; +import com.transitPlatForm.transitPF.service.util.RequestInfoUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +35,8 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { private CommonUtil commonUtil; @Autowired LisInterfaceUtil lisInterfaceUtil; + @Autowired + RequestInfoUtil requestInfoUtil; @Override @@ -68,8 +72,8 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { } @Override - public List getSampleSign() { - List regTransitSampleSignList = regTransitSampleMapper.getRegTransitSampleSign(); + public List getSampleSign(RegTransitSample regTransitSample) { + List regTransitSampleSignList = regTransitSampleMapper.getRegTransitSampleSign(regTransitSample); return regTransitSampleSignList; } @@ -93,48 +97,73 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { String backUserCode = sampleSignVO.getBackUserCode(); String backUserName = sampleSignVO.getBackUserName(); - List barcode = sampleSignVO.getBarcode(); - for (int i = 0; i < barcode.size(); i++) { + List barcodeList = sampleSignVO.getBarcode(); + for (String barcode : barcodeList) { RegTransitSample regTransitSample = new RegTransitSample(); - regTransitSample.setBarcode(barcode.get(i)); + regTransitSample.setBarcode(barcode); List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample); - if(regTransitSampleList.size() <= 0) return new Result("-1","没有找到条码信息！"); + if (regTransitSampleList.size() <= 0) return new Result("-1", "没有找到条码信息！"); SysUser sysUserOne = commonUtil.getSysUserOne(userId); - if(sysUserOne == null) return new Result("-1","未查询到员工信息！"); + if (sysUserOne == null) return new Result("-1", "未查询到员工信息！"); String nickName = sysUserOne.getNickName(); String statusSample = regTransitSampleList.get(0).getStatus(); - switch (status){ + + String regApplyId = requestInfoUtil.getRegApplyId(barcode); + RegApply regApply = new RegApply(); + regApply.setApplyid(regApplyId); + + switch (status) { case "20": //标本采集 //if(affirmTime == null) return new Result("-1","affirmTime标本采集时间不能为空！"); - if(statusSample.equals("20")) return new Result("0","该标本已经采集！"); - if(affirmUserName == null || affirmUserName.equals("")) return new Result("-1","affirmUserName标本采集人姓名不能为空！"); + if (statusSample.equals("20")) return new Result("0", "该标本已经采集！"); + if (Integer.parseInt(statusSample) > 30) + return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！"); + if (affirmUserName == null || affirmUserName.equals("")) + return new Result("-1", "affirmUserName标本采集人姓名不能为空！"); regTransitSample.setAffirmTime(commonUtil.getCurrentTime());//affirmTime regTransitSample.setAffirmUserCode(affirmUserCode); regTransitSample.setAffirmUserName(affirmUserName); + regTransitSample.setStatus("20"); + + regApply.setStatus("20"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply); + break; case "30": //标本送检 - if(dstHospName == null || dstHospName.equals("")) return new Result("-1","dstHospName不能为空！"); - if(sendUserName == null || sendUserName.equals("")) return new Result("-1","sendUserName不能为空！"); - if(statusSample.equals("30")) return new Result("-1","该标本已经送检！"); - if(Integer.parseInt(backReasons) > 30) return new Result("-1","标本已经签收或者上机，不能再进行送检操作！"); + if (dstHospName == null || dstHospName.equals("")) return new Result("-1", "dstHospName不能为空！"); + if (sendUserName == null || sendUserName.equals("")) + return new Result("-1", "sendUserName不能为空！"); + if (statusSample.equals("30")) return new Result("-1", "该标本已经送检！"); + if (Integer.parseInt(statusSample) > 30) + return new Result("-1", barcode+"标本已经签收或者上机，不能再进行送检操作！"); regTransitSample.setDstHospCode(dstHospCode); regTransitSample.setDstHospName(dstHospName); regTransitSample.setSendPackTime(commonUtil.getCurrentTime()); // regTransitSample.setSendUserCode(sendUserCode); regTransitSample.setSendUserName(sendUserName); + + regApply.setStatus("30"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply); break; case "50": //标本签收 - if(statusSample.equals("50")) return new Result("0","该标本已经签收！"); - if(Integer.parseInt(statusSample) > 50) return new Result("-1","该标本已经上机或者报告，不能再签收！"); + if (statusSample.equals("50")) return new Result("0", "该标本已经签收！"); + if (Integer.parseInt(statusSample) > 50) + return new Result("-1", barcode+"该标本已经上机或者报告，不能再签收！"); regTransitSample.setSignInTime(commonUtil.getCurrentTime()); regTransitSample.setSignInUserCode(userId); regTransitSample.setSignInUserName(nickName); + + regApply.setStatus("50"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply); break; case "100": //标本退回 - if(statusSample.equals("100")) return new Result("0","该标本已经退回！"); - if(Integer.parseInt(statusSample) < 50) return new Result("-1","该标本还未签收，不能退回！"); + if (statusSample.equals("100")) return new Result("0", "该标本已经退回！"); + if (Integer.parseInt(statusSample) < 50) return new Result("-1", barcode+"该标本还未签收，不能退回！"); regTransitSample.setBackUserCode(backUserCode); regTransitSample.setBackUserName(backUserName); regTransitSample.setBackTime(commonUtil.getCurrentTime()); + + regApply.setStatus("100"); + requestInfoUtil.updateRegTransitSampleStatus(regTransitSample,regApply); break; } @@ -217,9 +246,9 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { regTransitSample.setBarcode(barcode); List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample); if(regTransitSampleList.size() <= 0) return new Result("-1","没有找到该标本的数据！"); - String status = regTransitSampleList.get(0).getStatus(); - if(status.equals("30")) return new Result("-1","该标本已经送检！"); - if(!status.equals("10") && !status.equals("20")) return new Result("-1","该条码已经签收，或者已经上机！"); + //String status = regTransitSampleList.get(0).getStatus(); + //if(status.equals("30")) return new Result("-1","该标本已经送检！"); + //if(!status.equals("10") && !status.equals("20")) return new Result("-1","该条码已经签收，或者已经上机！"); return new Result("0","获取数据成功！",regTransitSampleList.get(0)); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java index 3e9a138..318a5a2 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java @@ -41,4 +41,22 @@ public class RequestInfoUtil { } + @Transactional(rollbackFor = Exception.class) + public void updateRegTransitSampleStatus(RegTransitSample regTransitSample,RegApply regApply){ + regTransitSampleMapper.updateRegTransitSample(regTransitSample); + regApplyMapper.update(regApply); + } + + + public String getRegApplyId(String barcode){ + RegTransitSampleDetail regTransitSampleDetail = new RegTransitSampleDetail(); + regTransitSampleDetail.setBarcode(barcode); + List regTransitSampleDetailList = regTransitSampleMapper.getRegTransitSampleDetail(regTransitSampleDetail); + if(!regTransitSampleDetailList.isEmpty()){ + return regTransitSampleDetailList.get(0).getApplyid(); + } + return null; + } + + } diff --git a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml index 5377e98..56e8172 100644 --- a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml @@ -38,6 +38,9 @@ AND dict_name like '%'+#{dictName}+'%' + + AND hospital_id = #{hospital_id} + order by dict_Sort @@ -123,6 +126,9 @@