liquanyu / regional-platform

Download as
Browse Code »

Commit b5064a896571a1a120c631bccdd029987faf91c5

Authored by liquanyu
1 parent 65f9215ccd
Exists in master and in 1 other branch dev

婚检和儿童编号

Showing 11 changed files with 95 additions and 21 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java View file @ b5064a8
... ... @@ -47,7 +47,11 @@
47 47  
48 48 public List<PremaritalCheckup> queryPremaritalCheckupWithSort(PremaritalCheckupQuery query,String sortkey,Sort.Direction sort){
49 49 MongoQuery mongoQuery = query.convertToQuery();
50   - return premaritalCheckupDao.queryPremaritalCheckup(mongoQuery.addOrder(sort,sortkey));
  50 + if (StringUtils.isNotEmpty(query.getNeed())) {
  51 + query.mysqlBuild(premaritalCheckupDao.queryPremaritalCheckupCount(mongoQuery));
  52 + mongoQuery.start(query.getOffset()).end(query.getLimit());
  53 + }
  54 + return premaritalCheckupDao.queryPremaritalCheckup(mongoQuery.addOrder(sort, sortkey));
51 55 }
52 56  
53 57 }
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ b5064a8
... ... @@ -424,5 +424,15 @@
424 424 }
425 425 return "";
426 426 }
  427 +
  428 + public static String riskCodeStr(Long numCode) {
  429 + if (numCode != null)
  430 + {
  431 + StringBuffer sb = new StringBuffer(String.valueOf(numCode));
  432 + sb.insert(4,"-");
  433 + return sb.toString();
  434 + }
  435 + return "";
  436 + }
427 437 }
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ b5064a8
... ... @@ -1223,6 +1223,7 @@
1223 1223 public void setHasBlno(Boolean hasBlno) {
1224 1224 this.hasBlno = hasBlno;
1225 1225 }
  1226 + private Boolean riskCodeExist;
1226 1227 private Long riskCode;
1227 1228  
1228 1229 public Long getRiskCode() {
... ... @@ -1232,6 +1233,15 @@
1232 1233 public void setRiskCode(Long riskCode) {
1233 1234 this.riskCode = riskCode;
1234 1235 }
  1236 +
  1237 + public Boolean getRiskCodeExist() {
  1238 + return riskCodeExist;
  1239 + }
  1240 +
  1241 + public void setRiskCodeExist(Boolean riskCodeExist) {
  1242 + this.riskCodeExist = riskCodeExist;
  1243 + }
  1244 +
1235 1245 @Override
1236 1246 public MongoQuery convertToQuery() {
1237 1247 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -1248,6 +1258,9 @@
1248 1258 if (StringUtils.isNotEmpty(lastCheckDoctor)) {
1249 1259 condition = condition.and("lastCheckDoctor", lastCheckDoctor, MongoOper.IS);
1250 1260 }
  1261 + if (StringUtils.isNotEmpty(riskCode)) {
  1262 + condition = condition.and("riskCode", riskCode, MongoOper.IS);
  1263 + }
1251 1264  
1252 1265 if (StringUtils.isNotEmpty(apparatus) && StringUtils.isNotEmpty(doctorJudgement) ) {
1253 1266 MongoCondition con1 = MongoCondition.newInstance("apparatus", apparatus, MongoOper.IS);//器械判定阳性 类型
... ... @@ -1350,8 +1363,8 @@
1350 1363 condition = condition.and("dueWeek", dueWeek, MongoOper.LTE);
1351 1364 }
1352 1365  
1353   - if (null != riskCode) {
1354   - condition = condition.and("riskCode", true, MongoOper.EXISTS);
  1366 + if (null != riskCodeExist) {
  1367 + condition = condition.and("riskCode", riskCodeExist, MongoOper.EXISTS);
1355 1368 }
1356 1369 if (StringUtils.isNotEmpty(openDisease)) {
1357 1370 if ("2".equals(openDisease))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ b5064a8
... ... @@ -265,7 +265,8 @@
265 265 @RequestParam(value = "endCase", required = false) Integer endCase,
266 266 @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart,
267 267 @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd,
268   - @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor
  268 + @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor,
  269 + @RequestParam(value = "riskCode", required = false) String riskCode
269 270 ) {
270 271  
271 272 if (CollectionUtils.isNotEmpty(highRiskInfos)) {
... ... @@ -325,6 +326,7 @@
325 326 request.setDueWeekStart(dueWeekStart);
326 327 request.setDueWeekEnd(dueWeekEnd);
327 328 request.setLastCheckDoctor(lastCheckDoctor);
  329 + request.setRiskCode(riskCode);
328 330  
329 331 return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
330 332 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ b5064a8
... ... @@ -879,7 +879,7 @@
879 879 operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
880 880 model.setEndCase(0);//秦皇岛，默认未结案
881 881  
882   - setRiksCode(model);
  882 + setRiskCode(model);
883 883 model = babyBookbuildingService.addBabyBookbuilding(model);
884 884  
885 885  
886 886  
887 887  
888 888  
889 889  
890 890  
... ... @@ -939,25 +939,30 @@
939 939 }
940 940  
941 941  
942   - public synchronized void setRiksCode(BabyModel model)
  942 + public synchronized void setRiskCode(BabyModel model)
943 943 {
944   - Long result = Long.valueOf(DateUtil.getYmd()+"0001");
945   - BabyModelQuery babyQuery = new BabyModelQuery();
946   - babyQuery.setHospitalId(model.getHospitalId());
947   - babyQuery.setNeed("true");
948   - babyQuery.setPage(1);
949   - babyQuery.setLimit(1);
950   - babyQuery.setRiskCode(1L);
951   - babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
952   - List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
953   - if (CollectionUtils.isNotEmpty(models))
  944 + //高危儿童才设置编号
  945 + if (model.getHighRisk() != null && model.getHighRisk() == 1)
954 946 {
955   - if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
  947 + Long result = Long.valueOf(DateUtil.getYmd()+"1");
  948 + BabyModelQuery babyQuery = new BabyModelQuery();
  949 + babyQuery.setHospitalId(model.getHospitalId());
  950 + babyQuery.setNeed("true");
  951 + babyQuery.setPage(1);
  952 + babyQuery.setLimit(1);
  953 + babyQuery.setRiskCodeExist(true);
  954 + babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
  955 + List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  956 + if (CollectionUtils.isNotEmpty(models))
956 957 {
957   - result = models.get(0).getRiskCode()+1;
  958 + if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
  959 + {
  960 + result = models.get(0).getRiskCode()+1;
  961 + }
958 962 }
  963 + model.setRiskCode(result);
959 964 }
960   - model.setRiskCode(result);
  965 +
961 966 }
962 967  
963 968 /**
... ... @@ -2565,6 +2570,12 @@
2565 2570 babyQuery.setQueryNo(request.getQueryNo());
2566 2571 babyQuery.setOpenDisease(request.getOpenDisease());
2567 2572 babyQuery.setLastCheckDoctor(request.getLastCheckDoctor());
  2573 +
  2574 + if (StringUtils.isNotEmpty(request.getRiskCode()) && StringUtils.isNum(request.getRiskCode().replace("-","")))
  2575 + {
  2576 + babyQuery.setRiskCode(Long.valueOf(request.getRiskCode().replace("-","")));
  2577 + }
  2578 +
2568 2579  
2569 2580 //结案查询
2570 2581 babyQuery.setEndCase(request.getEndCase());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ b5064a8
... ... @@ -965,10 +965,10 @@
965 965 query.setNeed("y");
966 966 query.setYn(YnEnums.YES.getId());
967 967 query.setHospitalId(checkup.getHospitalId());
968   - List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
  968 + List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "numCode", Sort.Direction.DESC);
969 969 if (CollectionUtils.isNotEmpty(data))
970 970 {
971   - if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getYmd()))
  971 + if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getymd6()))
972 972 {
973 973 result = data.get(0).getNumCode()+1;
974 974 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ b5064a8
... ... @@ -5320,6 +5320,8 @@
5320 5320 }
5321 5321 }
5322 5322 }
  5323 +
  5324 + result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode()));
5323 5325 }
5324 5326  
5325 5327 /** 优惠券编号 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ b5064a8
... ... @@ -105,6 +105,15 @@
105 105 //分娩孕周
106 106 private Integer dueWeekEnd;
107 107 private String lastCheckDoctor;
  108 + private String riskCode;
  109 +
  110 + public String getRiskCode() {
  111 + return riskCode;
  112 + }
  113 +
  114 + public void setRiskCode(String riskCode) {
  115 + this.riskCode = riskCode;
  116 + }
108 117  
109 118 public String getLastCheckDoctor() {
110 119 return lastCheckDoctor;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ b5064a8
... ... @@ -82,6 +82,15 @@
82 82 private String openDisease;
83 83 private Integer dueWeek;
84 84 private String lastCheckDoctor;
  85 + private String riskCode;
  86 +
  87 + public String getRiskCode() {
  88 + return riskCode;
  89 + }
  90 +
  91 + public void setRiskCode(String riskCode) {
  92 + this.riskCode = riskCode;
  93 + }
85 94  
86 95 public String getLastCheckDoctor() {
87 96 return lastCheckDoctor;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ b5064a8
... ... @@ -321,7 +321,15 @@
321 321 private String openDisease;
322 322 private String openDiseaseType;
323 323 private String openDiseaseEndTime;
  324 + private String riskCode;
324 325  
  326 + public String getRiskCode() {
  327 + return riskCode;
  328 + }
  329 +
  330 + public void setRiskCode(String riskCode) {
  331 + this.riskCode = riskCode;
  332 + }
325 333  
326 334 public Integer getYn() {
327 335 return yn;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java View file @ b5064a8
... ... @@ -104,6 +104,12 @@
104 104 result.setLastCheckDoctor(usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName());
105 105 }
106 106  
  107 + if (model.getRiskCode() != null)
  108 + {
  109 + result.setRiskCode(StringUtils.riskCodeStr(model.getRiskCode()));
  110 + }
  111 +
  112 +
107 113 result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
108 114 result.setBabyName(StringUtils.emptyDeal(model.getName()));
109 115 result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));