jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 028fb58d54a7443394472db092439696c5e6c061

Authored by changpengfei
2 parents e1ab3145e2 f95ac1461c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master' into master

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java View file @ 028fb58
... ... @@ -27,7 +27,15 @@
27 27 @Autowired
28 28 private LhBabyGravidityEndingTabFacade lhBabyGravidityEndingTabFacade;
29 29  
30   - //查询-隆化-妊娠结局记录表
  30 + //查询-隆化-妊娠结局记录表-编辑页面读取数据
  31 + @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTab")
  32 + @ResponseBody
  33 + @TokenRequired
  34 + public BaseResponse queryUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery, HttpServletRequest request) {
  35 +
  36 + return lhBabyGravidityEndingTabFacade.queryUpdateLhBabyGravidityEndingTab(lhBabyGravidityEndingTabQuery);
  37 + }
  38 + //查询-隆化-妊娠结局记录表-查看页面解析
31 39 @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTab")
32 40 @ResponseBody
33 41 @TokenRequired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java View file @ 028fb58
... ... @@ -50,12 +50,12 @@
50 50 public BaseObjectResponse queryLhBabyBirthDefectTab(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery) {
51 51 lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
52 52 MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery();
53   - LhBabyBirthDefectTabModel babyBirthDefectTab=findOne(query.convertToMongoQuery());
  53 + LhBabyBirthDefectTabModel babyBirthDefectTabModel=findOne(query.convertToMongoQuery());
54 54 //整理返回数据
55 55 LhBabyBirthDefectTabResult lhBabyBirthDefectTabResult=new LhBabyBirthDefectTabResult();
56   - lhBabyBirthDefectTabResult.convertToResult(babyBirthDefectTab);
  56 + lhBabyBirthDefectTabResult.convertToResult(babyBirthDefectTabModel);
57 57 BaseObjectResponse br = new BaseObjectResponse();
58   - br.setData(babyBirthDefectTab);
  58 + br.setData(lhBabyBirthDefectTabResult);
59 59 br.setErrorcode(ErrorCodeConstants.SUCCESS);
60 60 br.setErrormsg("成功");
61 61 return br;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java View file @ 028fb58
... ... @@ -9,6 +9,8 @@
9 9 import com.lyms.platform.common.enums.YnEnums;
10 10 import com.lyms.platform.common.result.BaseObjectResponse;
11 11 import com.lyms.platform.common.utils.StringUtils;
  12 +import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult;
  13 +import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult;
12 14 import com.lyms.platform.pojo.LhBabyBirthDefectTabModel;
13 15 import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel;
14 16 import com.lyms.platform.query.LhBabyBirthDefectTabQuery;
15 17  
16 18  
... ... @@ -25,16 +27,34 @@
25 27 private AutoMatchFacade autoMatchFacade;
26 28  
27 29 /**
28   - * 查询-隆化-妊娠结局记录表
  30 + * 查询-隆化-妊娠结局记录表-编辑页面读取数据
29 31 * @param lhBabyGravidityEndingTabQuery
30 32 * @return
31 33 */
32   - public BaseObjectResponse queryLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
  34 + public BaseObjectResponse queryUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
33 35 lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
34 36 MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
35 37 LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
36 38 BaseObjectResponse br = new BaseObjectResponse();
37 39 br.setData(lhBabyGravidityEndingTabModel);
  40 + br.setErrorcode(ErrorCodeConstants.SUCCESS);
  41 + br.setErrormsg("成功");
  42 + return br;
  43 + }
  44 + /**
  45 + * 查询-隆化-妊娠结局记录表-查看页面解析
  46 + * @param lhBabyGravidityEndingTabQuery
  47 + * @return
  48 + */
  49 + public BaseObjectResponse queryLhBabyGravidityEndingTab(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) {
  50 + lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据（删除状态）
  51 + MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery();
  52 + LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery());
  53 + //整理返回数据
  54 + LhBabyGravidityEndingTabResult lhBabyBirthDefectTabResult=new LhBabyGravidityEndingTabResult();
  55 + lhBabyBirthDefectTabResult.convertToResult(lhBabyGravidityEndingTabModel);
  56 + BaseObjectResponse br = new BaseObjectResponse();
  57 + br.setData(lhBabyBirthDefectTabResult);
38 58 br.setErrorcode(ErrorCodeConstants.SUCCESS);
39 59 br.setErrormsg("成功");
40 60 return br;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/LhBabyGravidityEndingTabResult.java View file @ 028fb58
... ... @@ -450,225 +450,60 @@
450 450 /**
451 451 * 家庭住址
452 452 */
453   - //省
454   -// getName1(model.getProvinceId(),basicConfigService);
455   -// private String provinceId;
456   -// //市
457   -// private String cityId;
458   -// //区、县
459   -// private String areaId;
460   -// //街道
461   -// private String streetId;
462   -// //详细地址
463   -// private String address;
464   -// /**
465   -// * 随访机构
466   -// */
467   -// //省
468   -// private String sProvinceId;
469   -// //市
470   -// private String sCityId;
471   -// //区、县
472   -// private String sAreaId;
473   -// //街道
474   -// private String sStreetId;
475   -// //详细地址
476   -// private String sAddress;
  453 + //详细地址
  454 + setAddress(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
  455 + model.getAreaId(), model.getStreetId(),model.getAddress(), basicConfigService));
  456 + /**
  457 + * 随访机构
  458 + */
  459 + //随访详细地址
  460 + setsAddress(CommonsHelper.getResidence(model.getsProvinceId(), model.getsCityId(),
  461 + model.getsAreaId(), model.getsStreetId(),model.getsAddress(), basicConfigService));
477 462 //
478   -//
479   -//
480   -// /**
481   -// * 本次妊娠结局
482   -// */
483   -// //妊娠结局选项(LhgravidityEndingEnum)
484   -// private String gravidityEnding;
485   -// //其他
486   -// private String gravidityEndingOther;
487   -//
488   -// //性别（LhSexEnum）
489   -// private String babySex;
490   -// //出生体重
491   -// private String babyweight;
492   -//
493   -// //是否为多胞胎（LhMultipletsYnEnum）
494   -// private String multiplets;
495   -// //分娩日期
496   -// private Date childbirthDate;
497   -// //分娩孕周
498   -// private String dueWeek;
499   -// /**
500   -// * 分娩地点
501   -// */
502   -// //省
503   -// private String fProvinceId;
504   -// //市
505   -// private String fCityId;
506   -// //区、县
507   -// private String fAreaId;
508   -// //街道
509   -// private String fStreetId;
510   -// //详细地址
511   -// private String fAddress;
512   -//
513   -// //分娩机构（LhLaborAgenciesEnum）
514   -// private String laborAgencies;
515   -// //分娩机构-其他
516   -// private String laborAgenciesOther;
517   -//
518   -// //分娩方式(LhChildbirthWayEnum)
519   -// private String childbirthWay;
520   -// //分娩方式-其他
521   -// private String childbirthWayOther;
522   -// //婴儿42天存活情况(LhSurvivalCaseEnum)
523   -// private String survivalCase;
524   -//
525   -// //随访者签名
526   -// private String visitSign;
527   -//
528   -// //填表日期
529   -// private Date writeDate;
530   -// /**
531   -// * 1患儿家庭情况
532   -// */
533   -// //父亲姓名
534   -// setfName(model.getfName());
535   -// //父亲年龄
536   -// setfAge(model.getfAge());
537   -// //父亲民族
538   -// setfNationId(model.getfNationId());
539   -// //父亲身份证号
540   -// setfCardNo(model.getfCardNo());
541   -//
542   -// //母亲姓名
543   -// setmName(model.getmName());
544   -// //母亲年龄
545   -// setmAge(model.getmAge());
546   -// //母亲民族
547   -// setmNationId(model.getmNationId());
548   -// //母亲身份证号
549   -// setmCardNo(model.getmCardNo());
550   -// //孕次
551   -// setGravidity(model.getGravidity());
552   -// //产次
553   -// setParity(model.getParity());
554   -// //常住地（LhDomicileEnum）
555   -// StringBuilder domicile=new StringBuilder();
556   -// for (Object o : StringUtils.covertToList(model.getDomicile(), null)) {
557   -// domicile.append(LhDomicileEnum.getName(o.toString())+",");
558   -// }
559   -// setDomicile(StringUtils.isNotEmpty(domicile.toString())?domicile.toString():null);
560   -//
561   -// /**
562   -// * 现住址
563   -// */
564   -// //现住址 通过id编译
565   -// setAddress(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
566   -// model.getAreaId(), model.getStreetId(),model.getAddress(), basicConfigService));
567   -//
568   -// //邮编
569   -// setZipCode(model.getZipCode());
570   -// //联系电话
571   -// setPhone(model.getPhone());
572   -//
573   -// /**
574   -// * 2患儿基本情况
575   -// */
576   -// //出生日期
577   -// setBabyBirthDate(model.getBabyBirthDate());
578   -// //性别（LhSexEnum）
579   -// setBabySex(LhSexEnum.getName(model.getBabySex()));
580   -// //出生孕周
581   -// setBabyBirthWeek(model.getBabyBirthWeek());
582   -// //出生体重
583   -// setBabyweight(model.getBabyweight());
584   -// //胎儿数（LhFetusCountEnum）
585   -// setFetusCount(LhFetusCountEnum.getName(model.getFetusCount()));
586   -// //同卵，异卵(LhFetusCountEnum)
587   -// setIdenticalYn(LhFetusCountEnum.getName(model.getIdenticalYn()));
588   -// //转归（LhOutcomeEnum）
589   -// setOutcome(LhOutcomeEnum.getName(model.getOutcome()));
590   -// //诊断依据（LhDiagnosisBasisEnum）
591   -// StringBuilder diagnosisBasis=new StringBuilder();
592   -// for (Object o : StringUtils.covertToList(model.getDiagnosisBasis(), null)) {
593   -// diagnosisBasis.append(LhDiagnosisBasisEnum.getName(o.toString())+",");
594   -// }
595   -// setDiagnosisBasis(StringUtils.isNotEmpty(diagnosisBasis.toString())?diagnosisBasis.toString():null);
596   -// //诊断依据-其他
597   -// setDiagnosisBasisOther(model.getDiagnosisBasisOther());
598   -// //畸形确诊时间（LhDeformityTimeEnum）
599   -// setDeformityTime(LhDeformityTimeEnum.getName(model.getDeformityTime()));
600   -//
601   -// /**
602   -// * 3出生缺陷诊断
603   -// */
604   -// //出生缺陷诊断（LhBirthDefectEnum）
605   -// StringBuilder birthDefect=new StringBuilder();
606   -// for (Object o : StringUtils.covertToList(model.getBirthDefect(), null)) {
607   -// birthDefect.append(LhBirthDefectEnum.getName(o.toString())+",");
608   -// }
609   -// setBirthDefect(StringUtils.isNotEmpty(birthDefect.toString())?birthDefect.toString():null);
610   -// //其他
611   -// setBirthDefectOther(model.getBirthDefectOther());
612   -//
613   -// /**
614   -// * 4孕早期情况
615   -// */
616   -// //患病情况（LhIllnessCaseEnum）
617   -// StringBuilder illnessCase=new StringBuilder();
618   -// for (Object o : StringUtils.covertToList(model.getIllnessCase(), null)) {
619   -// illnessCase.append(LhIllnessCaseEnum.getName(o.toString())+",");
620   -// }
621   -// setIllnessCase(StringUtils.isNotEmpty(illnessCase.toString())?illnessCase.toString():null);
622   -// //肝炎类型（暂定手填）
623   -// setHepatitisType(model.getHepatitisType());
624   -// //患病情况-其他
625   -// setIllnessCaseOther(model.getIllnessCaseOther());
626   -//
627   -// //服药情况
628   -// //磺胺类-名称
629   -// setSulfanilamide(model.getSulfanilamide());
630   -// //抗生素-名称
631   -// setAntibiotics(model.getAntibiotics());
632   -// //避孕药-名称
633   -// setAcyeterion(model.getAcyeterion());
634   -// //镇静药-名称
635   -// setSedative(model.getSedative());
636   -// //服药情况-其他
637   -// setTakeCaseOther(model.getTakeCaseOther());
638   -//
639   -// //接触农药及其他有害因素
640   -// //农药-名称
641   -// setPesticide(model.getPesticide());
642   -// //射线类型（暂定手填）
643   -// setRayType(model.getRayType());
644   -// //酗酒-两/日
645   -// setBibulosity(model.getBibulosity());
646   -// //化学制剂-名称
647   -// setChemical(model.getChemical());
648   -// //接触农药及其他有害因素-其他
649   -// setRestsFactorOther(model.getRestsFactorOther());
650   -//
651   -// /**
652   -// *5诊断级别
653   -// */
654   -// //诊断级别（LhDiagnoseLvEnum）
655   -// setDiagnoseLv(LhDiagnoseLvEnum.getName(model.getDiagnoseLv()));
656   -// //诊断级别-其他
657   -// setDiagnoseLvOther(model.getDiagnoseLvOther());
658   -//
659   -// //填表人(当前登录医生姓名)
660   -// if(StringUtils.isNotEmpty(model.getPreparer())){
661   -// Users users = usersService.getUsers(Integer.parseInt(model.getPreparer()));
662   -// setPreparer(model.getPreparer());
663   -// setPreparerName(null!=users?users.getName():null);
664   -// }
665   -//
666   -// //填表单位（医院名称）
667   -// if(StringUtils.isNotEmpty(model.getHospitalId())){
668   -// Organization org = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
669   -// setHospitalId(model.getHospitalId());
670   -// setHospitalName(null!=org?org.getName():null);
671   -// }
  463 + /**
  464 + * 本次妊娠结局
  465 + */
  466 + //妊娠结局选项(LhgravidityEndingEnum)
  467 + StringBuilder gravidityEnding=new StringBuilder();
  468 + for (Object o : StringUtils.covertToList(model.getGravidityEnding(), null)) {
  469 + gravidityEnding.append(LhgravidityEndingEnum.getName(o.toString())+",");
  470 + }
  471 + setGravidityEnding(StringUtils.isNotEmpty(gravidityEnding.toString())?gravidityEnding.toString():null);
  472 + //其他
  473 + setGravidityEndingOther(model.getGravidityEndingOther());
  474 +
  475 + //性别（LhSexEnum）
  476 + setBabySex(LhSexEnum.getName(model.getBabySex()));
  477 + //出生体重
  478 + setBabyweight(model.getBabyweight());
  479 +
  480 + //是否为多胞胎（LhMultipletsYnEnum）
  481 + setMultiplets(LhMultipletsYnEnum.getName(model.getMultiplets()));
  482 + //分娩日期
  483 + setChildbirthDate(model.getChildbirthDate());
  484 + //分娩孕周
  485 + setDueWeek(model.getDueWeek());
  486 + /**
  487 + * 分娩地点
  488 + */
  489 + //详细地址
  490 + setfAddress(CommonsHelper.getResidence(model.getfProvinceId(), model.getfCityId(),
  491 + model.getfAreaId(), model.getfStreetId(),model.getfAddress(), basicConfigService));
  492 +
  493 + //分娩机构（LhLaborAgenciesEnum）
  494 + setLaborAgencies(LhLaborAgenciesEnum.getName(model.getLaborAgencies()));
  495 + //分娩机构-其他
  496 + setLaborAgenciesOther(model.getLaborAgenciesOther());
  497 +
  498 + //分娩方式(LhChildbirthWayEnum)
  499 + setChildbirthWay(LhChildbirthWayEnum.getName(model.getChildbirthWay()));
  500 + //分娩方式-其他
  501 + setChildbirthWayOther(model.getChildbirthWayOther());
  502 + //婴儿42天存活情况(LhSurvivalCaseEnum)
  503 + setSurvivalCase(LhSurvivalCaseEnum.getName(model.getSurvivalCase()));
  504 +
  505 + //随访者签名
  506 + setVisitSign(model.getVisitSign());
672 507  
673 508 //填表日期
674 509 setWriteDate(model.getWriteDate());