jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0c5e55f2fbdf6fad4e65f4e50943869b1a330321

Authored by liquanyu
1 parent 139a333cf2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

两癌筛查

Showing 5 changed files with 129 additions and 674 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 0c5e55f
... ... @@ -26,7 +26,7 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   - String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4", key);
  29 + String json = aesDecrypt("", key);
30 30 System.out.println("解密后：" + json);
31 31  
32 32 }
... ... @@ -161,7 +161,7 @@
161 161 cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(kgen.generateKey().getEncoded(), "AES"));
162 162 byte[] decryptBytes = cipher.doFinal(encryptBytes);
163 163  
164   - return new String(decryptBytes);
  164 + return new String(decryptBytes,"utf-8");
165 165 }
166 166  
167 167 /**
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java View file @ 0c5e55f
... ... @@ -9,7 +9,10 @@
9 9 import com.lyms.platform.common.base.IConvertToNativeQuery;
10 10 import com.lyms.platform.common.dao.BaseQuery;
11 11 import com.lyms.platform.common.dao.operator.MongoCondition;
  12 +import com.lyms.platform.common.dao.operator.MongoOper;
12 13 import com.lyms.platform.common.dao.operator.MongoQuery;
  14 +import com.lyms.platform.common.utils.StringUtils;
  15 +import org.springframework.data.mongodb.core.query.Criteria;
13 16  
14 17 import java.util.Date;
15 18 import java.util.Map;
... ... @@ -18,6 +21,8 @@
18 21 * 两癌筛查
19 22 */
20 23 public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQuery {
  24 +
  25 + private String id;
21 26 //妇女档案id
22 27 private String residentId;
23 28 //姓名
24 29  
... ... @@ -46,145 +51,16 @@
46 51 private String number;
47 52 //查询号
48 53 private String queryNo;
49   - //(一）病史情况
50   - //月经情况
51   - //月经初潮年龄(岁)
52   - private String bsYjage;
53   - //最近一次末次月经
54   - private String bsZjyj;
55   - //绝经(1.否2.是3.不确定)
56   - private String bsJj;
57   - //绝经年龄(岁)
58   - private String bsJjage;
59   - //孕产史
60   - //孕次(次)
61   - private String ycYc;
62   - //产次(次)
63   - private String ycCc;
64   - //初产年龄(岁)
65   - private String ycAge;
66   - //哺乳史（1、6个月以上、2-6个月以下）
67   - private String ycFrs;
68   - //是否接受过乳腺癌检査
69   - private Map<String,String> ycRxajc;
70   - //既往史
71   - //乳腺手术或活检史
72   - private Map<String,String> jwsRxss;
73   - //激素替代治疗史
74   - private Map<String,String> jwsJstd;
75   - //家族史病史
76   - //乳腺癌
77   - private Map<String,String> jzsRxa;
78   - //卵巢癌
79   - private Map<String,String> jzsLca;
80   - //(二）乳腺临床检査
81   - //皮肤左
82   - private Map<String,String> rxlPfz;
83   - //皮肤右
84   - private Map<String,String> rxlPfy;
85   - //乳头左
86   - private Map<String,String> rxlRtz;
87   - //乳头右
88   - private Map<String,String> rxlRty;
89   - //溢液左
90   - private Map<String,String> rxlYyz;
91   - //溢液右
92   - private Map<String,String> rxlYyy;
93   - //肿块左
94   - private Map<String,String> rxlZkz;
95   - //肿块右
96   - private Map<String,String> rxlZky;
97   - //大小左
98   - private Map<String,String> rxlDxz;
99   - //大小右
100   - private Map<String,String> rxlDxy;
101   - //形状左
102   - private Map<String,String> rxlXzz;
103   - //形状右
104   - private Map<String,String> rxlXzy;
105   - //硬度左
106   - private Map<String,String> rxlYdz;
107   - //硬度右
108   - private Map<String,String> rxlYdy;
109   - //边缘左
110   - private Map<String,String> rxlByz;
111   - //边缘右
112   - private Map<String,String> rxlByy;
113   - //表面左
114   - private Map<String,String> rxlBmz;
115   - //表面右
116   - private Map<String,String> rxlBmy;
117   - //活动度左
118   - private Map<String,String> rxlHddz;
119   - //活动度右
120   - private Map<String,String> rxlHddy;
121   - //副乳1.无2.有
122   - private String rxlFr;
123   - //腋淋巴结左
124   - private Map<String,String> rxlYlbz;
125   - //腋淋巴结右
126   - private Map<String,String> rxlYlby;
127   - //锁骨上淋巴结左
128   - private Map<String,String> rxlSglbz;
129   - //锁骨上淋巴结右
130   - private Map<String,String> rxlSglby;
131   - //临床检査结果
132   - private Map<String,String> rxlJcjg;
133   - //(三）乳腺彩色超声检査
134   - //超声所见
135   - private String rxCssj;
136   - //分类左
137   - private Map<String,String> rxFlz;
138   - //分类右
139   - private Map<String,String> rxlFly;
140   - //建议
141   - private Map<String,String> rxlJy;
142   - //检查机构
143   - private String rxlJcdw;
144   - //检査人员
145   - private String rxlJcry;
146   - //检査日期
147   - private Date rxlJcrq;
148   - //(四〉乳腺X线检査（未作X线检査不填写此项）
149   - //乳腺X线评估左
150   - private Map<String,String> rxPgz;
151   - //乳腺X线评估右
152   - private Map<String,String> rxlPgy;
153   - //建议
154   - private Map<String,String> rxJy;
155   - //(五〉最终随访结果
156   - //随访情况
157   - private String sfQk;
158   - //病理检査
159   - private String sfBljc;
160   - //病理检査机构
161   - private String sfBljg;
162   - //病理诊断者
163   - private String sfBlzd;
164   - //病理检査日期
165   - private Date sfJcrq;
166   - //最后诊断
167   - private Map<String,String> sfZhzd;
168   - //TNM分期
169   - private Map<String,String> sfTnm;
170   - //诊治机构
171   - private String sfZzjg;
172   - //诊治日期
173   - private Date sfZlrq;
174   - //接受治疗情况
175   - private String sfJszl;
176   - //检査机构
177   - private String sfJcjg;
178   - //检查人员
179   - private String sfJcry;
180   - //检査日期
181   - private Date sfJcsj;
  54 +
182 55 /**
183 56 * 是否有效
184 57 */
185 58 private Integer yn;
186 59 private Date modified;
187   - private Date created;
  60 +
  61 + private Date createdStart;
  62 +
  63 + private Date createdEnd;
188 64 //操作人
189 65 private Integer operator;
190 66 //医院ID
191 67  
192 68  
193 69  
194 70  
195 71  
196 72  
197 73  
198 74  
199 75  
... ... @@ -198,57 +74,73 @@
198 74  
199 75 MongoCondition condition = MongoCondition.newInstance();
200 76  
201   - return condition.toMongoQuery();
202   - }
  77 + if(null != id){
  78 + condition=condition.and("id", id, MongoOper.IS);
  79 + }
  80 + if(null != yn){
  81 + condition=condition.and("yn", yn, MongoOper.IS);
  82 + }
  83 + if(null != provinceId){
  84 + condition=condition.and("provinceId", provinceId, MongoOper.IS);
  85 + }
  86 + if(null != cityId){
  87 + condition=condition.and("cityId", cityId, MongoOper.IS);
  88 + }
  89 + if(null != areaId){
  90 + condition=condition.and("areaId", areaId, MongoOper.IS);
  91 + }
  92 + if(null != streetId){
  93 + condition=condition.and("streetId", streetId, MongoOper.IS);
  94 + }
  95 + if(null != queryNo){
  96 + condition=condition.and("queryNo", queryNo, MongoOper.IS);
  97 + }
  98 + if(null != hospitalId){
  99 + condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
  100 + }
203 101  
204   - public String getHospitalId() {
205   - return hospitalId;
206   - }
  102 + if(null != residentId){
  103 + condition=condition.and("residentId", residentId, MongoOper.IS);
  104 + }
207 105  
208   - public void setHospitalId(String hospitalId) {
209   - this.hospitalId = hospitalId;
210   - }
  106 + Criteria c = null;
211 107  
212   - public String getQueryNo() {
213   - return queryNo;
214   - }
  108 + if (null != createdStart && createdEnd != null) {
  109 + if (null != c) {
  110 + c = c.where("created").gte(createdStart).lte(createdEnd);
  111 + } else {
  112 + c = Criteria.where("created").gte(createdStart).lte(createdEnd);
  113 + }
  114 + }
215 115  
216   - public void setQueryNo(String queryNo) {
217   - this.queryNo = queryNo;
218   - }
  116 + if (StringUtils.isNotEmpty(queryNo)) {
  117 + MongoCondition c1 = MongoCondition.newInstance();
  118 + MongoCondition con1 = MongoCondition.newInstance("uname", queryNo, MongoOper.LIKE);
  119 + MongoCondition con2 = MongoCondition.newInstance("certificateNum", queryNo, MongoOper.IS);
  120 + MongoCondition con3 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  121 + if (c != null) {
  122 + c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
  123 + condition.andCondition(c1);
  124 + } else {
  125 + c = c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
  126 + }
  127 + }
219 128  
220   - public Integer getYn() {
221   - return yn;
222   - }
  129 + if (null != c) {
  130 + condition = condition.andCondition(new MongoCondition(c));
  131 + }
223 132  
224   - public void setYn(Integer yn) {
225   - this.yn = yn;
  133 + return condition.toMongoQuery();
226 134 }
227 135  
228   - public Date getModified() {
229   - return modified;
  136 + public String getId() {
  137 + return id;
230 138 }
231 139  
232   - public void setModified(Date modified) {
233   - this.modified = modified;
  140 + public void setId(String id) {
  141 + this.id = id;
234 142 }
235 143  
236   - public Date getCreated() {
237   - return created;
238   - }
239   -
240   - public void setCreated(Date created) {
241   - this.created = created;
242   - }
243   -
244   - public Integer getOperator() {
245   - return operator;
246   - }
247   -
248   - public void setOperator(Integer operator) {
249   - this.operator = operator;
250   - }
251   -
252 144 public String getResidentId() {
253 145 return residentId;
254 146 }
255 147  
256 148  
257 149  
258 150  
259 151  
260 152  
261 153  
262 154  
263 155  
264 156  
265 157  
266 158  
267 159  
... ... @@ -353,500 +245,60 @@
353 245 this.number = number;
354 246 }
355 247  
356   - public String getBsYjage() {
357   - return bsYjage;
  248 + public String getQueryNo() {
  249 + return queryNo;
358 250 }
359 251  
360   - public void setBsYjage(String bsYjage) {
361   - this.bsYjage = bsYjage;
  252 + public void setQueryNo(String queryNo) {
  253 + this.queryNo = queryNo;
362 254 }
363 255  
364   - public String getBsZjyj() {
365   - return bsZjyj;
  256 + public Integer getYn() {
  257 + return yn;
366 258 }
367 259  
368   - public void setBsZjyj(String bsZjyj) {
369   - this.bsZjyj = bsZjyj;
  260 + public void setYn(Integer yn) {
  261 + this.yn = yn;
370 262 }
371 263  
372   - public String getBsJj() {
373   - return bsJj;
  264 + public Date getModified() {
  265 + return modified;
374 266 }
375 267  
376   - public void setBsJj(String bsJj) {
377   - this.bsJj = bsJj;
  268 + public void setModified(Date modified) {
  269 + this.modified = modified;
378 270 }
379 271  
380   - public String getBsJjage() {
381   - return bsJjage;
  272 + public Date getCreatedStart() {
  273 + return createdStart;
382 274 }
383 275  
384   - public void setBsJjage(String bsJjage) {
385   - this.bsJjage = bsJjage;
  276 + public void setCreatedStart(Date createdStart) {
  277 + this.createdStart = createdStart;
386 278 }
387 279  
388   - public String getYcYc() {
389   - return ycYc;
  280 + public Date getCreatedEnd() {
  281 + return createdEnd;
390 282 }
391 283  
392   - public void setYcYc(String ycYc) {
393   - this.ycYc = ycYc;
  284 + public void setCreatedEnd(Date createdEnd) {
  285 + this.createdEnd = createdEnd;
394 286 }
395 287  
396   - public String getYcCc() {
397   - return ycCc;
  288 + public Integer getOperator() {
  289 + return operator;
398 290 }
399 291  
400   - public void setYcCc(String ycCc) {
401   - this.ycCc = ycCc;
  292 + public void setOperator(Integer operator) {
  293 + this.operator = operator;
402 294 }
403 295  
404   - public String getYcAge() {
405   - return ycAge;
  296 + public String getHospitalId() {
  297 + return hospitalId;
406 298 }
407 299  
408   - public void setYcAge(String ycAge) {
409   - this.ycAge = ycAge;
410   - }
411   -
412   - public String getYcFrs() {
413   - return ycFrs;
414   - }
415   -
416   - public void setYcFrs(String ycFrs) {
417   - this.ycFrs = ycFrs;
418   - }
419   -
420   - public Map<String, String> getYcRxajc() {
421   - return ycRxajc;
422   - }
423   -
424   - public void setYcRxajc(Map<String, String> ycRxajc) {
425   - this.ycRxajc = ycRxajc;
426   - }
427   -
428   - public Map<String, String> getJwsRxss() {
429   - return jwsRxss;
430   - }
431   -
432   - public void setJwsRxss(Map<String, String> jwsRxss) {
433   - this.jwsRxss = jwsRxss;
434   - }
435   -
436   - public Map<String, String> getJwsJstd() {
437   - return jwsJstd;
438   - }
439   -
440   - public void setJwsJstd(Map<String, String> jwsJstd) {
441   - this.jwsJstd = jwsJstd;
442   - }
443   -
444   - public Map<String, String> getJzsRxa() {
445   - return jzsRxa;
446   - }
447   -
448   - public void setJzsRxa(Map<String, String> jzsRxa) {
449   - this.jzsRxa = jzsRxa;
450   - }
451   -
452   - public Map<String, String> getJzsLca() {
453   - return jzsLca;
454   - }
455   -
456   - public void setJzsLca(Map<String, String> jzsLca) {
457   - this.jzsLca = jzsLca;
458   - }
459   -
460   - public Map<String, String> getRxlPfz() {
461   - return rxlPfz;
462   - }
463   -
464   - public void setRxlPfz(Map<String, String> rxlPfz) {
465   - this.rxlPfz = rxlPfz;
466   - }
467   -
468   - public Map<String, String> getRxlPfy() {
469   - return rxlPfy;
470   - }
471   -
472   - public void setRxlPfy(Map<String, String> rxlPfy) {
473   - this.rxlPfy = rxlPfy;
474   - }
475   -
476   - public Map<String, String> getRxlRtz() {
477   - return rxlRtz;
478   - }
479   -
480   - public void setRxlRtz(Map<String, String> rxlRtz) {
481   - this.rxlRtz = rxlRtz;
482   - }
483   -
484   - public Map<String, String> getRxlRty() {
485   - return rxlRty;
486   - }
487   -
488   - public void setRxlRty(Map<String, String> rxlRty) {
489   - this.rxlRty = rxlRty;
490   - }
491   -
492   - public Map<String, String> getRxlYyz() {
493   - return rxlYyz;
494   - }
495   -
496   - public void setRxlYyz(Map<String, String> rxlYyz) {
497   - this.rxlYyz = rxlYyz;
498   - }
499   -
500   - public Map<String, String> getRxlYyy() {
501   - return rxlYyy;
502   - }
503   -
504   - public void setRxlYyy(Map<String, String> rxlYyy) {
505   - this.rxlYyy = rxlYyy;
506   - }
507   -
508   - public Map<String, String> getRxlZkz() {
509   - return rxlZkz;
510   - }
511   -
512   - public void setRxlZkz(Map<String, String> rxlZkz) {
513   - this.rxlZkz = rxlZkz;
514   - }
515   -
516   - public Map<String, String> getRxlZky() {
517   - return rxlZky;
518   - }
519   -
520   - public void setRxlZky(Map<String, String> rxlZky) {
521   - this.rxlZky = rxlZky;
522   - }
523   -
524   - public Map<String, String> getRxlDxz() {
525   - return rxlDxz;
526   - }
527   -
528   - public void setRxlDxz(Map<String, String> rxlDxz) {
529   - this.rxlDxz = rxlDxz;
530   - }
531   -
532   - public Map<String, String> getRxlDxy() {
533   - return rxlDxy;
534   - }
535   -
536   - public void setRxlDxy(Map<String, String> rxlDxy) {
537   - this.rxlDxy = rxlDxy;
538   - }
539   -
540   - public Map<String, String> getRxlXzz() {
541   - return rxlXzz;
542   - }
543   -
544   - public void setRxlXzz(Map<String, String> rxlXzz) {
545   - this.rxlXzz = rxlXzz;
546   - }
547   -
548   - public Map<String, String> getRxlXzy() {
549   - return rxlXzy;
550   - }
551   -
552   - public void setRxlXzy(Map<String, String> rxlXzy) {
553   - this.rxlXzy = rxlXzy;
554   - }
555   -
556   - public Map<String, String> getRxlYdz() {
557   - return rxlYdz;
558   - }
559   -
560   - public void setRxlYdz(Map<String, String> rxlYdz) {
561   - this.rxlYdz = rxlYdz;
562   - }
563   -
564   - public Map<String, String> getRxlYdy() {
565   - return rxlYdy;
566   - }
567   -
568   - public void setRxlYdy(Map<String, String> rxlYdy) {
569   - this.rxlYdy = rxlYdy;
570   - }
571   -
572   - public Map<String, String> getRxlByz() {
573   - return rxlByz;
574   - }
575   -
576   - public void setRxlByz(Map<String, String> rxlByz) {
577   - this.rxlByz = rxlByz;
578   - }
579   -
580   - public Map<String, String> getRxlByy() {
581   - return rxlByy;
582   - }
583   -
584   - public void setRxlByy(Map<String, String> rxlByy) {
585   - this.rxlByy = rxlByy;
586   - }
587   -
588   - public Map<String, String> getRxlBmz() {
589   - return rxlBmz;
590   - }
591   -
592   - public void setRxlBmz(Map<String, String> rxlBmz) {
593   - this.rxlBmz = rxlBmz;
594   - }
595   -
596   - public Map<String, String> getRxlBmy() {
597   - return rxlBmy;
598   - }
599   -
600   - public void setRxlBmy(Map<String, String> rxlBmy) {
601   - this.rxlBmy = rxlBmy;
602   - }
603   -
604   - public Map<String, String> getRxlHddz() {
605   - return rxlHddz;
606   - }
607   -
608   - public void setRxlHddz(Map<String, String> rxlHddz) {
609   - this.rxlHddz = rxlHddz;
610   - }
611   -
612   - public Map<String, String> getRxlHddy() {
613   - return rxlHddy;
614   - }
615   -
616   - public void setRxlHddy(Map<String, String> rxlHddy) {
617   - this.rxlHddy = rxlHddy;
618   - }
619   -
620   - public String getRxlFr() {
621   - return rxlFr;
622   - }
623   -
624   - public void setRxlFr(String rxlFr) {
625   - this.rxlFr = rxlFr;
626   - }
627   -
628   - public Map<String, String> getRxlYlbz() {
629   - return rxlYlbz;
630   - }
631   -
632   - public void setRxlYlbz(Map<String, String> rxlYlbz) {
633   - this.rxlYlbz = rxlYlbz;
634   - }
635   -
636   - public Map<String, String> getRxlYlby() {
637   - return rxlYlby;
638   - }
639   -
640   - public void setRxlYlby(Map<String, String> rxlYlby) {
641   - this.rxlYlby = rxlYlby;
642   - }
643   -
644   - public Map<String, String> getRxlSglbz() {
645   - return rxlSglbz;
646   - }
647   -
648   - public void setRxlSglbz(Map<String, String> rxlSglbz) {
649   - this.rxlSglbz = rxlSglbz;
650   - }
651   -
652   - public Map<String, String> getRxlSglby() {
653   - return rxlSglby;
654   - }
655   -
656   - public void setRxlSglby(Map<String, String> rxlSglby) {
657   - this.rxlSglby = rxlSglby;
658   - }
659   -
660   - public Map<String, String> getRxlJcjg() {
661   - return rxlJcjg;
662   - }
663   -
664   - public void setRxlJcjg(Map<String, String> rxlJcjg) {
665   - this.rxlJcjg = rxlJcjg;
666   - }
667   -
668   - public String getRxCssj() {
669   - return rxCssj;
670   - }
671   -
672   - public void setRxCssj(String rxCssj) {
673   - this.rxCssj = rxCssj;
674   - }
675   -
676   - public Map<String, String> getRxFlz() {
677   - return rxFlz;
678   - }
679   -
680   - public void setRxFlz(Map<String, String> rxFlz) {
681   - this.rxFlz = rxFlz;
682   - }
683   -
684   - public Map<String, String> getRxlFly() {
685   - return rxlFly;
686   - }
687   -
688   - public void setRxlFly(Map<String, String> rxlFly) {
689   - this.rxlFly = rxlFly;
690   - }
691   -
692   - public Map<String, String> getRxlJy() {
693   - return rxlJy;
694   - }
695   -
696   - public void setRxlJy(Map<String, String> rxlJy) {
697   - this.rxlJy = rxlJy;
698   - }
699   -
700   - public void setRxJy(Map<String, String> rxJy) {
701   - this.rxJy = rxJy;
702   - }
703   -
704   - public String getRxlJcdw() {
705   - return rxlJcdw;
706   - }
707   -
708   - public void setRxlJcdw(String rxlJcdw) {
709   - this.rxlJcdw = rxlJcdw;
710   - }
711   -
712   - public String getRxlJcry() {
713   - return rxlJcry;
714   - }
715   -
716   - public void setRxlJcry(String rxlJcry) {
717   - this.rxlJcry = rxlJcry;
718   - }
719   -
720   - public Date getRxlJcrq() {
721   - return rxlJcrq;
722   - }
723   -
724   - public void setRxlJcrq(Date rxlJcrq) {
725   - this.rxlJcrq = rxlJcrq;
726   - }
727   -
728   - public Map<String, String> getRxPgz() {
729   - return rxPgz;
730   - }
731   -
732   - public void setRxPgz(Map<String, String> rxPgz) {
733   - this.rxPgz = rxPgz;
734   - }
735   -
736   - public Map<String, String> getRxlPgy() {
737   - return rxlPgy;
738   - }
739   -
740   - public void setRxlPgy(Map<String, String> rxlPgy) {
741   - this.rxlPgy = rxlPgy;
742   - }
743   -
744   - public Map<String, String> getRxJy() {
745   - return rxJy;
746   - }
747   -
748   - public String getSfQk() {
749   - return sfQk;
750   - }
751   -
752   - public void setSfQk(String sfQk) {
753   - this.sfQk = sfQk;
754   - }
755   -
756   - public String getSfBljc() {
757   - return sfBljc;
758   - }
759   -
760   - public void setSfBljc(String sfBljc) {
761   - this.sfBljc = sfBljc;
762   - }
763   -
764   - public String getSfBljg() {
765   - return sfBljg;
766   - }
767   -
768   - public void setSfBljg(String sfBljg) {
769   - this.sfBljg = sfBljg;
770   - }
771   -
772   - public String getSfBlzd() {
773   - return sfBlzd;
774   - }
775   -
776   - public void setSfBlzd(String sfBlzd) {
777   - this.sfBlzd = sfBlzd;
778   - }
779   -
780   - public Date getSfJcrq() {
781   - return sfJcrq;
782   - }
783   -
784   - public void setSfJcrq(Date sfJcrq) {
785   - this.sfJcrq = sfJcrq;
786   - }
787   -
788   - public Map<String, String> getSfZhzd() {
789   - return sfZhzd;
790   - }
791   -
792   - public void setSfZhzd(Map<String, String> sfZhzd) {
793   - this.sfZhzd = sfZhzd;
794   - }
795   -
796   - public Map<String, String> getSfTnm() {
797   - return sfTnm;
798   - }
799   -
800   - public void setSfTnm(Map<String, String> sfTnm) {
801   - this.sfTnm = sfTnm;
802   - }
803   -
804   - public String getSfZzjg() {
805   - return sfZzjg;
806   - }
807   -
808   - public void setSfZzjg(String sfZzjg) {
809   - this.sfZzjg = sfZzjg;
810   - }
811   -
812   - public Date getSfZlrq() {
813   - return sfZlrq;
814   - }
815   -
816   - public void setSfZlrq(Date sfZlrq) {
817   - this.sfZlrq = sfZlrq;
818   - }
819   -
820   - public String getSfJszl() {
821   - return sfJszl;
822   - }
823   -
824   - public void setSfJszl(String sfJszl) {
825   - this.sfJszl = sfJszl;
826   - }
827   -
828   - public String getSfJcjg() {
829   - return sfJcjg;
830   - }
831   -
832   - public void setSfJcjg(String sfJcjg) {
833   - this.sfJcjg = sfJcjg;
834   - }
835   -
836   - public String getSfJcry() {
837   - return sfJcry;
838   - }
839   -
840   - public void setSfJcry(String sfJcry) {
841   - this.sfJcry = sfJcry;
842   - }
843   -
844   - public Date getSfJcsj() {
845   - return sfJcsj;
846   - }
847   -
848   - public void setSfJcsj(Date sfJcsj) {
849   - this.sfJcsj = sfJcsj;
  300 + public void setHospitalId(String hospitalId) {
  301 + this.hospitalId = hospitalId;
850 302 }
851 303 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java View file @ 0c5e55f
... ... @@ -28,7 +28,7 @@
28 28 /**
29 29 * 查询两癌筛查妇女基本信息
30 30 * @param cardNo
31   - * @param vaCardNo
  31 + * @param vcCardNo
32 32 * @return
33 33 */
34 34 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 0c5e55f
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.enums.SexEnum;
8 8 import com.lyms.platform.common.enums.YnEnums;
  9 +import com.lyms.platform.common.result.BaseListResponse;
9 10 import com.lyms.platform.common.result.BaseObjectResponse;
10 11 import com.lyms.platform.common.result.BaseResponse;
11 12 import com.lyms.platform.common.utils.DateUtil;
12 13  
13 14  
14 15  
15 16  
16 17  
17 18  
... ... @@ -67,24 +68,37 @@
67 68 if (hospitalId != null) {
68 69 query.setHospitalId(hospitalId);
69 70 }
  71 + if (StringUtils.isNotEmpty(queryRequest.getCheckDate()))
  72 + {
  73 +
  74 + }
70 75 query.setProvinceId(queryRequest.getProvinceId());
71 76 query.setCityId(queryRequest.getCityId());
72 77 query.setAreaId(queryRequest.getAreaId());
73 78  
  79 + List list = new ArrayList();
74 80 List<CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
75 81 if (CollectionUtils.isNotEmpty(modelList)) {
76 82 for (CancerScreeningModel model : modelList) {
77 83 Map<String, Object> map = new HashMap<>();
78 84 map.put("id", model.getId());
  85 + map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
79 86 map.put("name", model.getUsername());
80   - map.put("cardNum", FunvCommonUtil.getId(model.getCertificateNum()));
81   - map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
  87 + map.put("sex", "女");
  88 +// map.put("cardNum", FunvCommonUtil.getId(model.getCertificateNum()));
  89 +// map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
  90 +
  91 + map.put("cardNum", model.getCertificateNum());
  92 + map.put("phone", model.getPhone());
  93 +
82 94 map.put("age", DateUtil.getAge(model.getBirthday()));
83   - map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
  95 + map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
84 96 map.put("sfZhzd",model.getSfZhzd());
  97 + map.put("sfJcry",model.getSfJcry());
  98 + list.add(map);
85 99 }
86 100 }
87   - return new BaseResponse();
  101 + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo());
88 102 }
89 103  
90 104 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java View file @ 0c5e55f
... ... @@ -10,12 +10,9 @@
10 10 /**
11 11 * 检查时间
12 12 */
13   - private Integer checkDateStart;
  13 + private String checkDate;
  14 +
14 15 /**
15   - * 检查时间
16   - */
17   - private Integer checkDateEnd;
18   - /**
19 16 * 查询号
20 17 */
21 18 private String queryNo;
22 19  
... ... @@ -66,28 +63,20 @@
66 63 this.address = address;
67 64 }
68 65  
69   - public Integer getCheckDateStart() {
70   - return checkDateStart;
71   - }
72   -
73   - public void setCheckDateStart(Integer checkDateStart) {
74   - this.checkDateStart = checkDateStart;
75   - }
76   -
77   - public Integer getCheckDateEnd() {
78   - return checkDateEnd;
79   - }
80   -
81   - public void setCheckDateEnd(Integer checkDateEnd) {
82   - this.checkDateEnd = checkDateEnd;
83   - }
84   -
85 66 public String getQueryNo() {
86 67 return queryNo;
87 68 }
88 69  
89 70 public void setQueryNo(String queryNo) {
90 71 this.queryNo = queryNo;
  72 + }
  73 +
  74 + public String getCheckDate() {
  75 + return checkDate;
  76 + }
  77 +
  78 + public void setCheckDate(String checkDate) {
  79 + this.checkDate = checkDate;
91 80 }
92 81 }