diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 7788ae2..12b8bee 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -48,6 +48,8 @@ public class SieveApplyOrderModel extends BaseModel { //标本号 private String number; + private String redundancy; + //采集医生 private String collectionDoctorId; @@ -252,6 +254,14 @@ public class SieveApplyOrderModel extends BaseModel { */ private boolean huaDaPushResult; + public String getRedundancy() { + return redundancy; + } + + public void setRedundancy(String redundancy) { + this.redundancy = redundancy; + } + public String getNf() { return nf; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java index 0cc9366..f6e0d6d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java @@ -22,6 +22,16 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ private String number; + private String redundancy; + + public String getRedundancy() { + return redundancy; + } + + public void setRedundancy(String redundancy) { + this.redundancy = redundancy; + } + //产筛医院 private String sieveHospitalId; @@ -94,6 +104,9 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ if(null!=id){ condition= condition.and("id",id, MongoOper.IS); } + if(null!=redundancy){ + condition= condition.and("redundancy",redundancy, MongoOper.IS); + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 28dbf1b..066a771 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -721,7 +721,9 @@ public class SieveFacade { PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != pat) { - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + /* + 20200608 产筛修改 wtt ,去掉已申请过产筛限制,可以多次申请产筛 + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(pat.getId()); sieveApplyOrderQuery1.setHospitalId(hospitalId); sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); @@ -729,7 +731,7 @@ public class SieveFacade { List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isNotEmpty(list)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛!"); - } + }*/ patientBaseResult.convert(pat); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java index 537e0a7..ebbe929 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java @@ -91,6 +91,7 @@ public class SieveWorker implements Callable> { sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setRedundancy(sieveModel.getId()); //查询报告出具时间 SieveResultQuery sieveResultQuery = new SieveResultQuery(); @@ -103,6 +104,15 @@ public class SieveWorker implements Callable> { sieveListResult.setExportTime(DateUtil.getyyyy_MM_dd(resultModel.getResultTime())); } List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + if(CollectionUtils.isEmpty(applyOrderModels)){ + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setSort("created descc"); + sieveApplyOrderQuery1.setParentId(sieveModel.getParentId()); + sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId()); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + } + //采血日期 Date collectionDate = null; if (CollectionUtils.isNotEmpty(applyOrderModels)) {