jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b5e5005d7bd6a41ec81155b252912afc8212f019

Authored by Administrator
1 parent 07afd507d9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 13 additions and 141 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ b5e5005
... ... @@ -927,8 +927,7 @@
927 927 if (CollectionUtils.isNotEmpty(list)) {
928 928 List<Map> placentaList = new ArrayList<>();
929 929 for (String l : list) {
930   - if (StringUtils.isEmpty(l))
931   - {
  930 + if (StringUtils.isEmpty(l)) {
932 931 continue;
933 932 }
934 933 Map map = new HashMap();
... ... @@ -982,8 +981,7 @@
982 981 if (CollectionUtils.isNotEmpty(list)) {
983 982 List<Map> placentaList = new ArrayList<>();
984 983 for (String l : list) {
985   - if (StringUtils.isEmpty(l))
986   - {
  984 + if (StringUtils.isEmpty(l)) {
987 985 continue;
988 986 }
989 987 Map map = new HashMap();
990 988  
... ... @@ -992,8 +990,12 @@
992 990 }
993 991 antExAddRequest.setTireData(placentaList);
994 992 antExAddRequest.setTireNumber(list.size() + "");
  993 + antExAddRequest.setNextCheckTime(nextTime);
  994 +
995 995 GuidelinesQuery guidelinesQuery = new GuidelinesQuery();
996 996 guidelinesQuery.setType(1);
  997 +
  998 +
997 999 Integer start = DateUtil.getWeek(patients.getLastMenses(), new Date());
998 1000 if (start <= 5) {
999 1001 start = 5;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ b5e5005
... ... @@ -127,6 +127,7 @@
127 127  
128 128 @Autowired
129 129 private BabyEvaluationCriterionService babyEvaluationCriterionService;
  130 +
130 131 /**
131 132 * 建档查询
132 133 *
... ... @@ -6105,7 +6106,7 @@
6105 6106 Object object = baseQuery.getObject();
6106 6107 HashMap<String, String> hashMap = new HashMap<>();
6107 6108 // 运动智龄、发育商
6108   - String exerciseIA ="";
  6109 + String exerciseIA = "";
6109 6110 String exerciseDQ = "";
6110 6111 // 动作
6111 6112 String movementIA = "";
... ... @@ -6170,8 +6171,11 @@
6170 6171 if (antenatalExaminationModel != null) {
6171 6172 //检查日期
6172 6173 map.put("checkDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCheckDate()));
6173   - //孕周
6174   - map.put("week", DateUtil.getWeekDesc(antenatalExaminationModel.getLastMenses(), new Date()));
  6174 + Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
  6175 + if (null != patients) {
  6176 + //孕周
  6177 + map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));
  6178 + }
6175 6179 //血压
6176 6180 map.put("bloodPressure", antenatalExaminationModel.getBp());
6177 6181 //体重
... ... @@ -6180,58 +6184,6 @@
6180 6184 map.put("fuh", antenatalExaminationModel.getGongGao());
6181 6185 //腹围
6182 6186 map.put("abdominalCircumference", antenatalExaminationModel.getAbdominalCircumference());
6183   - /*//默认值
6184   - List list = new ArrayList();
6185   - List list1 = new ArrayList();
6186   - List list2 = new ArrayList();
6187   - List list3 = new ArrayList();
6188   - if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) {
6189   - // String heartRateVal = "", fetalPositionVal = "", fetalPresentationVal = "", joinVal = "";
6190   - for (int j = 0; j < antenatalExaminationModel.getTireData().size(); j++) {
6191   - LinkedHashMap maps = (LinkedHashMap) antenatalExaminationModel.getTireData().get(j);
6192   - if (null != maps) {
6193   -
6194   - //胎先露、胎方位、胎心率和衔接
6195   - String heartRate = String.valueOf(maps.get("heartRate"));
6196   - System.out.println("========>" + heartRate);
6197   - String fetalPosition = String.valueOf(maps.get("fetalPosition"));
6198   - String fetalPresentation = String.valueOf(maps.get("fetalPresentation"));
6199   - String join = String.valueOf(maps.get("join"));
6200   - if (!"null".equals(heartRate) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(heartRate)) {
6201   - //胎心率
6202   - // map.put("heartRate", heartRate);
6203   - list.add(heartRate);
6204   - // heartRateVal += heartRate + "次/分" + ",";
6205   - }
6206   - if (!"null".equals(fetalPosition) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPosition)) {
6207   - //胎方位
6208   - // map.put("fetalPosition", fetalPosition);
6209   -
6210   - list1.add(fetalPosition);
6211   - // fetalPositionVal += FetalPositionEnums.getTitle(fetalPosition) + ",";
6212   - }
6213   - if (!"null".equals(fetalPresentation) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPresentation)) {
6214   - //胎先露
6215   - // map.put("fetalPresentation", fetalPresentation);
6216   - list2.add(fetalPresentation);
6217   - }
6218   - // fetalPresentationVal += FetalEnums.getTitle(fetalPresentation) + ",";
6219   -
6220   - if (!"null".equals(join) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(join)) {
6221   - // joinVal += JoinEnums.getTitle(join) + ",";
6222   - //衔接
6223   - // map.put("join", join);
6224   - list3.add(join);
6225   - }
6226   - }
6227   - }
6228   - }
6229   - map.put("heartRate", list);
6230   - map.put("fetalPosition", list1);
6231   - map.put("fetalPresentation", list2);
6232   - map.put("join", list3);*/
6233   - //胎儿情况
6234   -
6235 6187 List<Map> tireList = new ArrayList<>();
6236 6188 if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) {
6237 6189 for (Object temp : antenatalExaminationModel.getTireData()) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ b5e5005
... ... @@ -107,87 +107,6 @@
107 107 babyEyeCheck.setDoctorJudgement("2");
108 108 }
109 109  
110   - /* if ("yang".equals(babyEyeCheck.getEyePositionId2())) {
111   - //positive.append("眼位(医生判定)");
112   - babyEyeCheck.setEyePositionId2Yang("2");
113   - }
114   - if ("yang".equals(babyEyeCheck.getRedLeft2())) {
115   - //positive.append("红光反射（医生判定）");
116   - babyEyeCheck.setRedLeft2Yang("2");
117   - }
118   - if ("yang".equals(babyEyeCheck.getVision2())) {
119   - //positive.append("视力（医生判定）");
120   - babyEyeCheck.setVision2Yang("2");
121   - }
122   - if ("yang".equals(babyEyeCheck.getY2())) {
123   - //positive.append("手持眼光仪（医生判定）");
124   - babyEyeCheck.setOptometryYnag("2");
125   - }
126   - if ("yang".equals(babyEyeCheck.getRedLeft2())) {
127   - //positive.append("屈光（医生判定）");
128   - babyEyeCheck.setRedLeft2Yang("2");
129   - }
130   -
131   -
132   - if ("yang".equals(babyEyeCheck.getExtRightEyelook())) {
133   - // babyEyeCheck.setEXtr("外眼观察(右) ");
134   - babyEyeCheck.setExtRightEyelookYang("2");
135   - }
136   - if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) {
137   - //positive.append("外眼观察(左) ");
138   - babyEyeCheck.setExtLeftEyelookYang("2");
139   - }
140   - if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) {
141   - //positive.append("瞬目反射(右) ");
142   - babyEyeCheck.setBlinkRightReflexYang("2");
143   - }
144   - if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) {
145   - //positive.append("瞬目反射(左) ");
146   - babyEyeCheck.setBlinkLefttReflexYang("2");
147   - }
148   - if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) {
149   - //positive.append("瞳孔对光反射(右) ");
150   - babyEyeCheck.setPupillaryRightReflexYang("2");
151   - }
152   - if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) {
153   - //positive.append("瞳孔对光反射(左) ");
154   - babyEyeCheck.setPupillaryLeftReflexYang("2");
155   - }
156   - if ("yang".equals(babyEyeCheck.getRedRightReflex())) {
157   - // positive.append("瞳孔红光反射(右) ");
158   - babyEyeCheck.setRedRightReflexYang("2");
159   - }
160   - if ("yang".equals(babyEyeCheck.getRedLeftReflex())) {
161   - //positive.append("瞳孔红光反射(左) ");
162   - babyEyeCheck.setRedLeftReflexYang("2");
163   - }
164   - if ("yang".equals(babyEyeCheck.getRedReflex())) {
165   - //positive.append("红光反射 ");
166   - babyEyeCheck.setRedReflexYang("2");
167   - }
168   - if ("yang".equals(babyEyeCheck.getConjunctiva())) {
169   - //positive.append("结膜 ");
170   - babyEyeCheck.setConjunctivaYang("2");
171   - }
172   - if ("yang".equals(babyEyeCheck.getCorneal())) {
173   - //positive.append("角膜 ");
174   - babyEyeCheck.setCornealYang("2");
175   - }
176   - if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) {
177   - // positive.append("泪器 ");
178   - babyEyeCheck.setLacrimalApparatusYang("2");
179   - }
180   -
181   - if ("yang".equals(babyEyeCheck.getNystagmus())) {
182   - // positive.append("视动性眼震 ");
183   - babyEyeCheck.setNystagmusYang("2");
184   - }
185   - if ("yang".equals(babyEyeCheck.getExtEyelook())) {
186   - // positive.append("外眼观察 ");
187   - babyEyeCheck.setExtEyelookYang("2");
188   - }
189   -*/
190   -
191 110 babyEyeCheck.setCreated(new Date());
192 111 babyEyeCheck.setYn("1");
193 112 babyEyeCheck.setOperaterId(userId + "");
... ... @@ -454,7 +373,6 @@
454 373 if (StringUtils.isNotEmpty(yin)) {
455 374 criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2");
456 375 }
457   -
458 376 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
459 377 Criteria c = new Criteria();
460 378 c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);