Commit 59aa130ad5118b4cf928803598845f6491c1c858

Authored by liquanyu
1 parent 4796e36516
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 3 additions and 552 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 59aa130
... ... @@ -31,7 +31,7 @@
31 31  
32 32 String key1 = "Lymsh@2020";
33 33  
34   - String d = aesEncrypt("2020-05-30",key1);
  34 + String d = aesEncrypt("2020-06-30",key1);
35 35 System.out.println("加密:" + d);
36 36 }
37 37  
platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java View file @ 59aa130
... ... @@ -372,558 +372,9 @@
372 372 //0 或者空孕检 1婚孕检
373 373 private Integer hyj;
374 374  
  375 + //孕次
  376 + private Integer yunSize;
375 377  
376   - public Integer getHyj() {
377   - return hyj;
378   - }
379 378  
380   - public void setHyj(Integer hyj) {
381   - this.hyj = hyj;
382   - }
383   -
384   - public Integer getSendCountry() {
385   - return sendCountry;
386   - }
387   -
388   - public void setSendCountry(Integer sendCountry) {
389   - this.sendCountry = sendCountry;
390   - }
391   -
392   -
393   - public String getId() {
394   - return id;
395   - }
396   -
397   - public void setId(String id) {
398   - this.id = id;
399   - }
400   -
401   - public String getCode() {
402   - return code;
403   - }
404   -
405   - public void setCode(String code) {
406   - this.code = code;
407   - }
408   -
409   - public Integer getVersion() {
410   - return version;
411   - }
412   -
413   - public void setVersion(Integer version) {
414   - this.version = version;
415   - }
416   -
417   - public String getHasUpload() {
418   - return hasUpload;
419   - }
420   -
421   - public void setHasUpload(String hasUpload) {
422   - this.hasUpload = hasUpload;
423   - }
424   -
425   - public String getHospitalId() {
426   - return hospitalId;
427   - }
428   -
429   - public void setHospitalId(String hospitalId) {
430   - this.hospitalId = hospitalId;
431   - }
432   -
433   - public String getCreateUser() {
434   - return createUser;
435   - }
436   -
437   - public void setCreateUser(String createUser) {
438   - this.createUser = createUser;
439   - }
440   -
441   - public Date getUpdateTime() {
442   - return updateTime;
443   - }
444   -
445   - public void setUpdateTime(Date updateTime) {
446   - this.updateTime = updateTime;
447   - }
448   -
449   - public Date getCreated() {
450   - return created;
451   - }
452   -
453   - public void setCreated(Date created) {
454   - this.created = created;
455   - }
456   -
457   - public String getHusbandNo() {
458   - return husbandNo;
459   - }
460   -
461   - public void setHusbandNo(String husbandNo) {
462   - this.husbandNo = husbandNo;
463   - }
464   -
465   - public String getHusbandName() {
466   - return husbandName;
467   - }
468   -
469   - public void setHusbandName(String husbandName) {
470   - this.husbandName = husbandName;
471   - }
472   -
473   - public String getHusbandNation() {
474   - return husbandNation;
475   - }
476   -
477   - public void setHusbandNation(String husbandNation) {
478   - this.husbandNation = husbandNation;
479   - }
480   -
481   - public Date getHusbandBirthday() {
482   - return husbandBirthday;
483   - }
484   -
485   - public void setHusbandBirthday(Date husbandBirthday) {
486   - this.husbandBirthday = husbandBirthday;
487   - }
488   -
489   - public String getHusbandAge() {
490   - return husbandAge;
491   - }
492   -
493   - public void setHusbandAge(String husbandAge) {
494   - this.husbandAge = husbandAge;
495   - }
496   -
497   - public String getHusbandEducational() {
498   - return husbandEducational;
499   - }
500   -
501   - public void setHusbandEducational(String husbandEducational) {
502   - this.husbandEducational = husbandEducational;
503   - }
504   -
505   - public String getHusbandCardType() {
506   - return husbandCardType;
507   - }
508   -
509   - public void setHusbandCardType(String husbandCardType) {
510   - this.husbandCardType = husbandCardType;
511   - }
512   -
513   - public String getHusbandCardNo() {
514   - return husbandCardNo;
515   - }
516   -
517   - public void setHusbandCardNo(String husbandCardNo) {
518   - this.husbandCardNo = husbandCardNo;
519   - }
520   -
521   - public String getHusbandCareer() {
522   - return husbandCareer;
523   - }
524   -
525   - public void setHusbandCareer(String husbandCareer) {
526   - this.husbandCareer = husbandCareer;
527   - }
528   -
529   - public String getHusbandAccountProvince() {
530   - return husbandAccountProvince;
531   - }
532   -
533   - public void setHusbandAccountProvince(String husbandAccountProvince) {
534   - this.husbandAccountProvince = husbandAccountProvince;
535   - }
536   -
537   - public String getHusbandAccountCity() {
538   - return husbandAccountCity;
539   - }
540   -
541   - public void setHusbandAccountCity(String husbandAccountCity) {
542   - this.husbandAccountCity = husbandAccountCity;
543   - }
544   -
545   - public String getHusbandAccountArea() {
546   - return husbandAccountArea;
547   - }
548   -
549   - public void setHusbandAccountArea(String husbandAccountArea) {
550   - this.husbandAccountArea = husbandAccountArea;
551   - }
552   -
553   - public String getHusbandAccountStreet() {
554   - return husbandAccountStreet;
555   - }
556   -
557   - public void setHusbandAccountStreet(String husbandAccountStreet) {
558   - this.husbandAccountStreet = husbandAccountStreet;
559   - }
560   -
561   - public String getHusbandAccountAddress() {
562   - return husbandAccountAddress;
563   - }
564   -
565   - public void setHusbandAccountAddress(String husbandAccountAddress) {
566   - this.husbandAccountAddress = husbandAccountAddress;
567   - }
568   -
569   - public String getHusbandCurrentProvince() {
570   - return husbandCurrentProvince;
571   - }
572   -
573   - public void setHusbandCurrentProvince(String husbandCurrentProvince) {
574   - this.husbandCurrentProvince = husbandCurrentProvince;
575   - }
576   -
577   - public String getHusbandCurrentCity() {
578   - return husbandCurrentCity;
579   - }
580   -
581   - public void setHusbandCurrentCity(String husbandCurrentCity) {
582   - this.husbandCurrentCity = husbandCurrentCity;
583   - }
584   -
585   - public String getHusbandCurrentArea() {
586   - return husbandCurrentArea;
587   - }
588   -
589   - public void setHusbandCurrentArea(String husbandCurrentArea) {
590   - this.husbandCurrentArea = husbandCurrentArea;
591   - }
592   -
593   - public String getHusbandCurrentStreet() {
594   - return husbandCurrentStreet;
595   - }
596   -
597   - public void setHusbandCurrentStreet(String husbandCurrentStreet) {
598   - this.husbandCurrentStreet = husbandCurrentStreet;
599   - }
600   -
601   - public String getHusbandCurrentAddress() {
602   - return husbandCurrentAddress;
603   - }
604   -
605   - public void setHusbandCurrentAddress(String husbandCurrentAddress) {
606   - this.husbandCurrentAddress = husbandCurrentAddress;
607   - }
608   -
609   - public String getHusbandAccountNature() {
610   - return husbandAccountNature;
611   - }
612   -
613   - public void setHusbandAccountNature(String husbandAccountNature) {
614   - this.husbandAccountNature = husbandAccountNature;
615   - }
616   -
617   - public String getHusbandZipCode() {
618   - return husbandZipCode;
619   - }
620   -
621   - public void setHusbandZipCode(String husbandZipCode) {
622   - this.husbandZipCode = husbandZipCode;
623   - }
624   -
625   - public String getWifeNo() {
626   - return wifeNo;
627   - }
628   -
629   - public void setWifeNo(String wifeNo) {
630   - this.wifeNo = wifeNo;
631   - }
632   -
633   - public String getWifeName() {
634   - return wifeName;
635   - }
636   -
637   - public void setWifeName(String wifeName) {
638   - this.wifeName = wifeName;
639   - }
640   -
641   - public String getWifeNation() {
642   - return wifeNation;
643   - }
644   -
645   - public void setWifeNation(String wifeNation) {
646   - this.wifeNation = wifeNation;
647   - }
648   -
649   - public Date getWifeBirthday() {
650   - return wifeBirthday;
651   - }
652   -
653   - public void setWifeBirthday(Date wifeBirthday) {
654   - this.wifeBirthday = wifeBirthday;
655   - }
656   -
657   - public String getWifeAge() {
658   - return wifeAge;
659   - }
660   -
661   - public void setWifeAge(String wifeAge) {
662   - this.wifeAge = wifeAge;
663   - }
664   -
665   - public String getWifeEducational() {
666   - return wifeEducational;
667   - }
668   -
669   - public void setWifeEducational(String wifeEducational) {
670   - this.wifeEducational = wifeEducational;
671   - }
672   -
673   - public String getWifeCardType() {
674   - return wifeCardType;
675   - }
676   -
677   - public void setWifeCardType(String wifeCardType) {
678   - this.wifeCardType = wifeCardType;
679   - }
680   -
681   - public String getWifeCardNo() {
682   - return wifeCardNo;
683   - }
684   -
685   - public void setWifeCardNo(String wifeCardNo) {
686   - this.wifeCardNo = wifeCardNo;
687   - }
688   -
689   - public String getWifeCareer() {
690   - return wifeCareer;
691   - }
692   -
693   - public void setWifeCareer(String wifeCareer) {
694   - this.wifeCareer = wifeCareer;
695   - }
696   -
697   - public String getWifeAccountProvince() {
698   - return wifeAccountProvince;
699   - }
700   -
701   - public void setWifeAccountProvince(String wifeAccountProvince) {
702   - this.wifeAccountProvince = wifeAccountProvince;
703   - }
704   -
705   - public String getWifeAccountCity() {
706   - return wifeAccountCity;
707   - }
708   -
709   - public void setWifeAccountCity(String wifeAccountCity) {
710   - this.wifeAccountCity = wifeAccountCity;
711   - }
712   -
713   - public String getWifeAccountArea() {
714   - return wifeAccountArea;
715   - }
716   -
717   - public void setWifeAccountArea(String wifeAccountArea) {
718   - this.wifeAccountArea = wifeAccountArea;
719   - }
720   -
721   - public String getWifeAccountStreet() {
722   - return wifeAccountStreet;
723   - }
724   -
725   - public void setWifeAccountStreet(String wifeAccountStreet) {
726   - this.wifeAccountStreet = wifeAccountStreet;
727   - }
728   -
729   - public String getWifeAccountAddress() {
730   - return wifeAccountAddress;
731   - }
732   -
733   - public void setWifeAccountAddress(String wifeAccountAddress) {
734   - this.wifeAccountAddress = wifeAccountAddress;
735   - }
736   -
737   - public String getWifeAccountNature() {
738   - return wifeAccountNature;
739   - }
740   -
741   - public void setWifeAccountNature(String wifeAccountNature) {
742   - this.wifeAccountNature = wifeAccountNature;
743   - }
744   -
745   - public String getWifeCurrentProvince() {
746   - return wifeCurrentProvince;
747   - }
748   -
749   - public void setWifeCurrentProvince(String wifeCurrentProvince) {
750   - this.wifeCurrentProvince = wifeCurrentProvince;
751   - }
752   -
753   - public String getWifeCurrentCity() {
754   - return wifeCurrentCity;
755   - }
756   -
757   - public void setWifeCurrentCity(String wifeCurrentCity) {
758   - this.wifeCurrentCity = wifeCurrentCity;
759   - }
760   -
761   - public String getWifeCurrentArea() {
762   - return wifeCurrentArea;
763   - }
764   -
765   - public void setWifeCurrentArea(String wifeCurrentArea) {
766   - this.wifeCurrentArea = wifeCurrentArea;
767   - }
768   -
769   - public String getWifeCurrentStreet() {
770   - return wifeCurrentStreet;
771   - }
772   -
773   - public void setWifeCurrentStreet(String wifeCurrentStreet) {
774   - this.wifeCurrentStreet = wifeCurrentStreet;
775   - }
776   -
777   - public String getWifeCurrentAddress() {
778   - return wifeCurrentAddress;
779   - }
780   -
781   - public void setWifeCurrentAddress(String wifeCurrentAddress) {
782   - this.wifeCurrentAddress = wifeCurrentAddress;
783   - }
784   -
785   - public String getWifeZipCode() {
786   - return wifeZipCode;
787   - }
788   -
789   - public void setWifeZipCode(String wifeZipCode) {
790   - this.wifeZipCode = wifeZipCode;
791   - }
792   -
793   - public String getHasSignBook() {
794   - return hasSignBook;
795   - }
796   -
797   - public void setHasSignBook(String hasSignBook) {
798   - this.hasSignBook = hasSignBook;
799   - }
800   -
801   - public Date getMarriageTime() {
802   - return marriageTime;
803   - }
804   -
805   - public void setMarriageTime(Date marriageTime) {
806   - this.marriageTime = marriageTime;
807   - }
808   -
809   - public String getWifePhone() {
810   - return wifePhone;
811   - }
812   -
813   - public void setWifePhone(String wifePhone) {
814   - this.wifePhone = wifePhone;
815   - }
816   -
817   - public String getHusbandPhone() {
818   - return husbandPhone;
819   - }
820   -
821   - public void setHusbandPhone(String husbandPhone) {
822   - this.husbandPhone = husbandPhone;
823   - }
824   -
825   - public String getFixedLineTelephone() {
826   - return fixedLineTelephone;
827   - }
828   -
829   - public void setFixedLineTelephone(String fixedLineTelephone) {
830   - this.fixedLineTelephone = fixedLineTelephone;
831   - }
832   -
833   - public Date getFillDate() {
834   - return fillDate;
835   - }
836   -
837   - public void setFillDate(Date fillDate) {
838   - this.fillDate = fillDate;
839   - }
840   -
841   - public String getDoctor() {
842   - return doctor;
843   - }
844   -
845   - public void setDoctor(String doctor) {
846   - this.doctor = doctor;
847   - }
848   -
849   - public Map<String, Object> getWifeBaseInfo() {
850   - return wifeBaseInfo;
851   - }
852   -
853   - public void setWifeBaseInfo(Map<String, Object> wifeBaseInfo) {
854   - this.wifeBaseInfo = wifeBaseInfo;
855   - }
856   -
857   - public Map<String, Object> getWifePhysiqueCheck() {
858   - return wifePhysiqueCheck;
859   - }
860   -
861   - public void setWifePhysiqueCheck(Map<String, Object> wifePhysiqueCheck) {
862   - this.wifePhysiqueCheck = wifePhysiqueCheck;
863   - }
864   -
865   - public Map<String, Object> getWifeClinicalCheck() {
866   - return wifeClinicalCheck;
867   - }
868   -
869   - public void setWifeClinicalCheck(Map<String, Object> wifeClinicalCheck) {
870   - this.wifeClinicalCheck = wifeClinicalCheck;
871   - }
872   -
873   - public Map<String, Object> getWifeBCheck() {
874   - return wifeBCheck;
875   - }
876   -
877   - public void setWifeBCheck(Map<String, Object> wifeBCheck) {
878   - this.wifeBCheck = wifeBCheck;
879   - }
880   -
881   - public Map<String, Object> getWifeOtherCheck() {
882   - return wifeOtherCheck;
883   - }
884   -
885   - public void setWifeOtherCheck(Map<String, Object> wifeOtherCheck) {
886   - this.wifeOtherCheck = wifeOtherCheck;
887   - }
888   -
889   - public Map<String, Object> getHusbandBaseInfo() {
890   - return husbandBaseInfo;
891   - }
892   -
893   - public void setHusbandBaseInfo(Map<String, Object> husbandBaseInfo) {
894   - this.husbandBaseInfo = husbandBaseInfo;
895   - }
896   -
897   - public Map<String, Object> getHusbandPhysiqueCheck() {
898   - return husbandPhysiqueCheck;
899   - }
900   -
901   - public void setHusbandPhysiqueCheck(Map<String, Object> husbandPhysiqueCheck) {
902   - this.husbandPhysiqueCheck = husbandPhysiqueCheck;
903   - }
904   -
905   - public Map<String, Object> getHusbandClinicalCheck() {
906   - return husbandClinicalCheck;
907   - }
908   -
909   - public void setHusbandClinicalCheck(Map<String, Object> husbandClinicalCheck) {
910   - this.husbandClinicalCheck = husbandClinicalCheck;
911   - }
912   -
913   - public Map<String, Object> getHusbandOtherCheck() {
914   - return husbandOtherCheck;
915   - }
916   -
917   - public void setHusbandOtherCheck(Map<String, Object> husbandOtherCheck) {
918   - this.husbandOtherCheck = husbandOtherCheck;
919   - }
920   -
921   - public Map<String, Object> getResultAdvice() {
922   - return resultAdvice;
923   - }
924   -
925   - public void setResultAdvice(Map<String, Object> resultAdvice) {
926   - this.resultAdvice = resultAdvice;
927   - }
928 379 }