jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4444bf9beabc5ef6c1780ee509192b890e9d902b

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

隆化儿保需求问题2022.1.4-儿童管理-全部儿童-牙齿异常、轻度贫血、中度贫血、心脏杂音 筛选 

儿保检查增加出牙数状态

Showing 9 changed files with 186 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ 4444bf9
... ... @@ -632,6 +632,17 @@
632 632 //心脏杂音
633 633 private Map<String,String> heartMurmur;
634 634  
  635 + //出牙数状态 1：正常，2：异常
  636 + private Integer cyNumType;
  637 +
  638 + public Integer getCyNumType() {
  639 + return cyNumType;
  640 + }
  641 +
  642 + public void setCyNumType(Integer cyNumType) {
  643 + this.cyNumType = cyNumType;
  644 + }
  645 +
635 646 public Map<String, String> getMildAnaemia() {
636 647 return mildAnaemia;
637 648 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 4444bf9
... ... @@ -268,7 +268,12 @@
268 268 @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd,
269 269 @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor,
270 270 @RequestParam(value = "riskCode", required = false) String riskCode,
271   - @RequestParam(value = "healthHigh", required = false) Integer healthHigh
  271 + @RequestParam(value = "healthHigh", required = false) Integer healthHigh,
  272 + @RequestParam(value = "mildAnaemia", required = false) String mildAnaemia,
  273 + @RequestParam(value = "moderateAnaemia", required = false) String moderateAnaemia,
  274 + @RequestParam(value = "heartMurmur", required = false) String heartMurmur,
  275 + @RequestParam(value = "cyNumType", required = false) Integer cyNumType,
  276 + @RequestParam(value = "qcNumType", required = false) Integer qcNumType
272 277 ) {
273 278  
274 279 if (CollectionUtils.isNotEmpty(highRiskInfos)) {
... ... @@ -378,7 +383,14 @@
378 383 request.setLastCheckDoctor(lastCheckDoctor);
379 384 request.setRiskCode(riskCode);
380 385 request.setHealthHigh(healthHigh);
381   -
  386 + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选
  387 + request.setMildAnaemia(mildAnaemia);
  388 + request.setModerateAnaemia(moderateAnaemia);
  389 + request.setHeartMurmur(heartMurmur);
  390 + //出牙数状态
  391 + request.setCyNumType(cyNumType);
  392 + //龋齿状态
  393 + request.setQcNumType(qcNumType);
382 394 return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
383 395 }
384 396  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 4444bf9
... ... @@ -3205,7 +3205,7 @@
3205 3205 }
3206 3206  
3207 3207  
3208   - private List <BabyModel> getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) {
  3208 + private List <BabyModel> getBabayListByCondition(final BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) {
3209 3209  
3210 3210  
3211 3211 List buildType = new ArrayList();
... ... @@ -3389,6 +3389,68 @@
3389 3389 //滦平、隆化-儿保管理-全部 加健康/高危筛选
3390 3390 babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
3391 3391 System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
  3392 + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选
  3393 + if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())||
  3394 + StringUtils.isNotEmpty(request.getHeartMurmur())||null!=request.getCyNumType()||null!=request.getQcNumType()){
  3395 + final String mildAnaemia=request.getMildAnaemia();
  3396 + final String moderateAnaemia=request.getModerateAnaemia();
  3397 + final String heartMurmur=request.getHeartMurmur();
  3398 + final Integer cyNumType=request.getCyNumType();
  3399 + final Integer qcNumType=request.getQcNumType();
  3400 + List<BabyModel> list=babyBookBuildingDao.queryBabyWithQuery(babyQuery.convertToQuery());
  3401 + int batchSize = 20;
  3402 + int end = 0;
  3403 + List <Future> listFuture = new ArrayList <>();
  3404 + final Set<String> idset=new HashSet<>();
  3405 + for (int i = 0; i < list.size(); i += batchSize) {
  3406 + end = (end + batchSize);
  3407 + if (end > list.size()) {
  3408 + end = list.size();
  3409 + }
  3410 + final List<BabyModel> risks = list.subList(i, end);
  3411 + listFuture.add(commonThreadPool.submit(new Callable() {
  3412 + @Override
  3413 + public Object call() throws Exception {
  3414 + for (BabyModel risk : risks) {
  3415 + Query query = new Query();
  3416 + query.addCriteria(Criteria.where("id").is(risk.getId()));
  3417 + if(StringUtils.isNotEmpty(mildAnaemia)){
  3418 + query.addCriteria(Criteria.where("mildAnaemia").is(mildAnaemia));
  3419 + }
  3420 + if(StringUtils.isNotEmpty(moderateAnaemia)){
  3421 + query.addCriteria(Criteria.where("moderateAnaemia").is(moderateAnaemia));
  3422 + }
  3423 + if(StringUtils.isNotEmpty(heartMurmur)){
  3424 + query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur));
  3425 + }
  3426 + if(null!=cyNumType){
  3427 + query.addCriteria(Criteria.where("cyNumType").is(cyNumType));
  3428 + }
  3429 + if(null!=qcNumType){
  3430 + if(qcNumType==1){//正常
  3431 + query.addCriteria(Criteria.where("qcNum").is(0));
  3432 + }
  3433 + if(qcNumType==2){//异常
  3434 + query.addCriteria(Criteria.where("qcNum").gt(0));
  3435 + }
  3436 +
  3437 + }
  3438 +
  3439 + final BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class);
  3440 + if(null!=checkModel){
  3441 + idset.add(checkModel.getBuildId());
  3442 + }
  3443 + }
  3444 + return null;
  3445 + }
  3446 + }));
  3447 + }
  3448 + BabyModelQuery babyQuery2=new BabyModelQuery();
  3449 + babyQuery2.setPage(request.getPage());
  3450 + babyQuery2.setLimit(request.getLimit());
  3451 + babyQuery2.setIds(new ArrayList(idset));
  3452 + babyQuery=babyQuery2;
  3453 + }
3392 3454 List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
3393 3455  
3394 3456 return models;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 4444bf9
... ... @@ -660,6 +660,10 @@
660 660 if(MapUtils.isNotEmpty(request.getHeartMurmur())){
661 661 model.setHeartMurmur(request.getHeartMurmur());
662 662 }
  663 + //出牙数状态
  664 + if(null!=request.getCyNumType()){
  665 + model.setCyNumType(request.getCyNumType());
  666 + }
663 667  
664 668 return model;
665 669 }
... ... @@ -2576,6 +2580,10 @@
2576 2580 }
2577 2581 if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){
2578 2582 model.setHeartMurmur(checkModel.getHeartMurmur());
  2583 + }
  2584 + //出牙数状态
  2585 + if(null!=checkModel.getCyNumType()){
  2586 + model.setCyNumType(checkModel.getCyNumType());
2579 2587 }
2580 2588  
2581 2589 return model;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4444bf9
... ... @@ -6415,6 +6415,10 @@
6415 6415 if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){
6416 6416 model.setHeartMurmur(checkModel.getHeartMurmur());
6417 6417 }
  6418 + //出牙数状态
  6419 + if(null!=checkModel.getCyNumType()){
  6420 + model.setCyNumType(checkModel.getCyNumType());
  6421 + }
6418 6422 return model;
6419 6423  
6420 6424 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ 4444bf9
... ... @@ -592,6 +592,17 @@
592 592 //心脏杂音
593 593 private Map<String,String> heartMurmur;
594 594  
  595 + //出牙数状态 1：正常，2：异常
  596 + private Integer cyNumType;
  597 +
  598 + public Integer getCyNumType() {
  599 + return cyNumType;
  600 + }
  601 +
  602 + public void setCyNumType(Integer cyNumType) {
  603 + this.cyNumType = cyNumType;
  604 + }
  605 +
595 606 public Map<String, String> getMildAnaemia() {
596 607 return mildAnaemia;
597 608 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ 4444bf9
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.dao.BaseQuery;
4 4  
5 5 import java.util.List;
  6 +import java.util.Map;
6 7  
7 8 /**
8 9 * Created by lqy on 2016/6/17.
... ... @@ -114,6 +115,59 @@
114 115  
115 116 //秦皇岛儿保管理全部 加健康/高危 筛查 0：健康，1：高危
116 117 private Integer healthHigh;
  118 + /**
  119 + * 隆化儿保需求问题2022.1.4
  120 + */
  121 + //轻度贫血
  122 + private String mildAnaemia;
  123 + //中度贫血
  124 + private String moderateAnaemia;
  125 + //心脏杂音
  126 + private String heartMurmur;
  127 + //出牙数状态 1：正常，2：异常
  128 + private Integer cyNumType;
  129 + //龋齿状态 1：正常，2：异常
  130 + private Integer qcNumType;
  131 +
  132 + public Integer getQcNumType() {
  133 + return qcNumType;
  134 + }
  135 +
  136 + public void setQcNumType(Integer qcNumType) {
  137 + this.qcNumType = qcNumType;
  138 + }
  139 +
  140 + public Integer getCyNumType() {
  141 + return cyNumType;
  142 + }
  143 +
  144 + public void setCyNumType(Integer cyNumType) {
  145 + this.cyNumType = cyNumType;
  146 + }
  147 +
  148 + public String getMildAnaemia() {
  149 + return mildAnaemia;
  150 + }
  151 +
  152 + public void setMildAnaemia(String mildAnaemia) {
  153 + this.mildAnaemia = mildAnaemia;
  154 + }
  155 +
  156 + public String getModerateAnaemia() {
  157 + return moderateAnaemia;
  158 + }
  159 +
  160 + public void setModerateAnaemia(String moderateAnaemia) {
  161 + this.moderateAnaemia = moderateAnaemia;
  162 + }
  163 +
  164 + public String getHeartMurmur() {
  165 + return heartMurmur;
  166 + }
  167 +
  168 + public void setHeartMurmur(String heartMurmur) {
  169 + this.heartMurmur = heartMurmur;
  170 + }
117 171  
118 172 public Integer getHealthHigh() {
119 173 return healthHigh;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ 4444bf9
... ... @@ -809,6 +809,17 @@
809 809 //心脏杂音
810 810 private Map<String,String> heartMurmur;
811 811  
  812 + //出牙数状态 1：正常，2：异常
  813 + private Integer cyNumType;
  814 +
  815 + public Integer getCyNumType() {
  816 + return cyNumType;
  817 + }
  818 +
  819 + public void setCyNumType(Integer cyNumType) {
  820 + this.cyNumType = cyNumType;
  821 + }
  822 +
812 823 public Map<String, String> getMildAnaemia() {
813 824 return mildAnaemia;
814 825 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 4444bf9
... ... @@ -832,6 +832,16 @@
832 832 //心脏杂音
833 833 private Map<String,String> heartMurmur;
834 834  
  835 + //出牙数状态 1：正常，2：异常
  836 + private Integer cyNumType;
  837 +
  838 + public Integer getCyNumType() {
  839 + return cyNumType;
  840 + }
  841 +
  842 + public void setCyNumType(Integer cyNumType) {
  843 + this.cyNumType = cyNumType;
  844 + }
835 845 public Map<String, String> getMildAnaemia() {
836 846 return mildAnaemia;
837 847 }