jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 14d7d0abd3c3ce73ee22d9763d8d43cbe3218178

Authored by changpengfei
2 parents 44754af2a1 96c22cbb9a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java View file @ 14d7d0a
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.platform.biz.service.BasicConfigService;
3 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
4 5 import com.lyms.platform.common.dao.BaseMongoDAOImpl;
5 6 import com.lyms.platform.common.dao.operator.MongoCondition;
... ... @@ -10,6 +11,8 @@
10 11 import com.lyms.platform.common.result.BaseObjectResponse;
11 12 import com.lyms.platform.common.utils.StringUtils;
12 13 import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult;
  14 +import com.lyms.platform.permission.service.OrganizationService;
  15 +import com.lyms.platform.permission.service.UsersService;
13 16 import com.lyms.platform.pojo.LhBabyBirthDefectTabModel;
14 17 import com.lyms.platform.pojo.QhdDischargedDiagnose;
15 18 import com.lyms.platform.query.LhBabyBirthDefectTabQuery;
... ... @@ -26,6 +29,12 @@
26 29 private OperateLogFacade operateLogFacade;
27 30 @Autowired
28 31 private AutoMatchFacade autoMatchFacade;
  32 + @Autowired
  33 + private BasicConfigService basicConfigService;
  34 + @Autowired
  35 + private UsersService usersService;
  36 + @Autowired
  37 + private OrganizationService organizationService;
29 38  
30 39 /**
31 40 * //查询-隆化-出生缺陷儿登记表-编辑页面读取数据
32 41  
... ... @@ -33,10 +42,10 @@
33 42 * @return
34 43 */
35 44 public BaseObjectResponse queryUpdateLhBabyBirthDefectTab(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery) {
  45 + BaseObjectResponse br = new BaseObjectResponse();
36 46 lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
37 47 MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery();
38 48 LhBabyBirthDefectTabModel babyBirthDefectTab=findOne(query.convertToMongoQuery());
39   - BaseObjectResponse br = new BaseObjectResponse();
40 49 br.setData(babyBirthDefectTab);
41 50 br.setErrorcode(ErrorCodeConstants.SUCCESS);
42 51 br.setErrormsg("成功");
43 52  
... ... @@ -48,13 +57,18 @@
48 57 * @return
49 58 */
50 59 public BaseObjectResponse queryLhBabyBirthDefectTab(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery) {
  60 + BaseObjectResponse br = new BaseObjectResponse();
51 61 lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
52 62 MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery();
53 63 LhBabyBirthDefectTabModel babyBirthDefectTabModel=findOne(query.convertToMongoQuery());
54 64 //整理返回数据
55   - LhBabyBirthDefectTabResult lhBabyBirthDefectTabResult=new LhBabyBirthDefectTabResult();
56   - lhBabyBirthDefectTabResult.convertToResult(babyBirthDefectTabModel);
57   - BaseObjectResponse br = new BaseObjectResponse();
  65 + LhBabyBirthDefectTabResult lhBabyBirthDefectTabResult=null;
  66 + if(null!=babyBirthDefectTabModel) {
  67 + lhBabyBirthDefectTabResult= new LhBabyBirthDefectTabResult().convertToResult(babyBirthDefectTabModel,
  68 + basicConfigService,
  69 + usersService,
  70 + organizationService);
  71 + }
58 72 br.setData(lhBabyBirthDefectTabResult);
59 73 br.setErrorcode(ErrorCodeConstants.SUCCESS);
60 74 br.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java View file @ 14d7d0a
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.platform.biz.service.BasicConfigService;
3 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
4 5 import com.lyms.platform.common.dao.BaseMongoDAOImpl;
5 6 import com.lyms.platform.common.dao.operator.MongoCondition;
... ... @@ -11,6 +12,8 @@
11 12 import com.lyms.platform.common.utils.StringUtils;
12 13 import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult;
13 14 import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult;
  15 +import com.lyms.platform.permission.service.OrganizationService;
  16 +import com.lyms.platform.permission.service.UsersService;
14 17 import com.lyms.platform.pojo.LhBabyBirthDefectTabModel;
15 18 import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel;
16 19 import com.lyms.platform.query.LhBabyBirthDefectTabQuery;
... ... @@ -25,6 +28,8 @@
25 28 private OperateLogFacade operateLogFacade;
26 29 @Autowired
27 30 private AutoMatchFacade autoMatchFacade;
  31 + @Autowired
  32 + private BasicConfigService basicConfigService;
28 33  
29 34 /**
30 35 * 查询-隆化-妊娠结局记录表-编辑页面读取数据
31 36  
... ... @@ -32,10 +37,10 @@
32 37 * @return
33 38 */
34 39 public BaseObjectResponse queryUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
  40 + BaseObjectResponse br = new BaseObjectResponse();
35 41 lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
36 42 MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
37 43 LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
38   - BaseObjectResponse br = new BaseObjectResponse();
39 44 br.setData(lhBabyGravidityEndingTabModel);
40 45 br.setErrorcode(ErrorCodeConstants.SUCCESS);
41 46 br.setErrormsg("成功");
42 47  
... ... @@ -47,14 +52,17 @@
47 52 * @return
48 53 */
49 54 public BaseObjectResponse queryLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
  55 + BaseObjectResponse br = new BaseObjectResponse();
50 56 lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
51 57 MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
52 58 LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
53 59 //整理返回数据
54   - LhBabyGravidityEndingTabResult lhBabyBirthDefectTabResult=new LhBabyGravidityEndingTabResult();
55   - lhBabyBirthDefectTabResult.convertToResult(lhBabyGravidityEndingTabModel);
56   - BaseObjectResponse br = new BaseObjectResponse();
57   - br.setData(lhBabyBirthDefectTabResult);
  60 + LhBabyGravidityEndingTabResult lhBabyGravidityEndingTabResult=null;
  61 + if(null!=lhBabyGravidityEndingTabModel){
  62 + lhBabyGravidityEndingTabResult=new LhBabyGravidityEndingTabResult().convertToResult(lhBabyGravidityEndingTabModel,
  63 + basicConfigService);
  64 + }
  65 + br.setData(lhBabyGravidityEndingTabResult);
58 66 br.setErrorcode(ErrorCodeConstants.SUCCESS);
59 67 br.setErrormsg("成功");
60 68 return br;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyBirthDefectTabResult.java View file @ 14d7d0a
... ... @@ -15,7 +15,7 @@
15 15  
16 16 import java.util.Date;
17 17  
18   -public class LhBabyBirthDefectTabResult implements IBasicResultConvert<LhBabyBirthDefectTabResult, LhBabyBirthDefectTabModel> {
  18 +public class LhBabyBirthDefectTabResult {
19 19 private String id;
20 20 //是否删除（YnEnums）
21 21 private Integer yn;
22 22  
... ... @@ -585,15 +585,11 @@
585 585 }
586 586  
587 587  
588   - @Autowired
589   - private BasicConfigService basicConfigService;
590   - @Autowired
591   - private UsersService usersService;
592   - @Autowired
593   - private OrganizationService organizationService;
594 588  
595   - @Override
596   - public LhBabyBirthDefectTabResult convertToResult(LhBabyBirthDefectTabModel model) {
  589 + public LhBabyBirthDefectTabResult convertToResult(LhBabyBirthDefectTabModel model,
  590 + BasicConfigService basicConfigService,
  591 + UsersService usersService,
  592 + OrganizationService organizationService) {
597 593  
598 594 try {
599 595 setId(model.getId());
... ... @@ -611,7 +607,7 @@
611 607 //父亲年龄
612 608 setfAge(model.getfAge());
613 609 //父亲民族
614   - setfNationId(model.getfNationId());
  610 + setfNationId(CommonsHelper.getName1(model.getfNationId(),basicConfigService));
615 611 //父亲身份证号
616 612 setfCardNo(model.getfCardNo());
617 613  
... ... @@ -620,7 +616,7 @@
620 616 //母亲年龄
621 617 setmAge(model.getmAge());
622 618 //母亲民族
623   - setmNationId(model.getmNationId());
  619 + setmNationId(CommonsHelper.getName1(model.getmNationId(), basicConfigService));
624 620 //母亲身份证号
625 621 setmCardNo(model.getmCardNo());
626 622 //孕次
... ... @@ -628,11 +624,7 @@
628 624 //产次
629 625 setParity(model.getParity());
630 626 //常住地（LhDomicileEnum）
631   - StringBuilder domicile=new StringBuilder();
632   - for (Object o : StringUtils.covertToList(model.getDomicile(), null)) {
633   - domicile.append(LhDomicileEnum.getName(o.toString())+",");
634   - }
635   - setDomicile(StringUtils.isNotEmpty(domicile.toString())?domicile.toString():null);
  627 + setDomicile(LhDomicileEnum.getName(model.getDomicile()));
636 628  
637 629 /**
638 630 * 现住址
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java View file @ 14d7d0a
... ... @@ -15,7 +15,7 @@
15 15  
16 16 import java.util.Date;
17 17  
18   -public class LhBabyGravidityEndingTabResult implements IBasicResultConvert<LhBabyGravidityEndingTabResult, LhBabyGravidityEndingTabModel> {
  18 +public class LhBabyGravidityEndingTabResult {
19 19 private String id;
20 20 //是否删除（YnEnums）
21 21 private Integer yn;
... ... @@ -400,15 +400,8 @@
400 400  
401 401  
402 402  
403   - @Autowired
404   - private BasicConfigService basicConfigService;
405   - @Autowired
406   - private UsersService usersService;
407   - @Autowired
408   - private OrganizationService organizationService;
409   -
410   - @Override
411   - public LhBabyGravidityEndingTabResult convertToResult(LhBabyGravidityEndingTabModel model) {
  403 + public LhBabyGravidityEndingTabResult convertToResult(LhBabyGravidityEndingTabModel model,
  404 + BasicConfigService basicConfigService) {
412 405  
413 406 try {
414 407 setId(model.getId());