diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java index 0cc8c20..644f5ad 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java @@ -311,7 +311,23 @@ public class RegTransitSample { private Date DateStart; private Date DateEnd; + /** + * 项目类别提示 + */ + private String itemclass_tips; + /** + * 作废时间 + */ + private Date cancelTime; + /** + * 作废人代码 + */ + private String cancelCode; + /** + * 作废人姓名 + */ + private String cancelName; 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 020d603..d71b2bf 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 @@ -33,6 +33,8 @@ public class RegRequestInfoController extends BaseController { @ApiOperation("查询申请单信息") @GetMapping("/queryRegRequestInfo") public Result queryRegRequestInfo(RegRequestInfoDTO regRequestInfoDTO) { + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + regRequestInfoDTO.setSrcHospCode(loginYLJG); return regRequestInfoService.queryRegRequestInfo(regRequestInfoDTO); } 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 d63bbad..fc6730a 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 @@ -53,8 +53,15 @@ public class RegTransitSampleController extends BaseController { @ApiOperation("状态修改") @PostMapping("/sampleSign") public Result sampleSign(@RequestBody SampleSignVO sampleSignVO){ - List barcode = sampleSignVO.getBarcode(); - String status = sampleSignVO.getStatus(); + String nickName = getLoginUser().getUser().getNickName(); + sampleSignVO.setAffirmUserCode(getUsername()); + sampleSignVO.setAffirmUserName(nickName); + sampleSignVO.setSendUserCode(getUsername()); + sampleSignVO.setSendUserName(nickName); + sampleSignVO.setSignUserCode(getUsername()); + sampleSignVO.setSignUserName(nickName); + sampleSignVO.setBackUserCode(getUsername()); + sampleSignVO.setBackUserName(nickName); return regTransitSampleService.sampleSign(sampleSignVO,getUsername()); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java index e7504e2..7efa13e 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java @@ -40,4 +40,22 @@ public class SampleSignVO { private String signUserCode; @ApiModelProperty(value = "标本签收人姓名") private String signUserName; + @ApiModelProperty(value = "标本退回人代码") + private String backUserCode; + @ApiModelProperty(value = "标本退回人姓名") + private String backUserName; + @ApiModelProperty(value = "报告时间") + private Date ReportTime; + @ApiModelProperty(value = "报告人代码") + private String ReportUserCode; + @ApiModelProperty(value = "报告人姓名") + private String ReportUserName; + @ApiModelProperty(value = "标本作废时间") + private Date cancelTime; + @ApiModelProperty(value = "标本作废人代码") + private String cancelCode; + @ApiModelProperty(value = "标本作废人名称") + private String cancelName; + @ApiModelProperty(value = "标本退回时间") + private Date BackTime; } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/reqinfo/RegRequestInfoDTO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/reqinfo/RegRequestInfoDTO.java index 4204fbd..ac42af2 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/reqinfo/RegRequestInfoDTO.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/reqinfo/RegRequestInfoDTO.java @@ -15,4 +15,5 @@ public class RegRequestInfoDTO { private String status; private Date begdate; private Date enddate; + private String SrcHospCode; } 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 4719527..48502ba 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 @@ -202,7 +202,51 @@ public class RegInterfaceImpl { break; case "60": //上机检测 break; - + case "70": //结果审核 + Date reportTime = sampleSignVO.getReportTime(); + String reportUserCode = sampleSignVO.getReportUserCode(); + String reportUserName = sampleSignVO.getReportUserName(); + if(reportTime == null) return new Result("-1","审核时间不能为空！"); + if(reportUserCode == null || reportUserCode.equals("")) return new Result("-1","审核人代码不能为空！"); + if(reportUserName == null || reportUserName.equals("")) return new Result("-1","审核人姓名不能为空！"); + RegTransitSample regTransitSample70 = new RegTransitSample(); + regTransitSample70.setBarcode(barcode); + regTransitSample70.setReportTime(reportTime); + regTransitSample70.setReportUserCode(reportUserCode); + regTransitSample70.setReportUserName(reportUserName); + regTransitSample70.setStatus("70"); + regTransitSampleMapper.updateRegTransitSample(regTransitSample70); + break; + case "90": //申请作废 + Date cancelTime = sampleSignVO.getCancelTime(); + String cancelCode = sampleSignVO.getCancelCode(); + String cancelName = sampleSignVO.getCancelName(); + if(cancelTime == null) return new Result("-1","cancelTime申请作废时间不能为空！"); + if(cancelCode == null || cancelCode.equals("")) return new Result("-1","cancelCode申请作废代码不能为空！"); + if(cancelName == null || cancelName.equals("")) return new Result("-1","cancelName申请作废名称不能为空！"); + RegTransitSample regTransitSample90 = new RegTransitSample(); + regTransitSample90.setBarcode(barcode); + regTransitSample90.setCancelTime(cancelTime); + regTransitSample90.setCancelCode(cancelCode); + regTransitSample90.setCancelName(cancelName); + regTransitSample90.setStatus("90"); + regTransitSampleMapper.updateRegTransitSample(regTransitSample90); + break; + case "100": //标本退回 + String backUserCode = sampleSignVO.getBackUserCode(); + String backUserName = sampleSignVO.getBackUserName(); + Date backTime = sampleSignVO.getBackTime(); + if(backTime == null) return new Result("-1","backTime标本退回时间不能为空！"); + if(backUserCode == null || backUserCode.equals("")) return new Result("-1","backUserCode标本退回人员代码不能为空！"); + if(backUserName == null || backUserName.equals("")) return new Result("-1","backUserName标本退回人员姓名不能为空！"); + RegTransitSample regTransitSample100 = new RegTransitSample(); + regTransitSample100.setBarcode(barcode); + regTransitSample100.setBackTime(backTime); + regTransitSample100.setBackUserCode(backUserCode); + regTransitSample100.setBackUserName(backUserName); + regTransitSample100.setStatus("100"); + regTransitSampleMapper.updateRegTransitSample(regTransitSample100); + break; } 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 79e682c..66d57b8 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 @@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil; import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.LabIntersendList; import com.transitPlatForm.common.core.domain.entity.SysLoginParam; +import com.transitPlatForm.common.core.domain.entity.SysUser; import com.transitPlatForm.common.core.domain.entity.reg.*; import com.transitPlatForm.common.utils.SecurityUtils; import com.transitPlatForm.common.utils.ip.IpUtils; @@ -165,7 +166,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample); if (regTransitSampleList.size() <= 0) return new Result("-1", "没有查到该标本的条码信息，请先保存数据！"); //修改打印状态 - applicationContext.getBean(RegRequestInfoServiceImpl.class).updatePrintStatus(applyId, barcode); + applicationContext.getBean(RegRequestInfoServiceImpl.class).updatePrintStatus(applyId, barcode,userName); } printBar(barcodeList1, userName); @@ -212,8 +213,6 @@ 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) { @@ -238,7 +237,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", hospitalBrly);//regApply.getPatType() 这里条码的病人来源，需要根据医院的需求修改 + reqSqdInfo.put("sample_PatType",regApply.getPatType());//regApply.getPatType() 这里条码的病人来源，需要根据医院的需求修改 reqSqdInfo.put("sample_RegNo", regApply.getRegNo()); reqSqdInfo.put("sample_PatName", regApply.getPatName()); reqSqdInfo.put("sample_PatSex", regApply.getPatSex()); @@ -469,17 +468,26 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { @Transactional(rollbackFor = Exception.class) - public void updatePrintStatus(String applyId, String barCode) { + public void updatePrintStatus(String applyId, String barCode,String userName) { //修改申请单状态 RegApply regApply = new RegApply(); regApply.setStatus("20"); regApply.setApplyid(applyId); regApplyMapper.update(regApply); + String nickName = ""; + SysUser sysUserOne = commonUtil.getSysUserOne(userName); + if(sysUserOne != null){ + nickName = sysUserOne.getNickName(); + } + //条码状态 RegTransitSample regTransitSample = new RegTransitSample(); regTransitSample.setStatus("20"); regTransitSample.setBarcode(barCode); + regTransitSample.setAffirmUserCode(userName); + regTransitSample.setAffirmUserName(nickName); + regTransitSample.setAffirmTime(commonUtil.getCurrentTime()); regTransitSampleMapper.updateRegTransitSample(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 2ec0346..2de4be9 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 @@ -86,50 +86,54 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { String dstHospCode = sampleSignVO.getDstHospCode(); String dstHospName = sampleSignVO.getDstHospName(); String backReasons = sampleSignVO.getBackReasons(); - Date affirmTime = sampleSignVO.getAffirmTime(); String affirmUserCode = sampleSignVO.getAffirmUserCode(); String affirmUserName = sampleSignVO.getAffirmUserName(); - Date sendPackTime = sampleSignVO.getSendPackTime(); String sendUserName = sampleSignVO.getSendUserName(); String sendUserCode = sampleSignVO.getSendUserCode(); + String backUserCode = sampleSignVO.getBackUserCode(); + String backUserName = sampleSignVO.getBackUserName(); List barcode = sampleSignVO.getBarcode(); for (int i = 0; i < barcode.size(); i++) { RegTransitSample regTransitSample = new RegTransitSample(); regTransitSample.setBarcode(barcode.get(i)); + List regTransitSampleList = regTransitSampleMapper.getRegTransitSample(regTransitSample); + if(regTransitSampleList.size() <= 0) return new Result("-1","没有找到条码信息！"); SysUser sysUserOne = commonUtil.getSysUserOne(userId); if(sysUserOne == null) return new Result("-1","未查询到员工信息！"); String nickName = sysUserOne.getNickName(); - String statusSample = regTransitSample.getStatus(); + String statusSample = regTransitSampleList.get(0).getStatus(); switch (status){ case "20": //标本采集 - if(affirmTime == null) return new Result("-1","affirmTime标本采集时间不能为空！"); + //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标本采集人姓名不能为空！"); - regTransitSample.setAffirmTime(affirmTime); + regTransitSample.setAffirmTime(commonUtil.getCurrentTime());//affirmTime regTransitSample.setAffirmUserCode(affirmUserCode); regTransitSample.setAffirmUserName(affirmUserName); case "30": //标本送检 if(dstHospName == null || dstHospName.equals("")) return new Result("-1","dstHospName不能为空！"); - if(sendPackTime == null) return new Result("-1","sendPackTime不能为空！"); if(sendUserName == null || sendUserName.equals("")) return new Result("-1","sendUserName不能为空！"); - if(statusSample.equals("30")) return new Result("0","该标本已经送检！"); + if(statusSample.equals("30")) return new Result("-1","该标本已经送检！"); + if(Integer.parseInt(backReasons) > 30) return new Result("-1","标本已经签收或者上机，不能再进行送检操作！"); regTransitSample.setDstHospCode(dstHospCode); regTransitSample.setDstHospName(dstHospName); - regTransitSample.setSendPackTime(sendPackTime); + regTransitSample.setSendPackTime(commonUtil.getCurrentTime()); // regTransitSample.setSendUserCode(sendUserCode); regTransitSample.setSendUserName(sendUserName); break; case "50": //标本签收 if(statusSample.equals("50")) return new Result("0","该标本已经签收！"); + if(Integer.parseInt(statusSample) > 50) return new Result("-1","该标本已经上机或者报告，不能再签收！"); regTransitSample.setSignInTime(commonUtil.getCurrentTime()); regTransitSample.setSignInUserCode(userId); regTransitSample.setSignInUserName(nickName); break; case "100": //标本退回 if(statusSample.equals("100")) return new Result("0","该标本已经退回！"); - regTransitSample.setBackUserCode(userId); - regTransitSample.setBackUserName(nickName); + if(Integer.parseInt(statusSample) < 50) return new Result("-1","该标本还未签收，不能退回！"); + regTransitSample.setBackUserCode(backUserCode); + regTransitSample.setBackUserName(backUserName); regTransitSample.setBackTime(commonUtil.getCurrentTime()); break; @@ -139,7 +143,7 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { regTransitSample.setUpdate_time(commonUtil.getCurrentTime()); regTransitSampleMapper.updateRegTransitSample(regTransitSample); } - return new Result("0","签收成功！"); + return new Result("0","操作成功！"); } /** diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml index 4d39083..0ec176d 100644 --- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml @@ -8,6 +8,7 @@ and PatId = #{patId} and PatName like '%'+#{brxm}+'%' and Status = #{status} + and SrcHospCode = #{SrcHospCode} order by OrderTime desc diff --git a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml index 673b6c5..554680c 100644 --- a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml @@ -5,23 +5,21 @@