liquanyu / regional-platform

Download as
Browse Code »

Commit 6e501599c27ac7e14dead525c018093c34dd9503

Authored by liquanyu
1 parent 18f27aac15
Exists in master and in 1 other branch dev

update

Showing 3 changed files with 10 additions and 19 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ 6e50159
... ... @@ -84,7 +84,7 @@
84 84 }
85 85  
86 86 public static void main(String[] args) {
87   - System.out.println(numCodeStr(2020010711L));
  87 + System.out.println("2021122".startsWith("2031"));
88 88 }
89 89  
90 90  
... ... @@ -419,18 +419,7 @@
419 419 if (numCode != null)
420 420 {
421 421 StringBuffer sb = new StringBuffer(String.valueOf(numCode));
422   - sb.insert(8,"-");
423   - return sb.toString();
424   - }
425   - return "";
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();
  422 + sb.insert(6,"-");
434 423 }
435 424 return "";
436 425 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 6e50159
... ... @@ -942,7 +942,7 @@
942 942  
943 943  
944 944  
945   - public void setRiskCode(String id)
  945 + public synchronized void setRiskCode(String id)
946 946 {
947 947 BabyModel babyModel = babyBookbuildingService.queryBabyById(id);
948 948 if (babyModel.getRiskCode() == null)
... ... @@ -954,7 +954,7 @@
954 954 }
955 955  
956 956  
957   - public synchronized void setRiskCode(BabyModel model)
  957 + public void setRiskCode(BabyModel model)
958 958 {
959 959 //高危儿童才设置编号
960 960 if (("216".equals(model.getHospitalId()) || "2100001377".equals(model.getHospitalId())) && model.getHighRisk() != null && model.getHighRisk() == 1)
961 961  
... ... @@ -970,9 +970,10 @@
970 970 List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
971 971 if (CollectionUtils.isNotEmpty(models))
972 972 {
973   - if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYearStr()))
  973 + if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).startsWith(DateUtil.getYearStr()))
974 974 {
975   - result = models.get(0).getRiskCode()+1;
  975 + Long l = Long.valueOf(String.valueOf(models.get(0).getRiskCode()).substring(4))+1;
  976 + result = Long.valueOf(String.valueOf(models.get(0).getRiskCode()).substring(0,4)+ l);
976 977 }
977 978 }
978 979 model.setRiskCode(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 6e50159
... ... @@ -968,9 +968,10 @@
968 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.getymd6()))
  971 + if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).startsWith(DateUtil.getymd6()))
972 972 {
973   - result = data.get(0).getNumCode()+1;
  973 + Long l = Long.valueOf(String.valueOf(data.get(0).getNumCode()).substring(8))+1;
  974 + result = Long.valueOf(String.valueOf(data.get(0).getNumCode()).substring(0,8)+ l);
974 975 }
975 976 }
976 977 checkup.setNumCode(result);