From 93d1be694d0c9e70899781dab787e4474a535d9f Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Wed, 18 Mar 2026 16:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=B4=E6=8A=A4=EF=BC=8C=E5=8C=BB=E7=96=97=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/RegHospitalMapper.xml | 2 +- .../controller/RegRequestInfoController.java | 4 +++- .../RegTransitSampleController.java | 6 +++++ .../controller/dict/RegItemController.java | 15 ++++++++++++ .../transitPF/mapper/RegItemMapper.java | 4 ++++ .../mapper/RegRequestInfoMapper.java | 2 +- .../transitPF/service/RegItemService.java | 5 ++++ .../service/RegRequestInfoService.java | 2 +- .../service/RegTransitSampleService.java | 2 ++ .../service/impl/RegItemServiceImpl.java | 20 ++++++++++++++++ .../impl/RegRequestInfoServiceImpl.java | 14 +++++++---- .../impl/RegTransitSampleServiceImpl.java | 23 +++++++++++++++++++ .../main/resources/mapper/RegDictMapper.xml | 1 + .../main/resources/mapper/RegItemMapper.xml | 16 ++++++++++--- .../resources/mapper/RegRequestInfoMapper.xml | 4 +++- 15 files changed, 108 insertions(+), 12 deletions(-) diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml index d1b3184..76b8e76 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml @@ -18,7 +18,7 @@ - select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark + select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type from Reg_hospital diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java index 1f3aaaa..020d603 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java @@ -45,7 +45,9 @@ public class RegRequestInfoController extends BaseController { @ApiOperation("开单项目信息") @GetMapping("/getItemInfo") public Result getItemInfo() { - return regRequestInfoService.getItemInfo(); + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + if (loginYLJG == null || loginYLJG.equals("")) return new Result("-1", "获取登录的医疗机构失败！"); + return regRequestInfoService.getItemInfo(loginYLJG); } 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 74d5b27..d63bbad 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 @@ -86,4 +86,10 @@ public class RegTransitSampleController extends BaseController { return regTransitSampleService.getInpInfo(dept,st,et,yljg,getUsername()); } + @ApiOperation("获取已打印的条码数据") + @GetMapping("/sampleCollect") + public Result getSampleCollectInfo(String barcode){ + return regTransitSampleService.getSampleCollectInfo(barcode); + } + } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegItemController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegItemController.java index dc30193..ee904bd 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegItemController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegItemController.java @@ -1,6 +1,7 @@ package com.transitPlatForm.transitPF.controller.dict; import com.transitPlatForm.common.annotation.Log; +import com.transitPlatForm.common.annotation.RepeatSubmit; import com.transitPlatForm.common.core.controller.BaseController; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.reg.RegItem; @@ -53,4 +54,18 @@ public class RegItemController extends BaseController { public Result delete(@RequestBody RegItem regItem){ return regItemService.delete(regItem); } + + @ApiOperation("获取条码已对照项目") + @GetMapping("/compare") + public Result queryCompareInfo(String itemclass){ + return regItemService.queryCompareInfo(itemclass); + } + + @ApiOperation("获取条码未对照项目") + @GetMapping("/noCompare") + public Result queryNoCompareInfo(String itemclass,String compareStatus){ + //compareStatus 1 未对照项目 2. 其他对照项目 + if(compareStatus == null) return new Result("-1","compareStatus参数不能为空！"); + return regItemService.queryNoCompareInfo(itemclass,compareStatus); + } } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemMapper.java index f821ff3..1e34474 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemMapper.java @@ -1,6 +1,7 @@ package com.transitPlatForm.transitPF.mapper; import com.transitPlatForm.common.core.domain.entity.reg.RegItem; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,4 +10,7 @@ public interface RegItemMapper { void add(RegItem regItem); void update(RegItem regItem); + List queryCompareInfo(String itemclass); + + List queryNoCompareInfo(@Param("itemclass") String itemclass,@Param("compareStatus") String compareStatus); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java index 1b99765..1c2e944 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java @@ -14,7 +14,7 @@ public interface RegRequestInfoMapper { List queryReqDetail(String applyId); - List> getItemInfo(); + List> getItemInfo(String hospitalType); List existSQD(@Param("applyId") String applyId, @Param("applyDetailId") String applyDetailId); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemService.java index f192898..f6a1cb6 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemService.java @@ -2,6 +2,7 @@ package com.transitPlatForm.transitPF.service; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.reg.RegItem; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +14,8 @@ public interface RegItemService { Result update(RegItem regItem); Result delete(RegItem regItem); + + Result queryCompareInfo(String itemclass); + + Result queryNoCompareInfo(String itemclass, String compareStatus); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java index 737c4ca..c0be3e6 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java @@ -12,7 +12,7 @@ public interface RegRequestInfoService { Result queryReqDetail(String applyId); - Result getItemInfo(); + Result getItemInfo(String loginYLJG); Result saveReqInfo(ReqApplyInfoDTO reqApplyInfoDTO); 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 096a188..6f8b917 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 @@ -22,4 +22,6 @@ public interface RegTransitSampleService { Result getOutPatientInfo(String patNo,String st,String et,String userId,String yljg); Result getInpInfo(String dept, String st, String et, String yljg,String userId); + + Result getSampleCollectInfo(String barcode); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemServiceImpl.java index b93090e..e436a15 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemServiceImpl.java @@ -59,4 +59,24 @@ public class RegItemServiceImpl implements RegItemService { regItemMapper.update(regItem); return new Result("0","操作成功！"); } + + /** + * 获取条码已对照项目 + * @return + */ + @Override + public Result queryCompareInfo(String itemclass) { + List regItemList = regItemMapper.queryCompareInfo(itemclass); + return new Result("0","获取数据成功！",regItemList); + } + + /** + * 获取条码未对照项目 + * @return + */ + @Override + public Result queryNoCompareInfo(String itemclass,String compareStatus) { + List regItemList = regItemMapper.queryNoCompareInfo(itemclass,compareStatus); + return new Result("0","获取未对照项目成功！",regItemList); + } } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index 6a1b000..79e682c 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -12,6 +12,7 @@ import com.transitPlatForm.common.utils.ip.IpUtils; import com.transitPlatForm.interfaceCommon.mapper.CommonMapper; import com.transitPlatForm.interfaceCommon.mapper.RegApplyDetailMapper; import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; +import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper; import com.transitPlatForm.interfaceCommon.utils.CommonUtil; import com.transitPlatForm.interfaceCommon.utils.LisUtil; import com.transitPlatForm.interfaceCommon.websocket.ChatWebSocketServer; @@ -57,6 +58,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { RequestInfoUtil requestInfoUtil; @Resource LabIntersendListMapper labIntersendListMapper; + @Autowired + RegHospitalMapper hospitalMapper; /** @@ -86,8 +89,9 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { } @Override - public Result getItemInfo() { - List> regItemList = regRequestInfoMapper.getItemInfo(); + public Result getItemInfo(String loginYLJG) { + String hospitalType = hospitalMapper.selectHospitalById(Long.valueOf(loginYLJG)).getHospital_type(); + List> regItemList = regRequestInfoMapper.getItemInfo(hospitalType); return new Result("0", "查询成功！", regItemList); } @@ -208,6 +212,8 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { List regTransitSampleDetailList = new ArrayList<>(); List> reqSqdInfoList = new ArrayList<>(); + String hospitalBrly = commonUtil.selectConfigByKey("hospital_brly"); + //获取项目的对照信息列表 List> feeClassList = commonMapper.getFeeClassList(); for (RegApplyDetail regApplyDetail : regApplyDetailList) { @@ -232,7 +238,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { reqSqdInfo.put("sample_PatId", regApply.getPatId()); reqSqdInfo.put("sample_PatCardType", regApply.getPatCardType()); reqSqdInfo.put("sample_PatCardNo", regApply.getPatCardNo()); - reqSqdInfo.put("sample_PatType", regApply.getPatType()); + reqSqdInfo.put("sample_PatType", hospitalBrly);//regApply.getPatType() 这里条码的病人来源，需要根据医院的需求修改 reqSqdInfo.put("sample_RegNo", regApply.getRegNo()); reqSqdInfo.put("sample_PatName", regApply.getPatName()); reqSqdInfo.put("sample_PatSex", regApply.getPatSex()); @@ -301,7 +307,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { xh++; stringObjectMap.put("sample_Barcode", barcode); stringObjectMap.put("detail_OrderItemSerial", xh); - jymd = LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")); + jymd = jymd + "," + LisUtil.isBank(stringObjectMap.get("detail_OrderItemName")); regTransitSample.setCheckPUR(jymd); regTransitSampleList.set(k, 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 d0872b2..2ec0346 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 @@ -74,6 +74,12 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { } + /** + * 标本条码状态修改 + * @param sampleSignVO + * @param userId + * @return + */ @Override public Result sampleSign(SampleSignVO sampleSignVO, String userId) { String status = sampleSignVO.getStatus(); @@ -196,6 +202,23 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { return regInterfaceImpl.addTransitSample(jsonData); } + /** + * 获取待送检项目 + * @param barcode + * @return + */ + @Override + public Result getSampleCollectInfo(String barcode) { + RegTransitSample regTransitSample = new RegTransitSample(); + 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","该条码已经签收，或者已经上机！"); + return new Result("0","获取数据成功！",regTransitSampleList.get(0)); + } + @Override public List getRegTransitSample(RegTransitSample labQuerySample) { List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(labQuerySample); diff --git a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml index 9578419..5377e98 100644 --- a/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegDictMapper.xml @@ -44,6 +44,7 @@ diff --git a/pf_transitPF/src/main/resources/mapper/RegItemMapper.xml b/pf_transitPF/src/main/resources/mapper/RegItemMapper.xml index 45248c0..c91a88e 100644 --- a/pf_transitPF/src/main/resources/mapper/RegItemMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegItemMapper.xml @@ -14,17 +14,17 @@ - insert into reg_item(itemcode, itemname, itemclass, status,dj,dj1,dj2,dj3,dj4) + insert into reg_item(itemcode, itemname, itemclass, status,dj,dj1,dj2,dj3,dj4,zjf,yblx) values( - #{itemcode},#{itemname},#{itemclass},#{status},#{dj},#{dj1},#{dj2},#{dj3},#{dj4} + #{itemcode},#{itemname},#{itemclass},#{status},#{dj},#{dj1},#{dj2},#{dj3},#{dj4},#{zjf},#{yblx} ) update reg_item - itemcode = #{itemcode}, itemname = #{itemname}, + itemclass = #{itemclass}, status = #{status}, zjf = #{zjf}, dj = #{dj}, @@ -37,4 +37,14 @@ where itemcode = #{itemcode} + + + + \ No newline at end of file diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml index 382cfcb..4d39083 100644 --- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml @@ -17,7 +17,9 @@