Commit 753c39c0771183ce7685b5165bef1b8ed7fede7f
1 parent
fb30a9a82e
Exists in
master
and in
6 other branches
隆化眼保健
Showing 14 changed files with 247 additions and 88 deletions
- platform-common/src/main/java/com/lyms/platform/common/Test.java
- platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
platform-common/src/main/java/com/lyms/platform/common/Test.java
View file @
753c39c
1 | 1 | package com.lyms.platform.common; |
2 | 2 | |
3 | 3 | |
4 | -import com.lyms.platform.common.utils.DateUtil; | |
5 | -import com.lyms.platform.common.utils.StringUtils; | |
6 | 4 | |
5 | + | |
7 | 6 | import java.io.*; |
8 | -import java.net.Socket; | |
9 | -import java.util.Arrays; | |
10 | -import java.util.Calendar; | |
11 | -import java.util.Date; | |
7 | +import java.util.ArrayList; | |
8 | +import java.util.HashMap; | |
9 | +import java.util.Hashtable; | |
10 | +import java.util.List; | |
11 | +import java.util.concurrent.ConcurrentHashMap; | |
12 | +import java.util.concurrent.LinkedBlockingQueue; | |
12 | 13 | |
14 | + | |
13 | 15 | public class Test { |
14 | 16 | |
15 | 17 | public static void main(String[] args) throws UnsupportedEncodingException { |
18 | + List<String> list = new ArrayList<>(); | |
19 | + list.add(""); | |
20 | + System.out.println(list.size()); | |
16 | 21 | |
17 | 22 | |
18 | -// String content = "R+0.75DS-0.75DC×119°L+0.25DS-0.25DC×35°"; | |
19 | -// | |
20 | -// String rValue = null; | |
21 | -// String rdsValue = null; | |
22 | -// String rdcValue = null; | |
23 | -// String lValue = null; | |
24 | -// String ldsValue = null; | |
25 | -// String ldcValue = null; | |
26 | -// try | |
27 | -// { | |
28 | -// String REGEX_CHINESE = "[\u4e00-\u9fa5]";// 中文正则 | |
29 | -// if (StringUtils.isNotEmpty(content)) | |
30 | -// { | |
31 | -// content = content.toUpperCase(); | |
32 | -// content = content.replaceAll(REGEX_CHINESE, ""); | |
33 | -// if (content.contains("R+") && content.contains("DS") && content.contains("DC") && content.contains("L+") ) | |
34 | -// { | |
35 | -// String[] arrays = content.split("L"); | |
36 | -// if (arrays.length == 2) | |
37 | -// { | |
38 | -// String rds = arrays[0].trim(); | |
39 | -// String[] rs = rds.split("DS"); | |
40 | -// rValue = rs[0].replace("R",""); | |
41 | -// String[] rdsx = rs[1].split("DC"); | |
42 | -// rdsValue = rdsx[0]; | |
43 | -// rdcValue = rdsx[1].replace("°",""); | |
44 | -// | |
45 | -// | |
46 | -// String lds = arrays[1].trim(); | |
47 | -// String[] ls = lds.split("DS"); | |
48 | -// lValue = ls[0]; | |
49 | -// String[] ldsx = ls[1].split("DC"); | |
50 | -// ldsValue = ldsx[0]; | |
51 | -// ldcValue = ldsx[1].replace("°",""); | |
52 | -// } | |
53 | -// } | |
54 | -// | |
55 | -// } | |
56 | -// }catch (Exception e) | |
57 | -// { | |
58 | -// | |
59 | -// } | |
60 | -// System.out.println(rValue); | |
61 | -// System.out.println(rdsValue); | |
62 | -// System.out.println(rdcValue); | |
63 | -// System.out.println(lValue); | |
64 | -// System.out.println(ldsValue); | |
65 | -// System.out.println(ldcValue); | |
23 | + LinkedBlockingQueue map = new LinkedBlockingQueue<>(); | |
24 | + try { | |
25 | + map.put(1); | |
26 | + System.out.println(map.take()); | |
27 | + } catch (InterruptedException e) { | |
28 | + e.printStackTrace(); | |
29 | + } | |
66 | 30 | |
67 | - String str= "避孕保健 顺产后42天(产后6周)上环,如果是剖腹产是半年(产后6个月)上环。但是环的类型是由医生来决定的,因为上环的时候医生要考虑你宫腔大小等因素。\r\n营养 饮食上注意脂肪的摄入,每天70g左右即可,摄入脂肪过多会引起宝贝脂肪泻,过少则影响宝贝大脑发育。\r\n心理调节 缓解产妇情绪,家人特别是丈夫应加倍关心产妇,使家庭关系融洽、和谐,鼓励产妇表达自己的心情并与之交流,消除产妇孤独感。\r\n母乳喂养 如果在喂奶前给孩子喝水,孩子有了饱足感,就不会很好的吃母乳,减少了对产妇乳头的吸吮,影响了母乳的分泌量,渐渐的母乳减少,孩子不够吃,就添加母乳代用品,母乳喂养就会宣告失败。\r\n其他 恢复性生活时一定要小心谨慎,产妇虽然生殖器官恢复正常但内分泌可能还未恢复到妊娠前的状况,阴道组织脆嫩且薄弱,容易造成裂伤甚至大出血。\r\n"; | |
68 | - String[] strs = str.split("\r\n"); | |
69 | - StringBuffer sb = new StringBuffer(); | |
70 | - for(int i = 0;i< strs.length;i++) | |
71 | - { | |
72 | - sb.append((i+1)+"、"); | |
73 | - sb.append(strs[i]); | |
74 | - sb.append("\r\n"); | |
75 | - } | |
76 | - System.out.println(sb.toString()); | |
77 | - System.out.println(str); | |
78 | 31 | } |
79 | 32 | |
80 | - private static Date getStartTime() { | |
81 | - Calendar todayStart = Calendar.getInstance(); | |
82 | - todayStart.set(Calendar.HOUR_OF_DAY,0); | |
83 | - todayStart.set(Calendar.MINUTE,0); | |
84 | - todayStart.set(Calendar.SECOND, 0); | |
85 | - todayStart.set(Calendar.MILLISECOND, 0); | |
86 | - return todayStart.getTime(); | |
87 | - } | |
88 | - | |
89 | - private static Date getEndTime() { | |
90 | - Calendar todayEnd = Calendar.getInstance(); | |
91 | - todayEnd.set(Calendar.HOUR_OF_DAY,23); | |
92 | - todayEnd.set(Calendar.MINUTE,59); | |
93 | - todayEnd.set(Calendar.SECOND,59); | |
94 | - todayEnd.set(Calendar.MILLISECOND,999); | |
95 | - return todayEnd.getTime(); | |
96 | - } | |
97 | 33 | } |
platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java
View file @
753c39c
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
View file @
753c39c
... | ... | @@ -560,7 +560,25 @@ |
560 | 560 | private String cityId; |
561 | 561 | private String areaId; |
562 | 562 | private String streetId; |
563 | + //隆化儿保检查 左右视力检查 | |
564 | + private String eyeRight; | |
565 | + private String eyeLeft; | |
563 | 566 | |
567 | + public String getEyeRight() { | |
568 | + return eyeRight; | |
569 | + } | |
570 | + | |
571 | + public void setEyeRight(String eyeRight) { | |
572 | + this.eyeRight = eyeRight; | |
573 | + } | |
574 | + | |
575 | + public String getEyeLeft() { | |
576 | + return eyeLeft; | |
577 | + } | |
578 | + | |
579 | + public void setEyeLeft(String eyeLeft) { | |
580 | + this.eyeLeft = eyeLeft; | |
581 | + } | |
564 | 582 | public String getProvinceId() { |
565 | 583 | return provinceId; |
566 | 584 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
View file @
753c39c
... | ... | @@ -259,6 +259,8 @@ |
259 | 259 | private String gongJing; |
260 | 260 | //子宫 |
261 | 261 | private String ziGong; |
262 | + //子宫备注 | |
263 | + private String ziRemark; | |
262 | 264 | //附件 |
263 | 265 | private String fuJian; |
264 | 266 | //阴道检查其他 |
... | ... | @@ -591,6 +593,14 @@ |
591 | 593 | private String lhbcms; |
592 | 594 | //B超检查号 |
593 | 595 | private String lhbcjch; |
596 | + | |
597 | + public String getZiRemark() { | |
598 | + return ziRemark; | |
599 | + } | |
600 | + | |
601 | + public void setZiRemark(String ziRemark) { | |
602 | + this.ziRemark = ziRemark; | |
603 | + } | |
594 | 604 | |
595 | 605 | public String getGluOther() { |
596 | 606 | return gluOther; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
753c39c
... | ... | @@ -3768,6 +3768,7 @@ |
3768 | 3768 | String source = patients.getId(); |
3769 | 3769 | patients.setId(null); |
3770 | 3770 | patients.setEnable("2"); |
3771 | + patients.setShortCode("N"); | |
3771 | 3772 | patients.setHospitalId(maternalDeliverModel.getFmHospital()); |
3772 | 3773 | patients.setFmHospital(maternalDeliverModel.getFmHospital()); |
3773 | 3774 | patients.setSource(source); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
753c39c
... | ... | @@ -412,6 +412,8 @@ |
412 | 412 | private BabyCheckModel getBabyCheckModel(BabyCheckRequest request) { |
413 | 413 | |
414 | 414 | BabyCheckModel model = new BabyCheckModel(); |
415 | + model.setEyeLeft(request.getEyeLeft()); | |
416 | + model.setEyeRight(request.getEyeRight()); | |
415 | 417 | model.setQgscResult(request.getQgscResult()); |
416 | 418 | model.setXtxblz(request.getXtxblz()); |
417 | 419 | model.setEljy(request.getEljy()); |
418 | 420 | |
... | ... | @@ -961,8 +963,8 @@ |
961 | 963 | } |
962 | 964 | } |
963 | 965 | } |
966 | + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(request.getBuildId()); | |
964 | 967 | |
965 | - | |
966 | 968 | //儿童检查自动诊断 |
967 | 969 | try { |
968 | 970 | BabyAutoRiskRequest babyAutoRiskRequest = new BabyAutoRiskRequest(); |
... | ... | @@ -973,7 +975,7 @@ |
973 | 975 | babys.add(baby); |
974 | 976 | babyAutoRiskRequest.setBabies(babys); |
975 | 977 | babyAutoRiskRequest.setHospitalId(model.getHospitalId()); |
976 | - BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(request.getBuildId()); | |
978 | + | |
977 | 979 | if(babyModel!=null){ |
978 | 980 | babyAutoRiskRequest.setMphone(babyModel.getMphone()); |
979 | 981 | babyAutoRiskRequest.setMname(babyModel.getMname()); |
... | ... | @@ -1038,9 +1040,9 @@ |
1038 | 1040 | List <BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); |
1039 | 1041 | if (CollectionUtils.isNotEmpty(babyModelList)) { |
1040 | 1042 | |
1041 | - BabyModel babyModel = new BabyModel(); | |
1042 | - babyModel.setEnable("1"); | |
1043 | - babyBookbuildingService.updateBabyBuild(babyModel, babyModelList.get(0).getId()); | |
1043 | + BabyModel babyModel1 = new BabyModel(); | |
1044 | + babyModel1.setEnable("1"); | |
1045 | + babyBookbuildingService.updateBabyBuild(babyModel1, babyModelList.get(0).getId()); | |
1044 | 1046 | |
1045 | 1047 | ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); |
1046 | 1048 | referralApplyOrderQuery.setParentId(request.getBuildId()); |
... | ... | @@ -1120,7 +1122,7 @@ |
1120 | 1122 | //增加高危记录 |
1121 | 1123 | if (null == firstRistRecord) { |
1122 | 1124 | firstRistRecord=new BabyFirstRistRecord(); |
1123 | - BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBuildId()); | |
1125 | + //BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(model.getBuildId()); | |
1124 | 1126 | firstRistRecord.setYn(YnEnums.YES.getId()); |
1125 | 1127 | firstRistRecord.setRistType(1);//初次高危发生类型 0:建档高危。1:检查高危 |
1126 | 1128 | firstRistRecord.setHospitalId(hospitalId);//建档/检查医院 |
1127 | 1129 | |
... | ... | @@ -1156,7 +1158,104 @@ |
1156 | 1158 | return br; |
1157 | 1159 | } |
1158 | 1160 | |
1161 | + /** | |
1162 | + * 隆化儿童检查保存同时生成眼保健 | |
1163 | + */ | |
1164 | + private void saveLhEyeCheck(BabyCheckRequest request,Integer userId,String hospitalId,BabyModel babyModel) | |
1165 | + { | |
1159 | 1166 | |
1167 | + LhBabyEyeCheck lhBabyEyeCheck = new LhBabyEyeCheck(); | |
1168 | + | |
1169 | + Map<String, String> qgsc = request.getQgscResult(); | |
1170 | + if (qgsc != null && qgsc.size() > 0 && qgsc.get("yesOrNo") != null) | |
1171 | + { | |
1172 | + String result = qgsc.get("yesOrNo"); | |
1173 | + if ("yes".equals(result)) | |
1174 | + { | |
1175 | + lhBabyEyeCheck.setGlobal("2"); | |
1176 | + } | |
1177 | + else | |
1178 | + { | |
1179 | + lhBabyEyeCheck.setGlobal("1"); | |
1180 | + } | |
1181 | + } | |
1182 | + lhBabyEyeCheck.setNextEyeCheckTime(DateUtil.parseYMD(request.getNextDate())); | |
1183 | + lhBabyEyeCheck.setZdGuidance(request.getZdGuidance()); | |
1184 | + lhBabyEyeCheck.setCreated(new Date()); | |
1185 | + lhBabyEyeCheck.setYn(1); | |
1186 | + lhBabyEyeCheck.setOperaterId(userId+""); | |
1187 | + lhBabyEyeCheck.setHospitalId(hospitalId); | |
1188 | + lhBabyEyeCheck.setBabyId(request.getBuildId()); | |
1189 | + lhBabyEyeCheck.setBabyBuildDate(babyModel.getBuildDate()); | |
1190 | + lhBabyEyeCheck.setBabyName(babyModel.getName()); | |
1191 | + lhBabyEyeCheck.setBabyMName(babyModel.getMname()); | |
1192 | + lhBabyEyeCheck.setBabySex(babyModel.getSex()); | |
1193 | + lhBabyEyeCheck.setBabyMPhone(babyModel.getMphone()); | |
1194 | + lhBabyEyeCheck.setBabyMCertNo(babyModel.getMcertNo()); | |
1195 | + lhBabyEyeCheck.setPid(babyModel.getPid()); | |
1196 | + lhBabyEyeCheck.setCheckMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), | |
1197 | + DateUtil.parseYMD(request.getCheckDate()))); | |
1198 | + lhBabyEyeCheck.setCheckMonthId(String.valueOf(request.getTcType())); | |
1199 | + lhBabyEyeCheck.setBirth(babyModel.getBirth()); | |
1200 | + lhBabyEyeCheck.setEyeCheckTime(DateUtil.parseYMD(request.getCheckDate())); | |
1201 | + lhBabyEyeCheck.setEyeCheckDoctor("2100003027"); | |
1202 | + lhBabyEyeCheck.setPositiveType("1"); | |
1203 | + lhBabyEyeCheck.setLhsmfy("1"); | |
1204 | + lhBabyEyeCheck.setLhswxw("1"); | |
1205 | + lhBabyEyeCheck.setLhhqsy("1"); | |
1206 | + Map<String,Object> data = new HashMap<>(); | |
1207 | + data.put("syqdxRight" , "1"); | |
1208 | + data.put("jmcxRight" , "1"); | |
1209 | + data.put("ybyfmwRight" , "1"); | |
1210 | + data.put("cxllRight" , "1"); | |
1211 | + data.put("hzRight" , "1"); | |
1212 | + data.put("scbdcRight" , "1"); | |
1213 | + data.put("tkbjzRight" , "1"); | |
1214 | + data.put("tkbyRight" , "1"); | |
1215 | + data.put("tkscbdcRight" , "1"); | |
1216 | + data.put("tkqfbRight" , "1"); | |
1217 | + data.put("syqdxLeft" , "1"); | |
1218 | + data.put("jmcxLeft" , "1"); | |
1219 | + data.put("ybyfmwLeft" , "1"); | |
1220 | + data.put("cxllLeft" , "1"); | |
1221 | + data.put("hzLeft" , "1"); | |
1222 | + data.put("scbdcLeft" , "1"); | |
1223 | + data.put("tkbjzLeft" , "1"); | |
1224 | + data.put("tkbyLeft" , "1"); | |
1225 | + data.put("tkscbdcLeft" , "1"); | |
1226 | + data.put("tkqfbLeft" , "1"); | |
1227 | + lhBabyEyeCheck.setLhywgInfo(data); | |
1228 | + | |
1229 | + lhBabyEyeCheck.setLhgzfyRight("1"); | |
1230 | + lhBabyEyeCheck.setLhgzfyLeft("1"); | |
1231 | + lhBabyEyeCheck.setLhhqsy("1"); | |
1232 | + lhBabyEyeCheck.setLhhgfsRight("1"); | |
1233 | + lhBabyEyeCheck.setLhhgfsLeft("1"); | |
1234 | + lhBabyEyeCheck.setLhkyqgbzRight("1"); | |
1235 | + lhBabyEyeCheck.setLhkyqgbzLeft("1"); | |
1236 | + lhBabyEyeCheck.setLhdyyesyRight("1"); | |
1237 | + lhBabyEyeCheck.setLhdyyesyLeft("1"); | |
1238 | + lhBabyEyeCheck.setLhywjc("1"); | |
1239 | + lhBabyEyeCheck.setLhsldcRight("1"); | |
1240 | + lhBabyEyeCheck.setLhsldcLeft("1"); | |
1241 | + try | |
1242 | + { | |
1243 | + lhBabyEyeCheck.setLhsljcstRight(StringUtils.isNotEmpty(request.getEyeRight()) ? Double.parseDouble(request.getEyeRight()) : null ); | |
1244 | + lhBabyEyeCheck.setLhsljcstLeft(StringUtils.isNotEmpty(request.getEyeLeft()) ? Double.parseDouble(request.getEyeLeft()) : null ); | |
1245 | + }catch (Exception e) | |
1246 | + { | |
1247 | + } | |
1248 | + | |
1249 | + lhBabyEyeCheck.setLhdsl(request.getLhdsl()); | |
1250 | + lhBabyEyeCheck.setLhdcl(request.getLhdcl()); | |
1251 | + lhBabyEyeCheck.setLhaxisl(request.getLhaxisl()); | |
1252 | + lhBabyEyeCheck.setLhdsr(request.getLhdsr()); | |
1253 | + lhBabyEyeCheck.setLhdcr(request.getLhdcr()); | |
1254 | + lhBabyEyeCheck.setLhaxisr(request.getLhaxisr()); | |
1255 | + lhBabyEyeCheck.setQgscResult(request.getQgscResult()); | |
1256 | + | |
1257 | + } | |
1258 | + | |
1160 | 1259 | /** |
1161 | 1260 | * 创建儿保疾病提醒 |
1162 | 1261 | * |
... | ... | @@ -2464,6 +2563,8 @@ |
2464 | 2563 | */ |
2465 | 2564 | private BabyCheckResult getBabyCheckResult(BabyCheckModel checkModel, BabyModel babyMode) { |
2466 | 2565 | BabyCheckResult model = new BabyCheckResult(); |
2566 | + model.setEyeLeft(checkModel.getEyeLeft()); | |
2567 | + model.setEyeRight(checkModel.getEyeRight()); | |
2467 | 2568 | model.setQgscResult(checkModel.getQgscResult()); |
2468 | 2569 | model.setXtxblz(checkModel.getXtxblz()); |
2469 | 2570 | model.setDoctorSign(checkModel.getDoctorSign()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
753c39c
... | ... | @@ -5913,6 +5913,8 @@ |
5913 | 5913 | BabyCheckPageResult model = new BabyCheckPageResult(); |
5914 | 5914 | |
5915 | 5915 | if (babyModel != null) { |
5916 | + model.setEyeLeft(checkModel.getEyeLeft()); | |
5917 | + model.setEyeRight(checkModel.getEyeRight()); | |
5916 | 5918 | model.setMcertNo(babyModel.getMcertNo()); |
5917 | 5919 | model.setQgscResult(checkModel.getQgscResult()); |
5918 | 5920 | model.setXtxblz(checkModel.getXtxblz()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
View file @
753c39c
... | ... | @@ -517,6 +517,26 @@ |
517 | 517 | //先天性白内障 |
518 | 518 | private String xtxblz; |
519 | 519 | |
520 | + //隆化儿保检查 左右视力检查 | |
521 | + private String eyeRight; | |
522 | + private String eyeLeft; | |
523 | + | |
524 | + public String getEyeRight() { | |
525 | + return eyeRight; | |
526 | + } | |
527 | + | |
528 | + public void setEyeRight(String eyeRight) { | |
529 | + this.eyeRight = eyeRight; | |
530 | + } | |
531 | + | |
532 | + public String getEyeLeft() { | |
533 | + return eyeLeft; | |
534 | + } | |
535 | + | |
536 | + public void setEyeLeft(String eyeLeft) { | |
537 | + this.eyeLeft = eyeLeft; | |
538 | + } | |
539 | + | |
520 | 540 | public String getXtxblz() { |
521 | 541 | return xtxblz; |
522 | 542 | } |
... | ... | @@ -742,6 +762,18 @@ |
742 | 762 | private Integer visitType; |
743 | 763 | //选项指标记录 |
744 | 764 | private List<Object> recordChoice; |
765 | + /** | |
766 | + * 针对指导 | |
767 | + */ | |
768 | + private Map<String,Object> zdGuidance; | |
769 | + | |
770 | + public Map<String, Object> getZdGuidance() { | |
771 | + return zdGuidance; | |
772 | + } | |
773 | + | |
774 | + public void setZdGuidance(Map<String, Object> zdGuidance) { | |
775 | + this.zdGuidance = zdGuidance; | |
776 | + } | |
745 | 777 | |
746 | 778 | public Map<String, String> getQgscResult() { |
747 | 779 | return qgscResult; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
View file @
753c39c
... | ... | @@ -275,6 +275,8 @@ |
275 | 275 | private String gongJing; |
276 | 276 | //子宫 |
277 | 277 | private String ziGong; |
278 | + //子宫备注 | |
279 | + private String ziRemark; | |
278 | 280 | //附件 |
279 | 281 | private String fuJian; |
280 | 282 | //阴道检查其他 |
... | ... | @@ -581,6 +583,14 @@ |
581 | 583 | private String lhbcms; |
582 | 584 | //B超检查号 |
583 | 585 | private String lhbcjch; |
586 | + | |
587 | + public String getZiRemark() { | |
588 | + return ziRemark; | |
589 | + } | |
590 | + | |
591 | + public void setZiRemark(String ziRemark) { | |
592 | + this.ziRemark = ziRemark; | |
593 | + } | |
584 | 594 | |
585 | 595 | public String getGluOther() { |
586 | 596 | return gluOther; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
View file @
753c39c
... | ... | @@ -52,7 +52,25 @@ |
52 | 52 | private Map<String,Object> txng; //听性脑干 |
53 | 53 | private Map<String,Object> jsllb; //精神类量表测评 |
54 | 54 | private Map<String,Object> qtsc; //其他筛查 |
55 | + //隆化儿保检查 左右视力检查 | |
56 | + private String eyeRight; | |
57 | + private String eyeLeft; | |
55 | 58 | |
59 | + public String getEyeRight() { | |
60 | + return eyeRight; | |
61 | + } | |
62 | + | |
63 | + public void setEyeRight(String eyeRight) { | |
64 | + this.eyeRight = eyeRight; | |
65 | + } | |
66 | + | |
67 | + public String getEyeLeft() { | |
68 | + return eyeLeft; | |
69 | + } | |
70 | + | |
71 | + public void setEyeLeft(String eyeLeft) { | |
72 | + this.eyeLeft = eyeLeft; | |
73 | + } | |
56 | 74 | public String getEljy() { |
57 | 75 | return eljy; |
58 | 76 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
View file @
753c39c
... | ... | @@ -316,7 +316,25 @@ |
316 | 316 | public void setSlpj(String slpj) { |
317 | 317 | this.slpj = slpj; |
318 | 318 | } |
319 | + //隆化儿保检查 左右视力检查 | |
320 | + private String eyeRight; | |
321 | + private String eyeLeft; | |
319 | 322 | |
323 | + public String getEyeRight() { | |
324 | + return eyeRight; | |
325 | + } | |
326 | + | |
327 | + public void setEyeRight(String eyeRight) { | |
328 | + this.eyeRight = eyeRight; | |
329 | + } | |
330 | + | |
331 | + public String getEyeLeft() { | |
332 | + return eyeLeft; | |
333 | + } | |
334 | + | |
335 | + public void setEyeLeft(String eyeLeft) { | |
336 | + this.eyeLeft = eyeLeft; | |
337 | + } | |
320 | 338 | //运动 |
321 | 339 | private String exercise ; |
322 | 340 | //语言 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java
View file @
753c39c
... | ... | @@ -228,6 +228,8 @@ |
228 | 228 | private String gongJing; |
229 | 229 | //子宫 |
230 | 230 | private String ziGong; |
231 | + //子宫备注 | |
232 | + private String ziRemark; | |
231 | 233 | //附件 |
232 | 234 | private String fuJian; |
233 | 235 | //阴道检查其他 |
... | ... | @@ -559,6 +561,14 @@ |
559 | 561 | private String lhbcms; |
560 | 562 | //B超检查号 |
561 | 563 | private String lhbcjch; |
564 | + | |
565 | + public String getZiRemark() { | |
566 | + return ziRemark; | |
567 | + } | |
568 | + | |
569 | + public void setZiRemark(String ziRemark) { | |
570 | + this.ziRemark = ziRemark; | |
571 | + } | |
562 | 572 | |
563 | 573 | public String getMenstrualDay() { |
564 | 574 | return menstrualDay; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
753c39c
... | ... | @@ -160,6 +160,7 @@ |
160 | 160 | patients.setId(null); |
161 | 161 | patients.setHospitalId(hospitalId); |
162 | 162 | patients.setEnable("2"); |
163 | + patients.setShortCode("M"); | |
163 | 164 | patients.setSource(patientWeight.getPatientId()); |
164 | 165 | patients.setCreated(new Date()); |
165 | 166 | patients.setModified(new Date()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
View file @
753c39c
... | ... | @@ -586,6 +586,7 @@ |
586 | 586 | if (!mongoTemplate.exists(Query.query(Criteria.where("source").is(parentId).and("hospitalId").is(hospitalId)), Patients.class)) { |
587 | 587 | patients.setHospitalId(hospitalId); |
588 | 588 | patients.setEnable("2"); |
589 | + patients.setShortCode("X"); | |
589 | 590 | patients.setSource(patients.getId()); |
590 | 591 | patients.setId(null); |
591 | 592 | patients.setCreated(new Date()); |