jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 08e3705618f7a40def4cb18a8e06298ccef2b050

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

//秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)

Showing 6 changed files with 94 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java View file @ 08e3705
... ... @@ -224,6 +224,21 @@
224 224  
225 225 private String auxiliaryExamin;//辅助检查
226 226  
  227 + /**
  228 + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  229 + */
  230 + //出院诊断list<map>
  231 + private List<Map<String,Object>> cyzdList;
  232 +
  233 + public List<Map<String, Object>> getCyzdList() {
  234 + return cyzdList;
  235 + }
  236 +
  237 + public void setCyzdList(List<Map<String, Object>> cyzdList) {
  238 + this.cyzdList = cyzdList;
  239 + }
  240 + /***********************************************************/
  241 +
227 242 public String getParentAssess() {
228 243 return parentAssess;
229 244 }
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 08e3705
... ... @@ -721,6 +721,21 @@
721 721 }
722 722 /***********************************************************/
723 723  
  724 + /**
  725 + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  726 + */
  727 + //出院诊断list<map>
  728 + private List<Map<String,Object>> cyzdList;
  729 +
  730 + public List<Map<String, Object>> getCyzdList() {
  731 + return cyzdList;
  732 + }
  733 +
  734 + public void setCyzdList(List<Map<String, Object>> cyzdList) {
  735 + this.cyzdList = cyzdList;
  736 + }
  737 + /***********************************************************/
  738 +
724 739 public Integer getDeafnessGene() {
725 740 return deafnessGene;
726 741 }
platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java View file @ 08e3705
... ... @@ -384,13 +384,13 @@
384 384 condition = condition.and("number", number, MongoOper.IS);
385 385 }
386 386 //秦皇岛新模块区分参数（0:不包含4个类别，1:只查4个类别）
387   - if(CollectionUtils.isNotEmpty(cyzd)){
388   - if(classify==1){
389   - condition=condition.and("cyzd", cyzd, MongoOper.IN);
390   - }else {
391   - condition=condition.and("cyzd", cyzd, MongoOper.NIN);
392   - }
393   - }
  387 +// if(CollectionUtils.isNotEmpty(cyzd)){
  388 +// if(classify==1){
  389 +// condition=condition.and("cyzd", cyzd, MongoOper.IN);
  390 +// }else {
  391 +// condition=condition.and("cyzd", cyzd, MongoOper.NIN);
  392 +// }
  393 +// }
394 394 Criteria c = null;
395 395 //月龄
396 396 /*if (null != monthStart) {
397 397  
... ... @@ -495,11 +495,30 @@
495 495 c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
496 496 }
497 497 }
498   - if (c != null) {
499   - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
  498 + //秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  499 + Criteria cor=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空
  500 + if(CollectionUtils.isNotEmpty(cyzd)){
  501 + if(classify==1){
  502 + MongoCondition con = MongoCondition.newInstance();
  503 + MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.IN);
  504 + MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.IN);
  505 + cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  506 + }else {
  507 + MongoCondition con = MongoCondition.newInstance();
  508 + MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.NIN);
  509 + MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.NIN);
  510 + cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  511 + }
500 512 }
501 513  
502   - return condition.toMongoQuery();
  514 + /**
  515 + * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题
  516 + */
  517 + if(c!=null){
  518 + return new MongoCondition(c.andOperator(condition.getCriteria(),cor)).toMongoQuery();
  519 + }
  520 + return new MongoCondition(cor.andOperator(condition.getCriteria())).toMongoQuery();
  521 +
503 522 }
504 523  
505 524  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java View file @ 08e3705
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9 9 import com.lyms.platform.common.result.BaseResponse;
10 10 import com.lyms.platform.common.utils.DateUtil;
  11 +import com.lyms.platform.common.utils.JsonUtil;
11 12 import com.lyms.platform.common.utils.StringUtils;
12 13 import com.lyms.platform.common.utils.SystemConfig;
13 14 import com.lyms.platform.operate.web.request.BabyHighRiskBabyRequest;
... ... @@ -187,6 +188,8 @@
187 188  
188 189 model.setParentAssess(request.getParentAssess());
189 190 model.setAuxiliaryExamin(request.getAuxiliaryExamin());
  191 + //秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  192 + model.setCyzdList(request.getCyzdList());
190 193  
191 194 return model;
192 195 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java View file @ 08e3705
... ... @@ -238,6 +238,21 @@
238 238  
239 239 private String auxiliaryExamin;//辅助检查
240 240  
  241 + /**
  242 + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  243 + */
  244 + //出院诊断list<map>
  245 + private List<Map<String,Object>> cyzdList;
  246 +
  247 + public List<Map<String, Object>> getCyzdList() {
  248 + return cyzdList;
  249 + }
  250 +
  251 + public void setCyzdList(List<Map<String, Object>> cyzdList) {
  252 + this.cyzdList = cyzdList;
  253 + }
  254 + /***********************************************************/
  255 +
241 256 public String getParentAssess() {
242 257 return parentAssess;
243 258 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java View file @ 08e3705
... ... @@ -246,6 +246,21 @@
246 246 * 秦皇岛妇幼增加字典,end
247 247 */
248 248  
  249 + /**
  250 + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  251 + */
  252 + //出院诊断list<map>
  253 + private List<Map<String,Object>> cyzdList;
  254 +
  255 + public List<Map<String, Object>> getCyzdList() {
  256 + return cyzdList;
  257 + }
  258 +
  259 + public void setCyzdList(List<Map<String, Object>> cyzdList) {
  260 + this.cyzdList = cyzdList;
  261 + }
  262 + /***********************************************************/
  263 +
249 264 public List<Integer> getEvalMethod() {
250 265 return evalMethod;
251 266 }
... ... @@ -1138,6 +1153,8 @@
1138 1153  
1139 1154 //前囟{闭合、未闭合、未闭合尺寸x-y}
1140 1155 setBregma(destModel.getBregma());
  1156 + //秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
  1157 + setCyzdList(destModel.getCyzdList());
1141 1158  
1142 1159 } catch (Exception e) {
1143 1160 e.printStackTrace();