|
|
@@ -68,12 +68,7 @@ public class YiZhuLuRuServer {
|
|
|
private final SqlSessionFactory sqlSessionFactory;
|
|
|
private final SiChargeLimitService siChargeLimitService;
|
|
|
|
|
|
- /**
|
|
|
- * 转科的医嘱编码
|
|
|
- */
|
|
|
- private final String ZK_CODE = "06286";
|
|
|
private final String ITEM = "00";
|
|
|
- private final String 出院带药 = "007";
|
|
|
|
|
|
public ResultVo<String> getOrderNo() {
|
|
|
return ResultVoUtil.success(publicServer.getActOrderNo().stripTrailingZeros().toPlainString());
|
|
|
@@ -383,6 +378,7 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
|
|
|
if (checkData.getPassTheAudit()) {
|
|
|
+ String ZK_CODE = "06286"; //转科的医嘱编码
|
|
|
if (ZK_CODE.equals(data.getOrderCode())) {
|
|
|
ZyOrderZk transferData = new ZyOrderZk();
|
|
|
transferData
|
|
|
@@ -1230,6 +1226,7 @@ public class YiZhuLuRuServer {
|
|
|
*/
|
|
|
public ResultVo<Map<String, Object>> confirmTheDoctorSOrderWithMedicine(String patNo, Integer times) {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
+ String 出院带药 = "007";
|
|
|
qw.eq("a.inpatient_no", patNo)
|
|
|
.eq("a.admiss_times", times)
|
|
|
.eq("a.status_flag", "1")
|
|
|
@@ -1456,7 +1453,6 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
|
|
|
public QueryWrapper<?> getConfirmQueryWrapper(String patNo, Integer times) {
|
|
|
- // 排除出院带药的医嘱
|
|
|
return new QueryWrapper<>().eq("a.inpatient_no", patNo)
|
|
|
.eq("a.admiss_times", times)
|
|
|
.eq("a.status_flag", "1")
|
|
|
@@ -1475,7 +1471,10 @@ public class YiZhuLuRuServer {
|
|
|
return ResultVoUtil.success("OK");
|
|
|
}
|
|
|
|
|
|
- List<String> collect = orderCode.stream().filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
+ List<String> collect = orderCode
|
|
|
+ .stream()
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
|
if (collect.isEmpty()) {
|
|
|
return ResultVoUtil.success("OK");
|