jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f8646c3484d3f68bd68c816b1261df7383d9abfe

Authored by jiangjiazhi
2 parents 9c4a3824e6 c61ac6bcdd
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ f8646c3
... ... @@ -26,7 +26,7 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   - String json = aesDecrypt("2D982B3ACAE8CEB83B8090DA41309C3C05501035A518DD9D8C7C4832822E9C89FFD818C6E6F0BD7651D378FCF72BACD0", key);
  29 + String json = aesDecrypt("8A915B4A1B26D283EF1981BE0BCE6E78967C3065177F856709C3E1C9BC35AAB19153BB512619EB7FCA97377FE682CAA9", key);
30 30 System.out.println("解密后：" + json);
31 31  
32 32 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ f8646c3
... ... @@ -660,9 +660,9 @@
660 660 ps.setInt(26, antExChuModel.getNeoDeath());
661 661 ps.setInt(27, antExChuModel.getBirthDefect());
662 662 if(antExChuModel.getHeight() != null){
663   - ps.setInt(28, Integer.parseInt(antExChuModel.getHeight()));
  663 + ps.setDouble(28, Double.parseDouble(antExChuModel.getHeight()));
664 664 }else{
665   - ps.setNull(28, Types.INTEGER);
  665 + ps.setNull(28, Types.DOUBLE);
666 666 }
667 667 if(antExChuModel.getWeight() != null){
668 668 ps.setDouble(29, Double.parseDouble(antExChuModel.getWeight()));
669 669  
... ... @@ -672,12 +672,12 @@
672 672 //体质指数（体重除以身高的平方（米的平方））
673 673 //身高米的平方
674 674 if(antExChuModel.getHeight() != null){
675   - Double wh = (double) Integer.parseInt(antExChuModel.getHeight()) / 100;
  675 + Double wh = Double.parseDouble(antExChuModel.getHeight()) / 100;
676 676 Double shen = wh * wh;
677 677 Double bmi = Double.parseDouble(antExChuModel.getWeight()) / shen;
678 678 ps.setDouble(30, bmi);
679 679 }else{
680   - ps.setNull(30, Types.INTEGER);
  680 + ps.setNull(30, Types.DOUBLE);
681 681 }
682 682 ps.setNull(31, Types.INTEGER);
683 683 ps.setNull(32, Types.INTEGER);
684 684  
... ... @@ -722,9 +722,9 @@
722 722 ps.setNull(48,Types.INTEGER);
723 723 }
724 724 if(antExChuModel.getBxbjs() != null){
725   - ps.setInt(49, Integer.parseInt(antExChuModel.getBxbjs()));
  725 + ps.setDouble(49, Double.parseDouble(antExChuModel.getBxbjs()));
726 726 }else{
727   - ps.setNull(49,Types.INTEGER);
  727 + ps.setNull(49,Types.DOUBLE);
728 728 }
729 729 if(antExChuModel.getPlatelet() != null){
730 730 ps.setInt(50, Integer.parseInt(antExChuModel.getPlatelet()));
731 731  
732 732  
733 733  
... ... @@ -732,16 +732,16 @@
732 732 ps.setNull(50,Types.INTEGER);
733 733 }
734 734 if(antExChuModel.getNdb() != null){
735   - ps.setInt(51, Integer.parseInt(antExChuModel.getNdb()));
  735 + ps.setDouble(51, Double.parseDouble(antExChuModel.getNdb()));
736 736 }else{
737   - ps.setNull(51,Types.INTEGER);
  737 + ps.setNull(51,Types.DOUBLE);
738 738 }
739 739 ps.setString(52, null);
740 740 ps.setString(53, null);
741 741 if(antExChuModel.getNt() != null){
742   - ps.setInt(54, Integer.parseInt(antExChuModel.getNt()));
  742 + ps.setDouble(54, Double.parseDouble(antExChuModel.getNt()));
743 743 }else{
744   - ps.setNull(54,Types.INTEGER);
  744 + ps.setNull(54,Types.DOUBLE);
745 745 }
746 746 ps.setString(55, null);
747 747 ps.setString(56, null);
748 748  
... ... @@ -773,9 +773,9 @@
773 773 ps.setString(58, null);
774 774 }
775 775 if(antExChuModel.getBloodSugar() != null){
776   - ps.setInt(59, Integer.parseInt(antExChuModel.getBloodSugar()));
  776 + ps.setDouble(59, Double.parseDouble(antExChuModel.getBloodSugar()));
777 777 }else{
778   - ps.setNull(59,Types.INTEGER);
  778 + ps.setNull(59,Types.DOUBLE);
779 779 }
780 780 if(antExChuModel.getXqgbzam() != null){
781 781 ps.setInt(60, Integer.parseInt(antExChuModel.getXqgbzam()));
782 782  
783 783  
784 784  
785 785  
786 786  
787 787  
788 788  
... ... @@ -793,24 +793,24 @@
793 793 ps.setNull(62,Types.INTEGER);
794 794 }
795 795 if(antExChuModel.getTotalBilirubin() != null){
796   - ps.setInt(63, Integer.parseInt(antExChuModel.getTotalBilirubin()));
  796 + ps.setDouble(63, Double.parseDouble(antExChuModel.getTotalBilirubin()));
797 797 }else{
798   - ps.setNull(63,Types.INTEGER);
  798 + ps.setNull(63,Types.DOUBLE);
799 799 }
800 800 if(antExChuModel.getJhBilirubin() != null){
801   - ps.setInt(64, Integer.parseInt(antExChuModel.getJhBilirubin()));
  801 + ps.setDouble(64, Double.parseDouble(antExChuModel.getJhBilirubin()));
802 802 }else{
803   - ps.setNull(64,Types.INTEGER);
  803 + ps.setNull(64,Types.DOUBLE);
804 804 }
805 805 if(antExChuModel.getXnsd() != null){
806   - ps.setInt(65, Integer.parseInt(antExChuModel.getXnsd()));
  806 + ps.setDouble(65, Double.parseDouble(antExChuModel.getXnsd()));
807 807 }else{
808   - ps.setNull(65,Types.INTEGER);
  808 + ps.setNull(65,Types.DOUBLE);
809 809 }
810 810 if(antExChuModel.getXqjq() != null){
811   - ps.setInt(66, Integer.parseInt(antExChuModel.getXqjq()));
  811 + ps.setDouble(66, Double.parseDouble(antExChuModel.getXqjq()));
812 812 }else{
813   - ps.setNull(66,Types.INTEGER);
  813 + ps.setNull(66,Types.DOUBLE);
814 814 }
815 815 if (map.get("ydfmw") != null) {
816 816 if("未见异常".equals(map.get("ydfmw").toString())){
817 817  
818 818  
819 819  
... ... @@ -1246,14 +1246,14 @@
1246 1246 }
1247 1247 ps.setString(7, antenatalExaminationModel.getChiefComplaint());
1248 1248 if(antenatalExaminationModel.getGongGao() != null){
1249   - ps.setInt(8, Integer.parseInt(antenatalExaminationModel.getGongGao()));
  1249 + ps.setDouble(8, Double.parseDouble(antenatalExaminationModel.getGongGao()));
1250 1250 }else{
1251   - ps.setNull(8,Types.INTEGER);
  1251 + ps.setNull(8,Types.DOUBLE);
1252 1252 }
1253 1253 if(antenatalExaminationModel.getAbdominalCircumference() != null){
1254   - ps.setInt(9, Integer.parseInt(antenatalExaminationModel.getAbdominalCircumference()));
  1254 + ps.setDouble(9, Double.parseDouble(antenatalExaminationModel.getAbdominalCircumference()));
1255 1255 }else{
1256   - ps.setNull(9,Types.INTEGER);
  1256 + ps.setNull(9,Types.DOUBLE);
1257 1257 }
1258 1258 ps.setString(10, null);//胎方位代码
1259 1259 ps.setNull(11, Types.INTEGER);//胎心率
... ... @@ -1267,7 +1267,7 @@
1267 1267 if(antenatalExaminationModel.getUrineProtein() != null){
1268 1268 ps.setDouble(15, Double.parseDouble(antenatalExaminationModel.getUrineProtein()));
1269 1269 }else{
1270   - ps.setNull(15,Types.INTEGER);
  1270 + ps.setNull(15,Types.DOUBLE);
1271 1271 }
1272 1272 ps.setString(16, null);
1273 1273 ps.setString(17, null);
... ... @@ -2596,7 +2596,7 @@
2596 2596 if(matdeliverFollowModel.getTemperature() != null && matdeliverFollowModel.getTemperature().length()>0){
2597 2597 ps.setDouble(8, Double.parseDouble(matdeliverFollowModel.getTemperature()));
2598 2598 }else{
2599   - ps.setNull(8,Types.INTEGER);
  2599 + ps.setNull(8,Types.DOUBLE);
2600 2600 }
2601 2601 ps.setString(9, matdeliverFollowModel.getFitnessDesc());
2602 2602 ps.setString(10, matdeliverFollowModel.getMentalityDesc());
2603 2603  
... ... @@ -3318,9 +3318,9 @@
3318 3318 ps.setNull(5, Types.DOUBLE);
3319 3319 }
3320 3320 if(StringUtils.isNotBlank(newbornVisit.getHeight())){
3321   - ps.setInt(6,Integer.parseInt(newbornVisit.getHeight()));
  3321 + ps.setDouble(6, Double.parseDouble(newbornVisit.getHeight()));
3322 3322 }else{
3323   - ps.setNull(6, Types.INTEGER);
  3323 + ps.setNull(6, Types.DOUBLE);
3324 3324 }
3325 3325 if("1".equals(newbornVisit.getFeedType())){
3326 3326 ps.setString(7,"1");
... ... @@ -3375,8 +3375,8 @@
3375 3375 ps.setString(16,null);
3376 3376 }
3377 3377 ps.setString(17,null);
3378   - ps.setNull(18, Types.INTEGER);
3379   - ps.setNull(19, Types.INTEGER);
  3378 + ps.setNull(18, Types.DOUBLE);
  3379 + ps.setNull(19, Types.DOUBLE);
3380 3380 ps.setNull(20, Types.INTEGER);
3381 3381 if(newbornVisit.getEye() != null){
3382 3382 if("未见异常".equals(newbornVisit.getEye())){
3383 3383  
... ... @@ -3760,9 +3760,9 @@
3760 3760 ps.setString(5,babyCheckModel.getId());
3761 3761 ps.setString(6, babyModel.getName());
3762 3762 if(babyCheckModel.getHeight() != null){
3763   - ps.setInt(7,Integer.parseInt(babyCheckModel.getHeight()));
  3763 + ps.setDouble(7, Double.parseDouble(babyCheckModel.getHeight()));
3764 3764 }else{
3765   - ps.setNull(7, Types.INTEGER);
  3765 + ps.setNull(7, Types.DOUBLE);
3766 3766 }
3767 3767 if(babyCheckModel.getHeightEvaluate() != null){
3768 3768 if("上".equals(babyCheckModel.getHeightEvaluate())){
3769 3769  
3770 3770  
3771 3771  
3772 3772  
3773 3773  
3774 3774  
... ... @@ -3820,30 +3820,30 @@
3820 3820 if(map != null){
3821 3821 if("yes".equals(map.get("yeaOrNo"))){
3822 3822 ps.setString(15,"1");
3823   - ps.setNull(16, Types.INTEGER);
3824   - ps.setNull(17,Types.INTEGER);
  3823 + ps.setNull(16, Types.DOUBLE);
  3824 + ps.setNull(17,Types.DOUBLE);
3825 3825 }else if("no".equals(map.get("yeaOrNo"))){
3826 3826 ps.setString(15,"0");
3827 3827 if(map.get("wbhcc1") != null){
3828   - ps.setInt(16,Integer.parseInt(map.get("wbhcc1")));
  3828 + ps.setDouble(16,Double.parseDouble(map.get("wbhcc1")));
3829 3829 }else{
3830   - ps.setNull(16,Types.INTEGER);
  3830 + ps.setNull(16,Types.DOUBLE);
3831 3831 }
3832 3832 if(map.get("wbhcc2") != null){
3833   - ps.setInt(17,Integer.parseInt(map.get("wbhcc2")));
  3833 + ps.setDouble(17, Double.parseDouble(map.get("wbhcc2")));
3834 3834 }else{
3835   - ps.setNull(17,Types.INTEGER);
  3835 + ps.setNull(17,Types.DOUBLE);
3836 3836 }
3837 3837 }else{
3838 3838 ps.setString(15,null);
3839   - ps.setNull(16, Types.INTEGER);
3840   - ps.setNull(17,Types.INTEGER);
  3839 + ps.setNull(16, Types.DOUBLE);
  3840 + ps.setNull(17,Types.DOUBLE);
3841 3841 }
3842 3842 }
3843 3843 }else{
3844 3844 ps.setString(15,null);
3845   - ps.setNull(16, Types.INTEGER);
3846   - ps.setNull(17, Types.INTEGER);
  3845 + ps.setNull(16, Types.DOUBLE);
  3846 + ps.setNull(17, Types.DOUBLE);
3847 3847 }
3848 3848 /*if(babyCheckModel.getNeck() != null){
3849 3849 Map<String,String> map = JsonUtil.str2Obj(babyCheckModel.getNeck(), Map.class);
... ... @@ -3875,10 +3875,10 @@
3875 3875 }else{
3876 3876 ps.setString(19,null);
3877 3877 }
3878   - ps.setNull(20,Types.INTEGER);
3879   - ps.setNull(21,Types.INTEGER);
3880   - ps.setNull(22,Types.INTEGER);
3881   - ps.setNull(23,Types.INTEGER);
  3878 + ps.setNull(20,Types.DOUBLE);
  3879 + ps.setNull(21,Types.DOUBLE);
  3880 + ps.setNull(22,Types.DOUBLE);
  3881 + ps.setNull(23,Types.DOUBLE);
3882 3882 if(babyCheckModel.getEar() != null){
3883 3883 if("未见异常".equals(babyCheckModel.getEar())){
3884 3884 ps.setString(24,"0");
3885 3885  
3886 3886  
... ... @@ -3959,11 +3959,11 @@
3959 3959 ps.setString(40,null);
3960 3960 }
3961 3961 if(babyCheckModel.getHemoglobin() != null){
3962   - ps.setDouble(41, Double.parseDouble(babyCheckModel.getHemoglobin()));
  3962 + ps.setInt(41, Integer.parseInt(babyCheckModel.getHemoglobin()));
3963 3963 }else{
3964   - ps.setNull(41,Types.DOUBLE);
  3964 + ps.setNull(41,Types.INTEGER);
3965 3965 }
3966   - ps.setNull(42, Types.INTEGER);
  3966 + ps.setNull(42, Types.DOUBLE);
3967 3967 ps.setString(43, null);
3968 3968 ps.setNull(44, Types.INTEGER);
3969 3969 ps.setString(45, null);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ f8646c3
... ... @@ -1986,6 +1986,15 @@
1986 1986 return br;
1987 1987 }
1988 1988  
  1989 + @RequestMapping(value = "/zc/Yf")
  1990 + @ResponseBody
  1991 + public BaseObjectResponse saveYf(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate) {
  1992 + BaseObjectResponse br = zcPrenatalService.saveYf(startDate, endDate);
  1993 + return br;
  1994 + }
  1995 +
  1996 +
  1997 +
1989 1998  
1990 1999 /**
1991 2000 * 承德智业基本信息测试