jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6aee1423e77eef63e69de7247120ca5e2176e8d4

Authored by wtt
1 parent 440bab610b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 10 changed files with 93 additions and 57 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java View file @ 6aee142
... ... @@ -48,7 +48,8 @@
48 48 //标本号
49 49 private String number;
50 50  
51   - private String redundancy;
  51 + //冗余lyms_sieve表id
  52 + private String lymsSieveId;
52 53  
53 54 //采集医生
54 55 private String collectionDoctorId;
55 56  
... ... @@ -443,12 +444,12 @@
443 444 PatientType = patientType;
444 445 }
445 446  
446   - public String getRedundancy() {
447   - return redundancy;
  447 + public String getLymsSieveId() {
  448 + return lymsSieveId;
448 449 }
449 450  
450   - public void setRedundancy(String redundancy) {
451   - this.redundancy = redundancy;
  451 + public void setLymsSieveId(String lymsSieveId) {
  452 + this.lymsSieveId = lymsSieveId;
452 453 }
453 454  
454 455 public String getNf() {
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java View file @ 6aee142
... ... @@ -18,6 +18,8 @@
18 18  
19 19 private String id;
20 20 private String parentId;
  21 + //冗余lyms_sieve表id
  22 + private String lymsSieveId;
21 23  
22 24 private String tszhz;// 唐氏综合症
23 25 private String sjgjx;// 神经管畸形
... ... @@ -78,6 +80,14 @@
78 80 * 打印次数
79 81 */
80 82 private Integer printSize;
  83 +
  84 + public String getLymsSieveId() {
  85 + return lymsSieveId;
  86 + }
  87 +
  88 + public void setLymsSieveId(String lymsSieveId) {
  89 + this.lymsSieveId = lymsSieveId;
  90 + }
81 91  
82 92 public Boolean getHasReport() {
83 93 return hasReport;
platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java View file @ 6aee142
... ... @@ -22,14 +22,15 @@
22 22  
23 23 private String number;
24 24  
25   - private String redundancy;
  25 + //冗余lyms_sieve表id
  26 + private String lymsSieveId;
26 27  
27   - public String getRedundancy() {
28   - return redundancy;
  28 + public String getLymsSieveId() {
  29 + return lymsSieveId;
29 30 }
30 31  
31   - public void setRedundancy(String redundancy) {
32   - this.redundancy = redundancy;
  32 + public void setLymsSieveId(String lymsSieveId) {
  33 + this.lymsSieveId = lymsSieveId;
33 34 }
34 35  
35 36 //产筛医院
... ... @@ -104,8 +105,8 @@
104 105 if(null!=id){
105 106 condition= condition.and("id",id, MongoOper.IS);
106 107 }
107   - if(null!=redundancy){
108   - condition= condition.and("redundancy",redundancy, MongoOper.IS);
  108 + if(null!=lymsSieveId){
  109 + condition= condition.and("lymsSieveId",lymsSieveId, MongoOper.IS);
109 110 }
110 111  
111 112 return condition.toMongoQuery();
platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java View file @ 6aee142
... ... @@ -21,6 +21,9 @@
21 21 private String id;
22 22 //患者id
23 23 private String parentId;
  24 + //冗余lyms_sieve表id
  25 + private String lymsSieveId;
  26 +
24 27 private List<String> parentIds;
25 28 //姓名
26 29 private String name;
... ... @@ -66,6 +69,14 @@
66 69 private Date resultTimeStart;
67 70 private Date resultTimeEnd;
68 71  
  72 + public String getLymsSieveId() {
  73 + return lymsSieveId;
  74 + }
  75 +
  76 + public void setLymsSieveId(String lymsSieveId) {
  77 + this.lymsSieveId = lymsSieveId;
  78 + }
  79 +
69 80 public Date getResultTimeStart() {
70 81 return resultTimeStart;
71 82 }
... ... @@ -201,6 +212,9 @@
201 212  
202 213 if (null != parentId) {
203 214 condition = condition.and("parentId", parentId, MongoOper.IS);
  215 + }
  216 + if (null != lymsSieveId) {
  217 + condition = condition.and("lymsSieveId", lymsSieveId, MongoOper.IS);
204 218 }
205 219 if (null != name) {
206 220 condition = condition.and("name", name, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 6aee142
... ... @@ -103,7 +103,7 @@
103 103 * <p>
104 104 * type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询
105 105 *
106   - * @param id == cqsieves 列表中的id
  106 + * @param lymsSieveId == lyms_sieve表的id
107 107 * @param parentId
108 108 * @param request
109 109 * @return
110 110  
... ... @@ -111,9 +111,9 @@
111 111 @ResponseBody
112 112 @TokenRequired
113 113 @RequestMapping(value = "/getSieveApplyInfo", method = RequestMethod.GET)
114   - public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String id, @RequestParam(required = true)Integer type, HttpServletRequest request) {
  114 + public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String lymsSieveId, @RequestParam(required = true)Integer type, HttpServletRequest request) {
115 115 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
116   - return sieveFacade.getSieveApplyInfo(parentId, id,loginState.getId(), type);
  116 + return sieveFacade.getSieveApplyInfo(parentId, lymsSieveId,loginState.getId(), type);
117 117 }
118 118  
119 119  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 6aee142
... ... @@ -400,8 +400,8 @@
400 400 SieveQuery sieveQuery = new SieveQuery();
401 401 sieveQuery.setYn(YnEnums.YES.getId());
402 402 sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());
403   - if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getRedundancy())){
404   - sieveQuery.setId(sieveApplyOrderAddRequest.getRedundancy());
  403 + if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getLymsSieveId())){
  404 + sieveQuery.setId(sieveApplyOrderAddRequest.getLymsSieveId());
405 405 }
406 406 List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
407 407 if (CollectionUtils.isNotEmpty(sieveModels)) {
... ... @@ -507,7 +507,7 @@
507 507 sieveApplyOrderModel1.setId(str.get("orderModelid").toString());
508 508 sieveApplyOrderModel1.setModified(new Date());
509 509 sieveApplyOrderModel1.setStatus(1);
510   - sieveApplyOrderModel1.setRedundancy(str.get("sieveModelid").toString());
  510 + sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString());
511 511 SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
512 512 sieveApplyOrderQuery2.setId(str.get("orderModelid").toString());
513 513 List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 6aee142
... ... @@ -145,8 +145,8 @@
145 145 public void addOrUpdateSieveModel(SieveAddRequest sieveAddRequest, Integer userId, SieveResultModel sieveResultModel) {
146 146 SieveQuery sieveQuery = new SieveQuery();
147 147 sieveQuery.setParentId(sieveAddRequest.getParentId());
148   - if(StringUtils.isNotEmpty(sieveAddRequest.getRedundancy())){
149   - sieveQuery.setId(sieveAddRequest.getRedundancy());
  148 + if(StringUtils.isNotEmpty(sieveAddRequest.getLymsSieveId())){
  149 + sieveQuery.setId(sieveAddRequest.getLymsSieveId());
150 150 }
151 151 sieveQuery.setYn(YnEnums.YES.getId());
152 152 List<SieveModel> list = sieveService.queryList(sieveQuery);
... ... @@ -780,7 +780,7 @@
780 780 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
781 781 }
782 782  
783   - public BaseResponse getSieveApplyInfo(String parentId,String id, Integer userId, Integer type) {
  783 + public BaseResponse getSieveApplyInfo(String parentId,String lymsSieveId, Integer userId, Integer type) {
784 784  
785 785 Map<String, Object> map = new HashMap<>();
786 786 //String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -793,8 +793,8 @@
793 793  
794 794 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
795 795 sieveApplyOrderQuery1.setParentId(parentId);
796   - if(StringUtils.isNotEmpty(id)){
797   - sieveApplyOrderQuery1.setRedundancy(id);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个
  796 + if(StringUtils.isNotEmpty(lymsSieveId)){
  797 + sieveApplyOrderQuery1.setLymsSieveId(lymsSieveId);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个
798 798 }
799 799 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
800 800  
... ... @@ -817,6 +817,9 @@
817 817 SieveResultQuery sieveResultQuery = new SieveResultQuery();
818 818 sieveResultQuery.setParentId(parentId);
819 819 sieveResultQuery.setYn(YnEnums.YES.getId());
  820 + if(StringUtils.isNotEmpty(lymsSieveId)){
  821 + sieveResultQuery.setLymsSieveId(lymsSieveId);
  822 + }
820 823 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
821 824 if (CollectionUtils.isNotEmpty(list)) {
822 825 SieveResultModel model = list.get(0);
... ... @@ -847,6 +850,7 @@
847 850 }
848 851 map.put("sieveResultEditInfo", sieveResultEditInfo);
849 852 } else {
  853 + //1.2.1 查看申请单
850 854 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
851 855 if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
852 856 Map<String, Object> result = new HashMap<>();
... ... @@ -855,24 +859,27 @@
855 859 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
856 860  
857 861 //iAssistantl数据传输格式说明,导出excel自动不足添加在此处
858   - result.put("PatientID", sieveApply.getPatientID());
859   - result.put("ApplicationNo", sieveApply.getApplicationNo());
860   - result.put("Smoking", sieveApply.getSmoking());
861   - result.put("Insulin", sieveApply.getInsulin());
862   - result.put("HC", sieveApply.getHC());
863   - result.put("MannualEntry", sieveApply.getMannualEntry());
864   - result.put("NT", sieveApply.getNT());
865   - result.put("ResponsibleCode", sieveApply.getResponsibleCode());
866   - result.put("T21", sieveApply.getT21());
867   - result.put("T18", sieveApply.getT18());
868   - result.put("NTD", sieveApply.getNTD());
869   - result.put("ARMethod", sieveApply.getARMethod());
870   - result.put("ExtractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate()));
871   - result.put("TransferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate()));
872   - result.put("DonorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate()));
873   - result.put("NasalBone", sieveApply.getNasalBone());
874   - result.put("Monozygous", sieveApply.getMonozygous());
875   - result.put("PatientType", sieveApply.getPatientType());
  862 + if(StringUtils.isNotEmpty(lymsSieveId)){
  863 + result.put("lymsSieveId", lymsSieveId);
  864 + }
  865 + result.put("patientID", sieveApply.getPatientID());
  866 + result.put("applicationNo", sieveApply.getApplicationNo());
  867 + result.put("smoking", sieveApply.getSmoking());
  868 + result.put("insulin", sieveApply.getInsulin());
  869 + result.put("hC", sieveApply.getHC());
  870 + result.put("mannualEntry", sieveApply.getMannualEntry());
  871 + result.put("nT", sieveApply.getNT());
  872 + result.put("responsibleCode", sieveApply.getResponsibleCode());
  873 + result.put("t21", sieveApply.getT21());
  874 + result.put("t18", sieveApply.getT18());
  875 + result.put("nTD", sieveApply.getNTD());
  876 + result.put("aRMethod", sieveApply.getARMethod());
  877 + result.put("extractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate()));
  878 + result.put("transferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate()));
  879 + result.put("donorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate()));
  880 + result.put("nasalBone", sieveApply.getNasalBone());
  881 + result.put("monozygous", sieveApply.getMonozygous());
  882 + result.put("patientType", sieveApply.getPatientType());
876 883  
877 884  
878 885 result.put("id", sieveApply.getId());
... ... @@ -935,9 +942,7 @@
935 942 result.put("gxbzl", sieveApply.getGxbzl());
936 943 result.put("jzsInfo", sieveApply.getJzsInfo());
937 944 result.put("ypglx", sieveApply.getYpglx());
938   - if(StringUtils.isNotEmpty(id)){
939   - result.put("redundancy", id);
940   - }
  945 +
941 946 result.put("nf", sieveApply.getNf());
942 947  
943 948 if (type == 1) {
... ... @@ -987,6 +992,9 @@
987 992 SieveResultQuery sieveResultQuery = new SieveResultQuery();
988 993 sieveResultQuery.setParentId(parentId);
989 994 sieveResultQuery.setYn(YnEnums.YES.getId());
  995 + if(StringUtils.isNotEmpty(lymsSieveId)){
  996 + sieveResultQuery.setLymsSieveId(lymsSieveId);
  997 + }
990 998 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
991 999 if (CollectionUtils.isNotEmpty(list)) {
992 1000 SieveResultModel sieveResultModel = list.get(0);
993 1001  
... ... @@ -998,10 +1006,10 @@
998 1006 sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
999 1007 sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
1000 1008  
  1009 + sieveResultInfo.put("lymsSieveresultId", sieveResultModel.getId());//产筛结果id
1001 1010 sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId());
1002 1011 sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId());
1003 1012 sieveResultInfo.put("hasReport", sieveResultModel.getHasReport());
1004   -
1005 1013  
1006 1014 String tszhzValue = "";
1007 1015 if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java View file @ 6aee142
... ... @@ -20,7 +20,8 @@
20 20  
21 21 private String id;
22 22 private String parentId;
23   - private String redundancy;
  23 + //冗余lyms_sieve表id
  24 + private String lymsSieveId;
24 25  
25 26 private String tszhz;// 唐氏综合症 21-三体
26 27 private String sjgjx;// 神经管畸形 NTD
27 28  
... ... @@ -59,12 +60,12 @@
59 60  
60 61 private String reportType;
61 62  
62   - public String getRedundancy() {
63   - return redundancy;
  63 + public String getLymsSieveId() {
  64 + return lymsSieveId;
64 65 }
65 66  
66   - public void setRedundancy(String redundancy) {
67   - this.redundancy = redundancy;
  67 + public void setLymsSieveId(String lymsSieveId) {
  68 + this.lymsSieveId = lymsSieveId;
68 69 }
69 70  
70 71 public String getReportType() {
... ... @@ -254,6 +255,7 @@
254 255 sieveModel.setDzhpx(dzhpx);
255 256 sieveModel.setCspj(cspj);
256 257 sieveModel.setStzhz13(stzhz13);
  258 + sieveModel.setLymsSieveId(lymsSieveId);
257 259 sieveModel.setPublishName(publishName);
258 260 sieveModel.setResultTime(DateUtil.parseYMD(resultTime));
259 261  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java View file @ 6aee142
... ... @@ -89,7 +89,7 @@
89 89 private Integer couponType;
90 90  
91 91 //冗余lyms_sieve表id
92   - private String redundancy;
  92 + private String lymsSieveId;
93 93  
94 94 /**
95 95 * null/1 血清学筛查 2/无创基因筛查
96 96  
... ... @@ -455,12 +455,12 @@
455 455 this.ypglx = ypglx;
456 456 }
457 457  
458   - public String getRedundancy() {
459   - return redundancy;
  458 + public String getLymsSieveId() {
  459 + return lymsSieveId;
460 460 }
461 461  
462   - public void setRedundancy(String redundancy) {
463   - this.redundancy = redundancy;
  462 + public void setLymsSieveId(String lymsSieveId) {
  463 + this.lymsSieveId = lymsSieveId;
464 464 }
465 465  
466 466 @Override
... ... @@ -471,7 +471,7 @@
471 471 sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));
472 472 sieveApplyOrderModel.setCheckDate(checkDate == null ? sendTime : checkDate);
473 473 sieveApplyOrderModel.setGuide(guide);
474   - sieveApplyOrderModel.setRedundancy(redundancy);
  474 + sieveApplyOrderModel.setLymsSieveId(lymsSieveId);
475 475 sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime));
476 476  
477 477  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java View file @ 6aee142
... ... @@ -91,7 +91,7 @@
91 91 sieveApplyOrderQuery.setParentId(sieveModel.getParentId());
92 92 sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId());
93 93 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
94   - sieveApplyOrderQuery.setRedundancy(sieveModel.getId());
  94 + sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId());
95 95  
96 96 //查询报告出具时间
97 97 SieveResultQuery sieveResultQuery = new SieveResultQuery();