From 6aee1423e77eef63e69de7247120ca5e2176e8d4 Mon Sep 17 00:00:00 2001 From: wtt Date: Wed, 10 Jun 2020 11:48:19 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/SieveApplyOrderModel.java | 11 ++-- .../com/lyms/platform/pojo/SieveResultModel.java | 10 ++++ .../lyms/platform/query/SieveApplyOrderQuery.java | 15 +++--- .../com/lyms/platform/query/SieveResultQuery.java | 14 +++++ .../operate/web/controller/SieveController.java | 6 +-- .../operate/web/facade/ApplyOrderFacade.java | 6 +-- .../platform/operate/web/facade/SieveFacade.java | 62 ++++++++++++---------- .../operate/web/request/SieveAddRequest.java | 12 +++-- .../web/request/SieveApplyOrderAddRequest.java | 12 ++--- .../platform/operate/web/worker/SieveWorker.java | 2 +- 10 files changed, 93 insertions(+), 57 deletions(-) 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 e2123b9..5619799 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,7 +48,8 @@ public class SieveApplyOrderModel extends BaseModel { //标本号 private String number; - private String redundancy; + //冗余lyms_sieve表id + private String lymsSieveId; //采集医生 private String collectionDoctorId; @@ -443,12 +444,12 @@ public class SieveApplyOrderModel extends BaseModel { PatientType = patientType; } - public String getRedundancy() { - return redundancy; + public String getLymsSieveId() { + return lymsSieveId; } - public void setRedundancy(String redundancy) { - this.redundancy = redundancy; + public void setLymsSieveId(String lymsSieveId) { + this.lymsSieveId = lymsSieveId; } public String getNf() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index b1147ea..fe2ddf0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -18,6 +18,8 @@ public class SieveResultModel{ private String id; private String parentId; + //冗余lyms_sieve表id + private String lymsSieveId; private String tszhz;// 唐氏综合症 private String sjgjx;// 神经管畸形 @@ -79,6 +81,14 @@ public class SieveResultModel{ */ private Integer printSize; + public String getLymsSieveId() { + return lymsSieveId; + } + + public void setLymsSieveId(String lymsSieveId) { + this.lymsSieveId = lymsSieveId; + } + public Boolean getHasReport() { return hasReport; } 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 f6e0d6d..229cbdf 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,14 +22,15 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ private String number; - private String redundancy; + //冗余lyms_sieve表id + private String lymsSieveId; - public String getRedundancy() { - return redundancy; + public String getLymsSieveId() { + return lymsSieveId; } - public void setRedundancy(String redundancy) { - this.redundancy = redundancy; + public void setLymsSieveId(String lymsSieveId) { + this.lymsSieveId = lymsSieveId; } //产筛医院 @@ -104,8 +105,8 @@ 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); + if(null!=lymsSieveId){ + condition= condition.and("lymsSieveId",lymsSieveId, MongoOper.IS); } return condition.toMongoQuery(); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java index 48ca899..a6bfc8c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java @@ -21,6 +21,9 @@ public class SieveResultQuery extends BaseQuery implements IConvertToNativeQuery private String id; //患者id private String parentId; + //冗余lyms_sieve表id + private String lymsSieveId; + private List parentIds; //姓名 private String name; @@ -66,6 +69,14 @@ public class SieveResultQuery extends BaseQuery implements IConvertToNativeQuery private Date resultTimeStart; private Date resultTimeEnd; + public String getLymsSieveId() { + return lymsSieveId; + } + + public void setLymsSieveId(String lymsSieveId) { + this.lymsSieveId = lymsSieveId; + } + public Date getResultTimeStart() { return resultTimeStart; } @@ -202,6 +213,9 @@ public class SieveResultQuery extends BaseQuery implements IConvertToNativeQuery if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + if (null != lymsSieveId) { + condition = condition.and("lymsSieveId", lymsSieveId, MongoOper.IS); + } if (null != name) { condition = condition.and("name", name, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 5daf381..415ef14 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -103,7 +103,7 @@ public class SieveController extends BaseController { *

* type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询 * - * @param id == cqsieves 列表中的id + * @param lymsSieveId == lyms_sieve表的id * @param parentId * @param request * @return @@ -111,9 +111,9 @@ public class SieveController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/getSieveApplyInfo", method = RequestMethod.GET) - public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String id, @RequestParam(required = true)Integer type, HttpServletRequest request) { + public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String lymsSieveId, @RequestParam(required = true)Integer type, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.getSieveApplyInfo(parentId, id,loginState.getId(), type); + return sieveFacade.getSieveApplyInfo(parentId, lymsSieveId,loginState.getId(), type); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 902e596..f4b4158 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -400,8 +400,8 @@ public class ApplyOrderFacade { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); - if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getRedundancy())){ - sieveQuery.setId(sieveApplyOrderAddRequest.getRedundancy()); + if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getLymsSieveId())){ + sieveQuery.setId(sieveApplyOrderAddRequest.getLymsSieveId()); } List sieveModels = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(sieveModels)) { @@ -507,7 +507,7 @@ public class ApplyOrderFacade { sieveApplyOrderModel1.setId(str.get("orderModelid").toString()); sieveApplyOrderModel1.setModified(new Date()); sieveApplyOrderModel1.setStatus(1); - sieveApplyOrderModel1.setRedundancy(str.get("sieveModelid").toString()); + sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString()); SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); sieveApplyOrderQuery2.setId(str.get("orderModelid").toString()); List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); 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 433eeea..9fea7d0 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 @@ -145,8 +145,8 @@ public class SieveFacade { public void addOrUpdateSieveModel(SieveAddRequest sieveAddRequest, Integer userId, SieveResultModel sieveResultModel) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(sieveAddRequest.getParentId()); - if(StringUtils.isNotEmpty(sieveAddRequest.getRedundancy())){ - sieveQuery.setId(sieveAddRequest.getRedundancy()); + if(StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())){ + sieveQuery.setId(sieveAddRequest.getLymsSieveId()); } sieveQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryList(sieveQuery); @@ -780,7 +780,7 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } - public BaseResponse getSieveApplyInfo(String parentId,String id, Integer userId, Integer type) { + public BaseResponse getSieveApplyInfo(String parentId,String lymsSieveId, Integer userId, Integer type) { Map map = new HashMap<>(); //String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -793,8 +793,8 @@ public class SieveFacade { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); - if(StringUtils.isNotEmpty(id)){ - sieveApplyOrderQuery1.setRedundancy(id);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个 + if(StringUtils.isNotEmpty(lymsSieveId)){ + sieveApplyOrderQuery1.setLymsSieveId(lymsSieveId);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个 } sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); @@ -817,6 +817,9 @@ public class SieveFacade { SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); sieveResultQuery.setYn(YnEnums.YES.getId()); + if(StringUtils.isNotEmpty(lymsSieveId)){ + sieveResultQuery.setLymsSieveId(lymsSieveId); + } List list = sieveService.queryListSieveResult(sieveResultQuery); if (CollectionUtils.isNotEmpty(list)) { SieveResultModel model = list.get(0); @@ -847,6 +850,7 @@ public class SieveFacade { } map.put("sieveResultEditInfo", sieveResultEditInfo); } else { + //1.2.1 查看申请单 List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); @@ -855,24 +859,27 @@ public class SieveFacade { SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); //iAssistantl数据传输格式说明,导出excel自动不足添加在此处 - result.put("PatientID", sieveApply.getPatientID()); - result.put("ApplicationNo", sieveApply.getApplicationNo()); - result.put("Smoking", sieveApply.getSmoking()); - result.put("Insulin", sieveApply.getInsulin()); - result.put("HC", sieveApply.getHC()); - result.put("MannualEntry", sieveApply.getMannualEntry()); - result.put("NT", sieveApply.getNT()); - result.put("ResponsibleCode", sieveApply.getResponsibleCode()); - result.put("T21", sieveApply.getT21()); - result.put("T18", sieveApply.getT18()); - result.put("NTD", sieveApply.getNTD()); - result.put("ARMethod", sieveApply.getARMethod()); - result.put("ExtractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate())); - result.put("TransferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate())); - result.put("DonorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate())); - result.put("NasalBone", sieveApply.getNasalBone()); - result.put("Monozygous", sieveApply.getMonozygous()); - result.put("PatientType", sieveApply.getPatientType()); + if(StringUtils.isNotEmpty(lymsSieveId)){ + result.put("lymsSieveId", lymsSieveId); + } + result.put("patientID", sieveApply.getPatientID()); + result.put("applicationNo", sieveApply.getApplicationNo()); + result.put("smoking", sieveApply.getSmoking()); + result.put("insulin", sieveApply.getInsulin()); + result.put("hC", sieveApply.getHC()); + result.put("mannualEntry", sieveApply.getMannualEntry()); + result.put("nT", sieveApply.getNT()); + result.put("responsibleCode", sieveApply.getResponsibleCode()); + result.put("t21", sieveApply.getT21()); + result.put("t18", sieveApply.getT18()); + result.put("nTD", sieveApply.getNTD()); + result.put("aRMethod", sieveApply.getARMethod()); + result.put("extractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate())); + result.put("transferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate())); + result.put("donorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate())); + result.put("nasalBone", sieveApply.getNasalBone()); + result.put("monozygous", sieveApply.getMonozygous()); + result.put("patientType", sieveApply.getPatientType()); result.put("id", sieveApply.getId()); @@ -935,9 +942,7 @@ public class SieveFacade { result.put("gxbzl", sieveApply.getGxbzl()); result.put("jzsInfo", sieveApply.getJzsInfo()); result.put("ypglx", sieveApply.getYpglx()); - if(StringUtils.isNotEmpty(id)){ - result.put("redundancy", id); - } + result.put("nf", sieveApply.getNf()); if (type == 1) { @@ -987,6 +992,9 @@ public class SieveFacade { SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setParentId(parentId); sieveResultQuery.setYn(YnEnums.YES.getId()); + if(StringUtils.isNotEmpty(lymsSieveId)){ + sieveResultQuery.setLymsSieveId(lymsSieveId); + } List list = sieveService.queryListSieveResult(sieveResultQuery); if (CollectionUtils.isNotEmpty(list)) { SieveResultModel sieveResultModel = list.get(0); @@ -998,11 +1006,11 @@ public class SieveFacade { sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); + sieveResultInfo.put("lymsSieveresultId", sieveResultModel.getId());//产筛结果id sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId()); sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); sieveResultInfo.put("hasReport", sieveResultModel.getHasReport()); - String tszhzValue = ""; if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index b752bf1..c279bad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -20,7 +20,8 @@ public class SieveAddRequest implements IBasicRequestConvert { private String id; private String parentId; - private String redundancy; + //冗余lyms_sieve表id + private String lymsSieveId; private String tszhz;// 唐氏综合症 21-三体 private String sjgjx;// 神经管畸形 NTD @@ -59,12 +60,12 @@ public class SieveAddRequest implements IBasicRequestConvert { private String reportType; - public String getRedundancy() { - return redundancy; + public String getLymsSieveId() { + return lymsSieveId; } - public void setRedundancy(String redundancy) { - this.redundancy = redundancy; + public void setLymsSieveId(String lymsSieveId) { + this.lymsSieveId = lymsSieveId; } public String getReportType() { @@ -254,6 +255,7 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setDzhpx(dzhpx); sieveModel.setCspj(cspj); sieveModel.setStzhz13(stzhz13); + sieveModel.setLymsSieveId(lymsSieveId); sieveModel.setPublishName(publishName); sieveModel.setResultTime(DateUtil.parseYMD(resultTime)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 57f5263..65c48f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -89,7 +89,7 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert> { sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId()); sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - sieveApplyOrderQuery.setRedundancy(sieveModel.getId()); + sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId()); //查询报告出具时间 SieveResultQuery sieveResultQuery = new SieveResultQuery(); -- 1.8.3.1