shiyang / regional-platform

Download as
Browse Code »

Commit d61bee6108131cffca777e77d13ec2875f5aa1ff

Authored by liquanyu
1 parent 7ff7b3d8bc
Exists in master and in 1 other branch nobuildprocess

code update

Showing 3 changed files with 74 additions and 68 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ d61bee6
... ... @@ -9,7 +9,9 @@
9 9 import org.bson.types.ObjectId;
10 10 import org.springframework.data.mongodb.core.query.Criteria;
11 11  
  12 +import java.util.Arrays;
12 13 import java.util.Date;
  14 +import java.util.List;
13 15  
14 16 /**
15 17 * 新生儿查询模型
... ... @@ -173,6 +175,16 @@
173 175 //诊断
174 176 private String lastDiagnose;
175 177  
  178 + private List<String> lastDiagnoses;
  179 +
  180 + public List<String> getLastDiagnoses() {
  181 + return lastDiagnoses;
  182 + }
  183 +
  184 + public void setLastDiagnoses(List<String> lastDiagnoses) {
  185 + this.lastDiagnoses = lastDiagnoses;
  186 + }
  187 +
176 188 public String getLastDiagnose() {
177 189 return lastDiagnose;
178 190 }
... ... @@ -361,6 +373,13 @@
361 373 if(!StringUtils.isEmpty(lastDiagnose)){
362 374 condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.LIKE);
363 375 }
  376 +
  377 + if (null != lastDiagnoses && lastDiagnoses.size() > 0) {
  378 + Criteria c = Criteria.where("lastDiagnose").in(lastDiagnoses);
  379 + condition.andCondition( new MongoCondition(c));
  380 + }
  381 +
  382 +
364 383 if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){
365 384 MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
366 385 MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ d61bee6
... ... @@ -714,10 +714,10 @@
714 714 //得到孕妇的id
715 715 Set<String> idset = getYuYuePatient(sendTimeType, tempHid);
716 716  
717   - for (String pid : idset)
  717 + for (String id : idset)
718 718 {
719 719 //查询符合条件的产妇
720   - patientsQuery.setId(pid);
  720 + patientsQuery.setId(id);
721 721 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
722 722 if (CollectionUtils.isNotEmpty(patients))
723 723 {
724 724  
725 725  
726 726  
... ... @@ -918,71 +918,37 @@
918 918 if (specialDateType == SpecialDateEnums.FWJS.getId())
919 919 {
920 920  
921   -// Date endDate = DateUtil.formatDate(new Date());
922   -//
923   -// patientsQuery.setYn(YnEnums.YES.getId());
924   -//// //1孕妇 3产妇
925   -// patientsQuery.setType(3);
926   -// patientsQuery.setBuildTypeEq(2);
927   -// patientsQuery.setFmDateStart(endDate);
928   -// patientsQuery.setFmDateEnd(endDate);
929   -//
930   -// List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
931   -// if (CollectionUtils.isNotEmpty(patients))
932   -// {
933   -// for (Patients pat : patients)
934   -// {
935   -//
936   -// //短信前缀
937   -// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor());
938   -// String messageContent = "【"+messagePrefix+"】"+template.getContent();
939   -// messageContent = replaceName(pat.getUsername(), messageContent);
940   -// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
941   -// pat.getHospitalId(),template.getId(),pat.getId());
942   -// messages.add(request);
943   -//
944   -// //更新成产妇状态 分娩时间设置成当前时间
945   -// pat.setType(3);
946   -// pat.setFmDate(new Date());
947   -// pat.setModified(new Date());
948   -// yunBookbuildingService.updatePregnant(pat, pat.getId());
949   -// }
950   -//
951   -// }
  921 + Date endDate = DateUtil.getNewDate(-42, "周", 0);
  922 + //把时间格式化成 yyyy_MM_dd 的日期
  923 + endDate = DateUtil.formatDate(endDate);
  924 + patientsQuery.setYn(YnEnums.YES.getId());
  925 + //1孕妇
  926 + patientsQuery.setType(1);
  927 + patientsQuery.setLastMensesEnd(endDate);
  928 + patientsQuery.setLastMensesStart(endDate);
952 929  
  930 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  931 + if (CollectionUtils.isNotEmpty(patients))
  932 + {
  933 + for (Patients pat : patients)
  934 + {
953 935  
  936 + //短信前缀
  937 + String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor());
  938 + String messageContent = "【"+messagePrefix+"】"+template.getContent();
  939 + messageContent = replaceName(pat.getUsername(), messageContent);
  940 + MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
  941 + pat.getHospitalId(),template.getId(),pat.getId());
  942 + messages.add(request);
954 943  
955   -// Date endDate = DateUtil.getNewDate(-42, "周", 0);
956   -// //把时间格式化成 yyyy_MM_dd 的日期
957   -// endDate = DateUtil.formatDate(endDate);
958   -// patientsQuery.setYn(YnEnums.YES.getId());
959   -// //1孕妇
960   -// patientsQuery.setType(1);
961   -// patientsQuery.setLastMensesEnd(endDate);
962   -// patientsQuery.setLastMensesStart(endDate);
963   -//
964   -// List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
965   -// if (CollectionUtils.isNotEmpty(patients))
966   -// {
967   -// for (Patients pat : patients)
968   -// {
969   -//
970   -// //短信前缀
971   -// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor());
972   -// String messageContent = "【"+messagePrefix+"】"+template.getContent();
973   -// messageContent = replaceName(pat.getUsername(), messageContent);
974   -// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(),
975   -// pat.getHospitalId(),template.getId(),pat.getId());
976   -// messages.add(request);
977   -//
978   -// //更新成产妇状态 分娩时间设置成当前时间
979   -// pat.setType(3);
980   -// pat.setFmDate(new Date());
981   -// pat.setModified(new Date());
982   -// yunBookbuildingService.updatePregnant(pat, pat.getId());
983   -// }
984   -//
985   -// }
  944 + //更新成产妇状态 分娩时间设置成当前时间
  945 + pat.setType(3);
  946 + pat.setFmDate(new Date());
  947 + pat.setModified(new Date());
  948 + yunBookbuildingService.updatePregnant(pat, pat.getId());
  949 + }
  950 +
  951 + }
986 952 }
987 953 //孕妇建档在 孕妇建档生成
988 954  
... ... @@ -1441,6 +1407,11 @@
1441 1407 messages.add(request);
1442 1408 }
1443 1409 }
  1410 + }
  1411 + //产妇服务结束
  1412 + else if (specialDateType == SpecialDateEnums.FWJS.getId())
  1413 + {
  1414 +
1444 1415 }
1445 1416 }
1446 1417 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ d61bee6
... ... @@ -1415,7 +1415,23 @@
1415 1415 babyQuery.setBirthEnd(start);
1416 1416 }
1417 1417  
1418   - babyQuery.setLastDiagnose(request.getDiagnose());
  1418 + if (StringUtils.isNotEmpty(request.getDiagnose()))
  1419 + {
  1420 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  1421 + basicConfigQuery.setYn(YnEnums.YES.getId());
  1422 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  1423 + basicConfigQuery.setKeyword(request.getDiagnose());
  1424 + List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
  1425 + List<String> diagnoseIds = new ArrayList<>();
  1426 + if (datas != null) {
  1427 + for (BasicConfig data : datas) {
  1428 + diagnoseIds.add(data.getId());
  1429 + }
  1430 +
  1431 + }
  1432 + babyQuery.setLastDiagnoses(diagnoseIds);
  1433 + }
  1434 +
1419 1435 //预约时间
1420 1436 if (StringUtils.isNotEmpty(request.getNextDate()))
1421 1437 {