Commit 8aedc4882e84a64e144d48366bf9c7ef2b92ca93
1 parent
97fc1be386
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 114 additions and 75 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
8aedc48
... | ... | @@ -1930,6 +1930,10 @@ |
1930 | 1930 | buildInfo = build; |
1931 | 1931 | } |
1932 | 1932 | |
1933 | + if (build != null && build.getYn() == YnEnums.YES.getId()) { | |
1934 | + result.setIsBuild(true); | |
1935 | + } | |
1936 | + | |
1933 | 1937 | Map<String, String> buildRecords = new HashMap<>(); |
1934 | 1938 | buildRecords.put("id", build.getId()); |
1935 | 1939 | buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
8aedc48
... | ... | @@ -889,81 +889,7 @@ |
889 | 889 | temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; |
890 | 890 | } |
891 | 891 | } |
892 | - | |
893 | - StringBuilder positive = new StringBuilder(); /** 阳性项目 */ | |
894 | - if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { | |
895 | - positive.append("外眼观察(右) "); | |
896 | - } | |
897 | - if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { | |
898 | - positive.append("外眼观察(左) "); | |
899 | - } | |
900 | - if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { | |
901 | - positive.append("瞬目反射(右) "); | |
902 | - } | |
903 | - if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { | |
904 | - positive.append("瞬目反射(左) "); | |
905 | - } | |
906 | - if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { | |
907 | - positive.append("瞳孔对光反射(右) "); | |
908 | - } | |
909 | - if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { | |
910 | - positive.append("瞳孔对光反射(左) "); | |
911 | - } | |
912 | - if ("yang".equals(babyEyeCheck.getRedRightReflex())) { | |
913 | - positive.append("瞳孔红光反射(右) "); | |
914 | - } | |
915 | - if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { | |
916 | - positive.append("瞳孔红光反射(左) "); | |
917 | - } | |
918 | - if ("yang".equals(babyEyeCheck.getRedReflex())) { | |
919 | - positive.append("红光反射 "); | |
920 | - } | |
921 | - if ("yang".equals(babyEyeCheck.getConjunctiva())) { | |
922 | - positive.append("结膜 "); | |
923 | - } | |
924 | - if ("yang".equals(babyEyeCheck.getCorneal())) { | |
925 | - positive.append("角膜 "); | |
926 | - } | |
927 | - if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { | |
928 | - positive.append("泪器 "); | |
929 | - } | |
930 | - if ("yang".equals(babyEyeCheck.getNystagmus())) { | |
931 | - positive.append("视动性眼震 "); | |
932 | - } | |
933 | - if ("yang".equals(babyEyeCheck.getExtEyelook())) { | |
934 | - positive.append("外眼观察 "); | |
935 | - } | |
936 | - if ("yang".equals(babyEyeCheck.getEyePositionId2())) { | |
937 | - positive.append("眼位(医生判定)"); | |
938 | - } | |
939 | - if ("yang".equals(babyEyeCheck.getRedLeft2())) { | |
940 | - positive.append("红光反射(医生判定阳性)"); | |
941 | - } | |
942 | - if ("yang".equals(babyEyeCheck.getVision2())) { | |
943 | - positive.append("视力(医生判定阳性)"); | |
944 | - } | |
945 | - if ("yang".equals(babyEyeCheck.getY2())) { | |
946 | - positive.append("手持眼光仪(医生判定阳性)"); | |
947 | - } | |
948 | - if ("yang".equals(babyEyeCheck.getRefraction2())) { | |
949 | - if ("197".equals(babyEyeCheck.getHospitalId())) { | |
950 | - positive.append("屈光不正"); | |
951 | - } else { | |
952 | - positive.append("屈光(医生判定阳性)"); | |
953 | - } | |
954 | - | |
955 | - } | |
956 | - | |
957 | - if ("ruoyang".equals(babyEyeCheck.getRedRightReflex())) { | |
958 | - positive.append("瞳孔红光反射(右)(稍减弱)"); | |
959 | - } | |
960 | - if ("ruoyang".equals(babyEyeCheck.getRedLeftReflex())) { | |
961 | - positive.append("瞳孔红光反射(左)(稍减弱)"); | |
962 | - } | |
963 | - if ("ruoyang".equals(babyEyeCheck.getRedReflex())) { | |
964 | - positive.append("红光反射(稍减弱)"); | |
965 | - } | |
966 | - | |
892 | + StringBuilder positive = getYxxm(babyEyeCheck);//阳性项目 | |
967 | 893 | temp.put("positive", positive.toString()); |
968 | 894 | temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor())); |
969 | 895 | temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); |
... | ... | @@ -972,6 +898,115 @@ |
972 | 898 | restMap.add(temp); |
973 | 899 | } |
974 | 900 | return restMap; |
901 | + } | |
902 | + | |
903 | + /** | |
904 | + * 阳性项目 | |
905 | + * | |
906 | + * @param babyEyeCheck | |
907 | + * @Author: 武涛涛 | |
908 | + * @Date: 2020/7/23 14:28 | |
909 | + */ | |
910 | + private StringBuilder getYxxm(BabyEyeCheck babyEyeCheck) { | |
911 | + StringBuilder positive = new StringBuilder(); /** 阳性项目 */ | |
912 | + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { | |
913 | + positive.append("外眼观察(右) "); | |
914 | + } | |
915 | + if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { | |
916 | + positive.append("外眼观察(左) "); | |
917 | + } | |
918 | + if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { | |
919 | + positive.append("瞬目反射(右) "); | |
920 | + } | |
921 | + if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { | |
922 | + positive.append("瞬目反射(左) "); | |
923 | + } | |
924 | + if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { | |
925 | + positive.append("瞳孔对光反射(右) "); | |
926 | + } | |
927 | + if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { | |
928 | + positive.append("瞳孔对光反射(左) "); | |
929 | + } | |
930 | + if ("yang".equals(babyEyeCheck.getRedRightReflex())) { | |
931 | + positive.append("瞳孔红光反射(右) "); | |
932 | + } | |
933 | + if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { | |
934 | + positive.append("瞳孔红光反射(左) "); | |
935 | + } | |
936 | + if ("yang".equals(babyEyeCheck.getRedReflex())) { | |
937 | + positive.append("红光反射 "); | |
938 | + } | |
939 | + if ("yang".equals(babyEyeCheck.getConjunctiva())) { | |
940 | + positive.append("结膜 "); | |
941 | + } | |
942 | + if ("yang".equals(babyEyeCheck.getCorneal())) { | |
943 | + positive.append("角膜 "); | |
944 | + } | |
945 | + if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { | |
946 | + positive.append("泪器 "); | |
947 | + } | |
948 | + if ("yang".equals(babyEyeCheck.getNystagmus())) { | |
949 | + positive.append("视动性眼震 "); | |
950 | + } | |
951 | + if ("yang".equals(babyEyeCheck.getExtEyelook())) { | |
952 | + positive.append("外眼观察 "); | |
953 | + } | |
954 | + if ("yang".equals(babyEyeCheck.getEyePositionId2())) { | |
955 | + positive.append("眼位(医生判定)"); | |
956 | + } | |
957 | + if ("yang".equals(babyEyeCheck.getRedLeft2())) { | |
958 | + positive.append("红光反射(医生判定阳性)"); | |
959 | + } | |
960 | + if ("yang".equals(babyEyeCheck.getVision2())) { | |
961 | + positive.append("视力(医生判定阳性)"); | |
962 | + } | |
963 | + if ("yang".equals(babyEyeCheck.getY2())) { | |
964 | + positive.append("手持眼光仪(医生判定阳性)"); | |
965 | + } | |
966 | + if ("yang".equals(babyEyeCheck.getRefraction2())) { | |
967 | + if ("197".equals(babyEyeCheck.getHospitalId())) { | |
968 | + positive.append("屈光不正"); | |
969 | + } else { | |
970 | + positive.append("屈光(医生判定阳性)"); | |
971 | + } | |
972 | + | |
973 | + } | |
974 | + | |
975 | + if ("ruoyang".equals(babyEyeCheck.getRedRightReflex())) { | |
976 | + positive.append("瞳孔红光反射(右)(稍减弱)"); | |
977 | + } | |
978 | + if ("ruoyang".equals(babyEyeCheck.getRedLeftReflex())) { | |
979 | + positive.append("瞳孔红光反射(左)(稍减弱)"); | |
980 | + } | |
981 | + if ("ruoyang".equals(babyEyeCheck.getRedReflex())) { | |
982 | + positive.append("红光反射(稍减弱)"); | |
983 | + } | |
984 | + | |
985 | + if("2".equals(babyEyeCheck.getEyeAppearance())){ | |
986 | + positive.append("眼外观 "); | |
987 | + } | |
988 | + if("2".equals(babyEyeCheck.getRedReflexQhd())){ | |
989 | + positive.append("红光反射 "); | |
990 | + } | |
991 | + if("2".equals(babyEyeCheck.getBlinkReflex())){ | |
992 | + positive.append("瞬目反射 "); | |
993 | + } | |
994 | + if("2".equals(babyEyeCheck.getRedBallTest())){ | |
995 | + positive.append("红球试验 "); | |
996 | + } | |
997 | + if("2".equals(babyEyeCheck.getBehaviorObservation())){ | |
998 | + positive.append("视物行为观察 "); | |
999 | + } | |
1000 | + if("2".equals(babyEyeCheck.getRefractiveScreening())){ | |
1001 | + positive.append("屈光筛查 "); | |
1002 | + } | |
1003 | + if("2".equals(babyEyeCheck.getEyePositionExamination())){ | |
1004 | + positive.append("眼位检查 "); | |
1005 | + } | |
1006 | + if("2".equals(babyEyeCheck.getEyeMovement())){ | |
1007 | + positive.append("眼球运动 "); | |
1008 | + } | |
1009 | + return positive; | |
975 | 1010 | } |
976 | 1011 | |
977 | 1012 | private void doFilter(List<BabyEyeCheck> babyEyeChecks) { |