jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7f7d069f03fa7b67418f48fbd0b1f38e6c8d868b

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

眼宝检查bug修改

Showing 9 changed files with 471 additions and 68 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java View file @ 7f7d069
... ... @@ -72,6 +72,9 @@
72 72 * 外眼观察(右)
73 73 */
74 74 private String extRightEyelook;
  75 +
  76 + private String extRightEyelookYang;
  77 +
75 78 private String extRightEyelookOther;
76 79  
77 80 /**
78 81  
79 82  
... ... @@ -79,16 +82,21 @@
79 82 */
80 83 private String blinkRightReflex;
81 84  
  85 + private String blinkRightReflexYang;
  86 +
82 87 /**
83 88 * 瞳孔对光反射(右)
84 89 */
85 90 private String pupillaryRightReflex;
86 91  
  92 + private String pupillaryRightReflexYang;
87 93 /**
88 94 * 瞳孔红光反射(右)
89 95 */
90 96 private String redRightReflex;
91 97  
  98 + private String redRightReflexYang;
  99 +
92 100 /**================= 左眼 ===============*/
93 101 /**
94 102 * 外眼观察(左)
95 103  
96 104  
97 105  
98 106  
99 107  
... ... @@ -96,30 +104,40 @@
96 104 private String extLeftEyelook;
97 105 private String extLeftEyelookOther;
98 106  
  107 + private String extLeftEyelookYang;
99 108 /**
100 109 * 瞬目反射(左)
101 110 */
102 111 private String blinkLefttReflex;
103 112  
  113 + private String blinkLefttReflexYang;
104 114 /**
105 115 * 瞳孔对光反射(左)
106 116 */
107 117 private String pupillaryLeftReflex;
108 118  
  119 +
  120 + private String pupillaryLeftReflexYang;
109 121 /**
110 122 * 瞳孔红光反射(左)
111 123 */
112 124 private String redLeftReflex;
  125 +
  126 + private String redLeftReflexYang;
113 127 /**
114 128 * 红光反射医生判定阳性
115 129 */
116 130 private String redLeft2;
117 131  
  132 +
  133 + private String redLeft2Yang;
118 134 /**
119 135 * 眼底检查结果
120 136 */
121 137 private String fundusResult;
122 138  
  139 + private String fundusResultYang;
  140 +
123 141 /**
124 142 * 处理意见
125 143 */
126 144  
... ... @@ -152,12 +170,18 @@
152 170 * 外眼观察
153 171 */
154 172 private String extEyelook;
  173 +
  174 + private String extEyelookYang;
  175 +
155 176 private String extEyelookOther;
156 177  
157 178 /**
158 179 * 红光反射
159 180 */
160 181 private String redReflex;
  182 +
  183 + private String redReflexYang;
  184 +
161 185 private String redReflexOther;
162 186  
163 187 /**
164 188  
165 189  
166 190  
... ... @@ -174,22 +198,32 @@
174 198 */
175 199 private String optometry;
176 200  
  201 + private String optometryYnag;
177 202 /**
178 203 * 结膜
179 204 */
180 205 private String conjunctiva;
  206 +
  207 + private String conjunctivaYang;
  208 +
181 209 private String conjunctivaOther;
182 210  
183 211 /**
184 212 * 角膜
185 213 */
186 214 private String corneal;
  215 +
  216 + private String cornealYang;
  217 +
187 218 private String cornealOther;
188 219  
189 220 /**
190 221 * 泪器
191 222 */
192 223 private String lacrimalApparatus;
  224 +
  225 + private String lacrimalApparatusYang;
  226 +
193 227 private String lacrimalApparatusOther;
194 228  
195 229 /**
196 230  
197 231  
198 232  
... ... @@ -197,19 +231,28 @@
197 231 */
198 232 private String eyeMovementsId;
199 233  
  234 + private String eyeMovementsIdYang;
  235 +
200 236 /**
201 237 * 眼位
202 238 */
203 239 private String eyePositionId;
  240 +
  241 + private String eyePositionIdYang;
  242 +
204 243 private String eyePositionOther;
205 244 //医生判定判断阳性
206 245 private String eyePositionId2;
207 246  
  247 + private String eyePositionId2Yang;
  248 +
208 249 /**
209 250 * 双眼视觉
210 251 */
211 252 private String binocularVision;
212 253  
  254 + private String binocularVisionYang;
  255 +
213 256 /**
214 257 * 其他
215 258 */
216 259  
... ... @@ -222,9 +265,12 @@
222 265 */
223 266 private String lVision;
224 267 private String rVision;
  268 +
225 269 //视力医生判定阳性
226 270 private String vision2;
227 271  
  272 + private String vision2Yang;
  273 +
228 274 /**
229 275 * 屈光
230 276 */
231 277  
... ... @@ -239,10 +285,220 @@
239 285 */
240 286 private String nystagmus;
241 287  
  288 + private String nystagmusYang;
  289 +
242 290 /**
243 291 * 选择性注视卡检查
244 292 */
245 293 private String fixationCard;
  294 +
  295 +
  296 + /**
  297 + * 器械判定阳性 类型
  298 + */
  299 + private String apparatus;
  300 +
  301 + /**
  302 + * 医生判定阳性类型
  303 + */
  304 + private String doctorJudgement;
  305 +
  306 +
  307 + public String getApparatus() {
  308 + return apparatus;
  309 + }
  310 +
  311 + public void setApparatus(String apparatus) {
  312 + this.apparatus = apparatus;
  313 + }
  314 +
  315 + public String getDoctorJudgement() {
  316 + return doctorJudgement;
  317 + }
  318 +
  319 + public void setDoctorJudgement(String doctorJudgement) {
  320 + this.doctorJudgement = doctorJudgement;
  321 + }
  322 +
  323 + public static long getSerialVersionUID() {
  324 + return serialVersionUID;
  325 + }
  326 +
  327 + public String getExtRightEyelookYang() {
  328 + return extRightEyelookYang;
  329 + }
  330 +
  331 + public void setExtRightEyelookYang(String extRightEyelookYang) {
  332 + this.extRightEyelookYang = extRightEyelookYang;
  333 + }
  334 +
  335 + public String getBlinkRightReflexYang() {
  336 + return blinkRightReflexYang;
  337 + }
  338 +
  339 + public void setBlinkRightReflexYang(String blinkRightReflexYang) {
  340 + this.blinkRightReflexYang = blinkRightReflexYang;
  341 + }
  342 +
  343 + public String getPupillaryRightReflexYang() {
  344 + return pupillaryRightReflexYang;
  345 + }
  346 +
  347 + public void setPupillaryRightReflexYang(String pupillaryRightReflexYang) {
  348 + this.pupillaryRightReflexYang = pupillaryRightReflexYang;
  349 + }
  350 +
  351 + public String getRedRightReflexYang() {
  352 + return redRightReflexYang;
  353 + }
  354 +
  355 + public void setRedRightReflexYang(String redRightReflexYang) {
  356 + this.redRightReflexYang = redRightReflexYang;
  357 + }
  358 +
  359 + public String getExtLeftEyelookYang() {
  360 + return extLeftEyelookYang;
  361 + }
  362 +
  363 + public void setExtLeftEyelookYang(String extLeftEyelookYang) {
  364 + this.extLeftEyelookYang = extLeftEyelookYang;
  365 + }
  366 +
  367 + public String getBlinkLefttReflexYang() {
  368 + return blinkLefttReflexYang;
  369 + }
  370 +
  371 + public void setBlinkLefttReflexYang(String blinkLefttReflexYang) {
  372 + this.blinkLefttReflexYang = blinkLefttReflexYang;
  373 + }
  374 +
  375 + public String getPupillaryLeftReflexYang() {
  376 + return pupillaryLeftReflexYang;
  377 + }
  378 +
  379 + public void setPupillaryLeftReflexYang(String pupillaryLeftReflexYang) {
  380 + this.pupillaryLeftReflexYang = pupillaryLeftReflexYang;
  381 + }
  382 +
  383 + public String getRedLeftReflexYang() {
  384 + return redLeftReflexYang;
  385 + }
  386 +
  387 + public void setRedLeftReflexYang(String redLeftReflexYang) {
  388 + this.redLeftReflexYang = redLeftReflexYang;
  389 + }
  390 +
  391 + public String getRedLeft2Yang() {
  392 + return redLeft2Yang;
  393 + }
  394 +
  395 + public void setRedLeft2Yang(String redLeft2Yang) {
  396 + this.redLeft2Yang = redLeft2Yang;
  397 + }
  398 +
  399 + public String getFundusResultYang() {
  400 + return fundusResultYang;
  401 + }
  402 +
  403 + public void setFundusResultYang(String fundusResultYang) {
  404 + this.fundusResultYang = fundusResultYang;
  405 + }
  406 +
  407 + public String getExtEyelookYang() {
  408 + return extEyelookYang;
  409 + }
  410 +
  411 + public void setExtEyelookYang(String extEyelookYang) {
  412 + this.extEyelookYang = extEyelookYang;
  413 + }
  414 +
  415 + public String getRedReflexYang() {
  416 + return redReflexYang;
  417 + }
  418 +
  419 + public void setRedReflexYang(String redReflexYang) {
  420 + this.redReflexYang = redReflexYang;
  421 + }
  422 +
  423 + public String getOptometryYnag() {
  424 + return optometryYnag;
  425 + }
  426 +
  427 + public void setOptometryYnag(String optometryYnag) {
  428 + this.optometryYnag = optometryYnag;
  429 + }
  430 +
  431 + public String getConjunctivaYang() {
  432 + return conjunctivaYang;
  433 + }
  434 +
  435 + public void setConjunctivaYang(String conjunctivaYang) {
  436 + this.conjunctivaYang = conjunctivaYang;
  437 + }
  438 +
  439 + public String getCornealYang() {
  440 + return cornealYang;
  441 + }
  442 +
  443 + public void setCornealYang(String cornealYang) {
  444 + this.cornealYang = cornealYang;
  445 + }
  446 +
  447 + public String getLacrimalApparatusYang() {
  448 + return lacrimalApparatusYang;
  449 + }
  450 +
  451 + public void setLacrimalApparatusYang(String lacrimalApparatusYang) {
  452 + this.lacrimalApparatusYang = lacrimalApparatusYang;
  453 + }
  454 +
  455 + public String getEyeMovementsIdYang() {
  456 + return eyeMovementsIdYang;
  457 + }
  458 +
  459 + public void setEyeMovementsIdYang(String eyeMovementsIdYang) {
  460 + this.eyeMovementsIdYang = eyeMovementsIdYang;
  461 + }
  462 +
  463 + public String getEyePositionIdYang() {
  464 + return eyePositionIdYang;
  465 + }
  466 +
  467 + public void setEyePositionIdYang(String eyePositionIdYang) {
  468 + this.eyePositionIdYang = eyePositionIdYang;
  469 + }
  470 +
  471 + public String getEyePositionId2Yang() {
  472 + return eyePositionId2Yang;
  473 + }
  474 +
  475 + public void setEyePositionId2Yang(String eyePositionId2Yang) {
  476 + this.eyePositionId2Yang = eyePositionId2Yang;
  477 + }
  478 +
  479 + public String getBinocularVisionYang() {
  480 + return binocularVisionYang;
  481 + }
  482 +
  483 + public void setBinocularVisionYang(String binocularVisionYang) {
  484 + this.binocularVisionYang = binocularVisionYang;
  485 + }
  486 +
  487 + public String getVision2Yang() {
  488 + return vision2Yang;
  489 + }
  490 +
  491 + public void setVision2Yang(String vision2Yang) {
  492 + this.vision2Yang = vision2Yang;
  493 + }
  494 +
  495 + public String getNystagmusYang() {
  496 + return nystagmusYang;
  497 + }
  498 +
  499 + public void setNystagmusYang(String nystagmusYang) {
  500 + this.nystagmusYang = nystagmusYang;
  501 + }
246 502  
247 503 public String getRedLeft2() {
248 504 return redLeft2;
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ 7f7d069
... ... @@ -45,8 +45,6 @@
45 45 private Integer first; // 1否 2 是，是否当前医院第一次初诊 德州需求
46 46  
47 47  
48   -
49   -
50 48 //生日查询
51 49 private Date birthEnd;
52 50 private Date birthStart;
53 51  
54 52  
... ... @@ -295,13 +293,26 @@
295 293 //孕妇状态
296 294 private Integer status;
297 295 private String levelId;
  296 + //无标记高危因素查询
  297 + private List<String> noLeveId;
  298 +
298 299 private String rFactor;
299 300  
  301 +
300 302 /**
301 303 * 高危因素集合
302 304 */
303 305 private List<String> rFactorList;
304 306  
  307 +
  308 + public List<String> getNoLeveId() {
  309 + return noLeveId;
  310 + }
  311 +
  312 + public void setNoLeveId(List<String> noLeveId) {
  313 + this.noLeveId = noLeveId;
  314 + }
  315 +
305 316 public List<String> getrFactorList() {
306 317 return rFactorList;
307 318 }
... ... @@ -493,7 +504,7 @@
493 504 public MongoQuery convertToQuery() {
494 505 MongoCondition condition = MongoCondition.newInstance();
495 506  
496   - if(CollectionUtils.isNotEmpty(parentIds)){
  507 + if (CollectionUtils.isNotEmpty(parentIds)) {
497 508 condition = condition.and("parentId", parentIds, MongoOper.IN);
498 509 }
499 510 if (null != neqId) {
500 511  
501 512  
... ... @@ -541,13 +552,12 @@
541 552 }
542 553  
543 554  
544   -
545 555 if (StringUtils.isNotEmpty(levelId)) {
546 556 condition = condition.and("hLevel", levelId, MongoOper.IN);
547 557 }
548   - if(null!=rFactorList &&!rFactorList.isEmpty()){
  558 + if (null != rFactorList && !rFactorList.isEmpty()) {
549 559 condition = condition.and("hRisk", rFactorList, MongoOper.IN);
550   - }else if (StringUtils.isNotEmpty(rFactor)) {
  560 + } else if (StringUtils.isNotEmpty(rFactor)) {
551 561 condition = condition.and("hRisk", rFactor, MongoOper.IN);
552 562 }
553 563 if (null != status) {
554 564  
555 565  
... ... @@ -599,20 +609,14 @@
599 609  
600 610 Criteria c = null;
601 611  
602   - if (isOpinion != null)
603   - {
604   - if (isOpinion)
605   - {
  612 + if (isOpinion != null) {
  613 + if (isOpinion) {
606 614 if (null != treatOpinion) {
607 615 condition = condition.and("treatOpinion", treatOpinion, MongoOper.LIKE);
608   - }
609   - else
610   - {
  616 + } else {
611 617 condition = condition.and("treatOpinion", null, MongoOper.NE);
612 618 }
613   - }
614   - else
615   - {
  619 + } else {
616 620 condition = condition.and("treatOpinion", false, MongoOper.EXISTS);
617 621 }
618 622 }
619 623  
620 624  
621 625  
... ... @@ -693,21 +697,21 @@
693 697 }
694 698  
695 699  
696   - if (null != cDueWeekStart) {
697   - if (null != c) {
698   - c = c.and("cDay").gte(cDueWeekStart);
699   - } else {
700   - c = Criteria.where("cDay").gte(cDueWeekStart);
701   - }
  700 + if (null != cDueWeekStart) {
  701 + if (null != c) {
  702 + c = c.and("cDay").gte(cDueWeekStart);
  703 + } else {
  704 + c = Criteria.where("cDay").gte(cDueWeekStart);
702 705 }
  706 + }
703 707  
704   - if (null != cDueWeekEnd) {
705   - if (null != c) {
706   - c = c.lte(cDueWeekEnd);
707   - } else {
708   - c = Criteria.where("cDay").lte(cDueWeekEnd);
709   - }
  708 + if (null != cDueWeekEnd) {
  709 + if (null != c) {
  710 + c = c.lte(cDueWeekEnd);
  711 + } else {
  712 + c = Criteria.where("cDay").lte(cDueWeekEnd);
710 713 }
  714 + }
711 715  
712 716 if (null != modifiedStart && modifiedEnd != null) {
713 717 if (null != c) {
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 7f7d069
... ... @@ -220,6 +220,11 @@
220 220 */
221 221 private String rLevel;
222 222 /**
  223 + * 风险因素等级无标记
  224 + */
  225 + private List<String> noRlevel;
  226 +
  227 + /**
223 228 * 高危评分
224 229 */
225 230 private Integer hScoreStart;
... ... @@ -352,6 +357,15 @@
352 357 //历史数据是否处理
353 358 private boolean isHistory;
354 359  
  360 +
  361 + public List<String> getNoRlevel() {
  362 + return noRlevel;
  363 + }
  364 +
  365 + public void setNoRlevel(List<String> noRlevel) {
  366 + this.noRlevel = noRlevel;
  367 + }
  368 +
355 369 public boolean isHistory() {
356 370 return isHistory;
357 371 }
... ... @@ -544,6 +558,7 @@
544 558 if (StringUtils.isNotEmpty(rLevel)) {
545 559 condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE);
546 560 }
  561 +
547 562 //居住地
548 563 if (StringUtils.isNotEmpty(areaId)) {
549 564 condition = condition.and("areaId", areaId, MongoOper.IS);
... ... @@ -658,6 +673,17 @@
658 673 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con5}).getCriteria());
659 674 } else {
660 675 c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con5}).getCriteria();
  676 + }
  677 + }
  678 + //高危颜色等级无标记查询
  679 + if (null != noRlevel) {
  680 + MongoCondition c = MongoCondition.newInstance();
  681 + MongoCondition con1 = MongoCondition.newInstance("riskLevelId", noRlevel, MongoOper.NIN);
  682 + MongoCondition con2 = MongoCondition.newInstance("riskLevelId", true, MongoOper.EXISTS);
  683 + if (c1 != null) {
  684 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  685 + } else {
  686 + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
661 687 }
662 688 }
663 689  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java View file @ 7f7d069
... ... @@ -45,6 +45,7 @@
45 45  
46 46 /**
47 47 * 保存之后查看的数据
  48 + *
48 49 * @param id
49 50 * @return
50 51 */
51 52  
52 53  
53 54  
... ... @@ -66,21 +67,20 @@
66 67 @TokenRequired
67 68 @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
68 69 public BaseResponse delete(@PathVariable String id, HttpServletRequest request) {
69   - return babyEyeCheckService.delete(id,getUserId(request));
  70 + return babyEyeCheckService.delete(id, getUserId(request));
70 71 }
71 72  
72 73 /**
73   - *
74 74 * @param startDate
75 75 * @param endDate
76 76 * @param doctor
77   - * @param key 姓名/联系方式/就诊卡
  77 + * @param key 姓名/联系方式/就诊卡
78 78 * @param currentMonthStart/currentMonthEnd 当前月龄范围
79   - * @param chechMonth 检查月龄
80   - * @param positive 是否是阳性
81   - * @param bookStartDate 预约开始时间
82   - * @param bookEndDate 预约结束时间
83   - * @param positive 是否是阳性
  79 + * @param chechMonth 检查月龄
  80 + * @param positive 是否是阳性
  81 + * @param bookStartDate 预约开始时间
  82 + * @param bookEndDate 预约结束时间
  83 + * @param positive 是否是阳性
84 84 * @param page
85 85 * @param limit
86 86 * @param request
87 87  
... ... @@ -90,15 +90,15 @@
90 90 @TokenRequired
91 91 @RequestMapping(method = RequestMethod.GET)
92 92 public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
93   - Date bookStartDate, Date bookEndDate) {
94   - return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate);
  93 + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) {
  94 + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive);
95 95 }
96 96  
97 97 @ResponseBody
98 98 @TokenRequired
99 99 @RequestMapping(value = "/export", method = RequestMethod.GET)
100   - public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate) {
101   - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate);
  100 + public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) {
  101 + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive);
102 102 }
103 103  
104 104 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 7f7d069
... ... @@ -112,7 +112,19 @@
112 112 // antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
113 113 antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId());
114 114 antExRecordQuery.setrFactorList(StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class));
115   - antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
  115 +
  116 + //无标记查询
  117 + if ("1".equals(antExManagerQueryRequest.getLevel())) {
  118 + List<String> hriskList = new ArrayList<>();
  119 + hriskList.add("e637b361-99cf-41eb-84f2-f0dab596e928");//绿色
  120 + hriskList.add("315107bd-91fe-42a1-9237-752f3c046a40");//黄色
  121 + hriskList.add("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2");//橙色
  122 + hriskList.add("eb146c03-b19f-4e28-b85f-fda574b2283b");//
  123 + hriskList.add("224b2329-cb82-4da3-a071-8527f8283aab");
  124 + antExRecordQuery.setNoLeveId(hriskList);
  125 + } else {
  126 + antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
  127 + }
116 128 antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode());
117 129 // antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo());
118 130 antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId());
119 131  
... ... @@ -921,11 +933,10 @@
921 933 // }
922 934 // model.setTireData(placentaList);
923 935  
924   -
925 936 List<Map> placentaList = new ArrayList<>();
926 937 for (String l : list) {
927   - Map map = new HashMap();
928   - map.put("heartRate",Double.parseDouble(l));
  938 + Map map = new HashMap();
  939 + map.put("heartRate", Double.parseDouble(l));
929 940 placentaList.add(map);
930 941 }
931 942 model.setTireData(placentaList);
932 943  
933 944  
934 945  
935 946  
... ... @@ -968,27 +979,27 @@
968 979 //其他高危
969 980 antExAddRequest.setOtherRisk(maps);
970 981 }
971   -
972 982 antExAddRequest.setRiskFactor(patients.getRiskFactorId());
973   -
974   -
975 983 antExAddRequest.setGongGao(fuh);
976 984 antExAddRequest.setAbdominalCircumference(abdominalGirth);
977 985 List<String> list = JsonUtil.jkstr2Obj(fhr, List.class);
978 986 if (CollectionUtils.isNotEmpty(list)) {
979   - List<MatDeliverAddRequest.Placenta> placentaList = new ArrayList<>();
  987 + List<Map> placentaList = new ArrayList<>();
980 988 for (String l : list) {
981   - MatDeliverAddRequest.Placenta placenta = new MatDeliverAddRequest.Placenta();
982   - placenta.setHeartRate(Double.parseDouble(l));
983   - placentaList.add(placenta);
984   -
  989 + Map map = new HashMap();
  990 + map.put("heartRate", Double.parseDouble(l));
  991 + placentaList.add(map);
985 992 }
986 993 antExAddRequest.setTireData(placentaList);
987 994 antExAddRequest.setTireNumber(list.size() + "");
988 995 GuidelinesQuery guidelinesQuery = new GuidelinesQuery();
989 996 guidelinesQuery.setType(1);
990   - guidelinesQuery.setMaxStart(DateUtil.getWeek(patients.getLastMenses(), new Date()));
991   - guidelinesQuery.setMinEnd(DateUtil.getWeek(patients.getLastMenses(), new Date()));
  997 + Integer start = DateUtil.getWeek(patients.getLastMenses(), new Date());
  998 + if (start <= 5) {
  999 + start = 5;
  1000 + }
  1001 + guidelinesQuery.setMaxStart(start);
  1002 + guidelinesQuery.setMinEnd(start);
992 1003 System.out.println("指导意见查询条件：" + guidelinesQuery.convertToQuery().convertToMongoQuery());
993 1004 List<Guidelines> lists = guidelinesService.queryGuidelines(guidelinesQuery);
994 1005 StringBuilder stringBuilder = new StringBuilder(128);
... ... @@ -998,7 +1009,6 @@
998 1009 }
999 1010 }
1000 1011 antExAddRequest.setGuide(stringBuilder.toString());
1001   -
1002 1012 }
1003 1013 antenatalExaminationFacade.addOneAntEx(antExAddRequest, Integer.parseInt(doctorId));
1004 1014 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 7f7d069
... ... @@ -340,8 +340,20 @@
340 340 patientsQuery.setBookbuildingDoctor(riskPatientsQueryRequest.getBuildUserId());
341 341 patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId());
342 342  
  343 + if ("1".equals(riskPatientsQueryRequest.getrLevel())) {
  344 + List<String> hriskList = new ArrayList<>();
  345 + hriskList.add("e637b361-99cf-41eb-84f2-f0dab596e928");//绿色
  346 + hriskList.add("315107bd-91fe-42a1-9237-752f3c046a40");//黄色
  347 + hriskList.add("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2");//橙色
  348 + hriskList.add("eb146c03-b19f-4e28-b85f-fda574b2283b");
  349 + hriskList.add("224b2329-cb82-4da3-a071-8527f8283aab");
  350 + patientsQuery.setNoRlevel(hriskList);
343 351  
344   - patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
  352 + } else {
  353 + patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
  354 +
  355 + }
  356 +
345 357 patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
346 358 patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
347 359 if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTime())) {
348 360  
... ... @@ -1734,12 +1746,9 @@
1734 1746 healthy.add("5a40c6c5422b03d4ad2bf7bd");//BMI＜18.5
1735 1747 if (patients != null) {
1736 1748 if (patients.getRiskFactorId() == null || healthy.containsAll(patients.getRiskFactorId())) {
1737   - if (StringUtils.isNotEmpty(patients.getoRiskFactor()) && !"null".equals(patients.getoRiskFactor()))
1738   - {
  1749 + if (StringUtils.isNotEmpty(patients.getoRiskFactor()) && !"null".equals(patients.getoRiskFactor())) {
1739 1750 patientBaseResult.setFlag(true);
1740   - }
1741   - else
1742   - {
  1751 + } else {
1743 1752 patientBaseResult.setFlag(false);
1744 1753 }
1745 1754 } else {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 7f7d069
... ... @@ -1149,7 +1149,6 @@
1149 1149 public MappingMongoConverter mappingMongoConverter() {
1150 1150 DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory);
1151 1151 MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mongoMappingContext);
1152   - //此处是去除插入数据库的 _class 字段
1153 1152 converter.setTypeMapper(new DefaultMongoTypeMapper("_class"));
1154 1153 return converter;
1155 1154 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java View file @ 7f7d069
... ... @@ -21,12 +21,12 @@
21 21  
22 22 BaseResponse delete(String id,Integer userId);
23 23  
24   - BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate);
  24 + BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate,String apparatusPositive, String doctorPositive);
25 25  
26 26 BaseResponse query(Integer userId, String babyId);
27 27  
28 28 BaseResponse listInit();
29 29  
30   - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate);
  30 + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate,String apparatusPositive, String doctorPositive);
31 31 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 7f7d069
... ... @@ -90,6 +90,85 @@
90 90 if (!mongoUtil.buildArchive(userId, babyEyeCheck.getBabyId())) {
91 91 return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD);
92 92 }
  93 +
  94 + if ("yang".equals(babyEyeCheck.getExtRightEyelook()) || "yang".equals(babyEyeCheck.getExtLeftEyelook()) || "yang".equals(babyEyeCheck.getBlinkRightReflex())
  95 + || "yang".equals(babyEyeCheck.getBlinkLefttReflex()) || "yang".equals(babyEyeCheck.getPupillaryRightReflex()) || "yang".equals(babyEyeCheck.getPupillaryLeftReflex())
  96 + || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex())
  97 + || "yang".equals(babyEyeCheck.getConjunctiva()) || "yang".equals(babyEyeCheck.getCorneal()) || "yang".equals(babyEyeCheck.getLacrimalApparatus())
  98 + || "yang".equals(babyEyeCheck.getNystagmus()) || "yang".equals(babyEyeCheck.getExtEyelook())
  99 + ) {
  100 + //器械判定阳性
  101 + babyEyeCheck.setApparatus("2");
  102 + }
  103 + if ("yang".equals(babyEyeCheck.getEyePositionId2()) || "yang".equals(babyEyeCheck.getRedLeft2()) || "yang".equals(babyEyeCheck.getVision2())
  104 + || "yang".equals(babyEyeCheck.getY2()) || "yang".equals(babyEyeCheck.getRedLeft2())
  105 + ) {
  106 + //医生判定阳性
  107 + babyEyeCheck.setDoctorJudgement("2");
  108 + }
  109 +
  110 +/*
  111 + if ("yang".equals(babyEyeCheck.getEyePositionId2())) {
  112 + positive.append("眼位(医生判定)");
  113 + }
  114 + if ("yang".equals(babyEyeCheck.getRedLeft2())) {
  115 + positive.append("红光反射（医生判定）");
  116 + }
  117 + if ("yang".equals(babyEyeCheck.getVision2())) {
  118 + positive.append("视力（医生判定）");
  119 + }
  120 + if ("yang".equals(babyEyeCheck.getY2())) {
  121 + positive.append("手持眼光仪（医生判定）");
  122 + }
  123 + if ("yang".equals(babyEyeCheck.getRedLeft2())) {
  124 + positive.append("屈光（医生判定）");
  125 + }*/
  126 +
  127 +
  128 +
  129 + /*if ("yang".equals(babyEyeCheck.getExtRightEyelook())) {
  130 + babyEyeCheck.setEXtr("外眼观察(右) ");
  131 + }
  132 + if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) {
  133 + positive.append("外眼观察(左) ");
  134 + }
  135 + if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) {
  136 + positive.append("瞬目反射(右) ");
  137 + }
  138 + if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) {
  139 + positive.append("瞬目反射(左) ");
  140 + }
  141 + if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) {
  142 + positive.append("瞳孔对光反射(右) ");
  143 + }
  144 + if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) {
  145 + positive.append("瞳孔对光反射(左) ");
  146 + }
  147 + if ("yang".equals(babyEyeCheck.getRedRightReflex())) {
  148 + positive.append("瞳孔红光反射(右) ");
  149 + }
  150 + if ("yang".equals(babyEyeCheck.getRedLeftReflex())) {
  151 + positive.append("瞳孔红光反射(左) ");
  152 + }
  153 + if ("yang".equals(babyEyeCheck.getRedReflex())) {
  154 + positive.append("红光反射 ");
  155 + }
  156 + if ("yang".equals(babyEyeCheck.getConjunctiva())) {
  157 + positive.append("结膜 ");
  158 + }
  159 + if ("yang".equals(babyEyeCheck.getCorneal())) {
  160 + positive.append("角膜 ");
  161 + }
  162 + if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) {
  163 + positive.append("泪器 ");
  164 + }
  165 +
  166 + if ("yang".equals(babyEyeCheck.getNystagmus())) {
  167 + positive.append("视动性眼震 ");
  168 + }
  169 + if ("yang".equals(babyEyeCheck.getExtEyelook())) {
  170 + positive.append("外眼观察 ");
  171 + }*/
93 172 babyEyeCheck.setCreated(new Date());
94 173 babyEyeCheck.setYn("1");
95 174 babyEyeCheck.setOperaterId(userId + "");
... ... @@ -327,7 +406,7 @@
327 406 }
328 407  
329 408 @Override
330   - public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate) {
  409 + public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) {
331 410 String hospitalId = autoMatchFacade.getHospitalId(userId);
332 411 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
333 412 if (startDate != null && endDate != null) {
... ... @@ -347,7 +426,12 @@
347 426 Date end = DateUtil.getBirthEnd(currentMonthStart);
348 427 criteria.and("birth").gte(start).lt(end);
349 428 }
350   -
  429 + if (StringUtils.isNotEmpty(apparatusPositive)) {
  430 + criteria.and("apparatus").is(apparatusPositive);
  431 + }
  432 + if (StringUtils.isNotEmpty(doctorPositive)) {
  433 + criteria.and("doctorJudgement").is(doctorPositive);
  434 + }
351 435 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
352 436 Criteria c = new Criteria();
353 437 c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
... ... @@ -466,6 +550,21 @@
466 550 if ("yang".equals(babyEyeCheck.getExtEyelook())) {
467 551 positive.append("外眼观察 ");
468 552 }
  553 + if ("yang".equals(babyEyeCheck.getEyePositionId2())) {
  554 + positive.append("眼位(医生判定)");
  555 + }
  556 + if ("yang".equals(babyEyeCheck.getRedLeft2())) {
  557 + positive.append("红光反射（医生判定）");
  558 + }
  559 + if ("yang".equals(babyEyeCheck.getVision2())) {
  560 + positive.append("视力（医生判定）");
  561 + }
  562 + if ("yang".equals(babyEyeCheck.getY2())) {
  563 + positive.append("手持眼光仪（医生判定）");
  564 + }
  565 + if ("yang".equals(babyEyeCheck.getRedLeft2())) {
  566 + positive.append("屈光（医生判定）");
  567 + }
469 568  
470 569 temp.put("positive", positive.toString());
471 570 temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor()));
... ... @@ -614,8 +713,8 @@
614 713 }
615 714  
616 715 @Override
617   - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate) {
618   - BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate);
  716 + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) {
  717 + BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive);
619 718 PageResult pageResult = (PageResult) rest.getObject();
620 719 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
621 720 Map<String, String> cnames = new LinkedHashMap<>();