jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 23d7f6d155cc69540308f5b99b3a9778a8043b0c

Authored by baohanddd
2 parents 142f4064a9 ca1d648d4d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 10 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ 23d7f6d
... ... @@ -389,16 +389,17 @@
389 389 mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray());
390 390  
391 391 try {
392   - List<String> list = FileUtils.readLines(new File("F:\\temp\\touwei.txt"),"gbk");
  392 + List<String> list = FileUtils.readLines(new File("F:\\temp\\shenggaobietiz.txt"),"gbk");
393 393 for (String line:list) {
394 394 if (line != null) {
395 395  
396 396 String[] array = line.split(",");
397 397  
398 398 AwModel awModel2 = new AwModel();
399   - awModel2.setType(2);
400   - awModel2.setSex(0);
401   - awModel2.setAge(Integer.valueOf(array[0]));
  399 + awModel2.setType(3);
  400 + awModel2.setSex(1);
  401 + awModel2.setAgeType(1);
  402 + awModel2.setHeight(Double.valueOf(array[0]));
402 403 awModel2.setRthreeDs(Double.valueOf(array[1]));
403 404 awModel2.setRtwoDs(Double.valueOf(array[2]));
404 405 awModel2.setRoneDs(Double.valueOf(array[3]));
platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java View file @ 23d7f6d
... ... @@ -9,7 +9,7 @@
9 9 public enum SmsProviderEnums {
10 10  
11 11  
12   - ALDY(1,"阿里大鱼"),YM(2,"易美");
  12 + YM(1,"易美"),ALDY(2,"阿里大鱼");
13 13  
14 14 SmsProviderEnums(int id, String name) {
15 15 this.id = id;
platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java View file @ 23d7f6d
... ... @@ -18,8 +18,29 @@
18 18 private Double poneDs;
19 19 private Double ptwoDs;
20 20 private Double pthreeDs;
21   - //0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表
  21 + //0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 3身高别体重
22 22 private Integer type;
  23 +
  24 + private Double height;
  25 +
  26 + //0 0-2岁 1 2-5岁
  27 + private Integer ageType;
  28 +
  29 + public Double getHeight() {
  30 + return height;
  31 + }
  32 +
  33 + public void setHeight(Double height) {
  34 + this.height = height;
  35 + }
  36 +
  37 + public Integer getAgeType() {
  38 + return ageType;
  39 + }
  40 +
  41 + public void setAgeType(Integer ageType) {
  42 + this.ageType = ageType;
  43 + }
23 44  
24 45 public Integer getType() {
25 46 return type;
platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ 23d7f6d
... ... @@ -23,6 +23,9 @@
23 23 @RequestMapping(value = "/template")
24 24 public void productSms(HttpServletResponse response){
25 25 smsService.productTemplateSms();
  26 + smsService.productChanAmsSms();
  27 + smsService.productYunAmsSms();
  28 + smsService.productChildAmsSms();
26 29  
27 30 // MessageListRequest list = new MessageListRequest();
28 31 // List<MessageRequest> messages = new ArrayList<>();
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 23d7f6d
... ... @@ -2183,7 +2183,7 @@
2183 2183 //计划发送时间
2184 2184 request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
2185 2185 //短信商
2186   - request.setServiceType(SmsProviderEnums.ALDY.getId());
  2186 + request.setServiceType(SmsProviderEnums.YM.getId());
2187 2187 request.setSubTypeId(smsType);
2188 2188 request.setStatus(SmsStatusEnums.WFS.getId());
2189 2189 request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 23d7f6d
... ... @@ -202,10 +202,12 @@
202 202 referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
203 203 List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(babyModel.getPid());
204 204 List lsit = new ArrayList();
205   - for(String str : diagnoseList){
206   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
207   - if(null!=basicConfig){
208   - lsit.add(basicConfig.getName());
  205 + if(CollectionUtils.isNotEmpty(diagnoseList)){
  206 + for(String str : diagnoseList){
  207 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
  208 + if(null!=basicConfig){
  209 + lsit.add(basicConfig.getName());
  210 + }
209 211 }
210 212 }
211 213 referralApplyOrderModel.setrRisk(lsit);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 23d7f6d
... ... @@ -609,7 +609,7 @@
609 609 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
610 610 mr.setPhone(babyModel.getMphone());
611 611 //短信商
612   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  612 + mr.setServiceType(SmsProviderEnums.YM.getId());
613 613 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
614 614 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
615 615 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
... ... @@ -960,6 +960,8 @@
960 960 result.setVcCardNo(model.getVcCardNo());
961 961 result.setHospitalId(model.getHospitalId());
962 962 result.setExpType(model.getExpType());
  963 +
  964 + result.setDueWeek(model.getDueWeek());
963 965 return result;
964 966 }
965 967  
... ... @@ -1591,7 +1593,7 @@
1591 1593 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
1592 1594 mr.setPhone(model.getMphone());
1593 1595 //短信商
1594   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  1596 + mr.setServiceType(SmsProviderEnums.YM.getId());
1595 1597 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
1596 1598 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
1597 1599 mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 23d7f6d
... ... @@ -655,11 +655,14 @@
655 655 if (pat != null)
656 656 {
657 657 BookbuildingRecordResult result = new BookbuildingRecordResult();
658   - Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
659   - if (org != null)
  658 + if (StringUtils.isNotEmpty(pat.getHospitalId()))
660 659 {
661   - result.setBookbuildHospital(org.getName());
662   - result.setHospitalId(String.valueOf(org.getId()));
  660 + Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
  661 + if (org != null)
  662 + {
  663 + result.setBookbuildHospital(org.getName());
  664 + result.setHospitalId(String.valueOf(org.getId()));
  665 + }
663 666 }
664 667 result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
665 668 result.setId(pat.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 23d7f6d
... ... @@ -547,7 +547,7 @@
547 547 mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType()));
548 548 mr.setPhone(model.getPhone());
549 549 //短信商
550   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  550 + mr.setServiceType(SmsProviderEnums.YM.getId());
551 551 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
552 552 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
553 553 mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 23d7f6d
... ... @@ -130,6 +130,16 @@
130 130 //体验类型
131 131 private Integer expType;
132 132  
  133 + //分娩孕周
  134 + private Integer dueWeek;
  135 +
  136 + public Integer getDueWeek() {
  137 + return dueWeek;
  138 + }
  139 +
  140 + public void setDueWeek(Integer dueWeek) {
  141 + this.dueWeek = dueWeek;
  142 + }
133 143  
134 144  
135 145 public Integer getExpType() {