liquanyu / regional-platform

Download as
Browse Code »

Commit 6286e413a1bff949ff4517d78ed9a2d0f7069d26

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

儿童

Showing 8 changed files with 194 additions and 45 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 6286e41
... ... @@ -101,6 +101,8 @@
101 101 */
102 102 private Boolean dataStatus;
103 103  
  104 + private Boolean fmDataStatu;
  105 +
104 106 //母亲证件号
105 107 private String mcertNo;
106 108  
... ... @@ -1112,6 +1114,12 @@
1112 1114 }
1113 1115 }
1114 1116  
  1117 + if (fmDataStatu != null && fmDataStatu == true)
  1118 + {
  1119 + condition = condition.and("dataStatus", 1, MongoOper.IS);
  1120 + condition = condition.and("yn", 0, MongoOper.IS);
  1121 + }
  1122 +
1115 1123 if (null != babyWeightStart) {
1116 1124 if (null != c) {
1117 1125 c = c.and("babyWeight").gte(babyWeightStart);
... ... @@ -1212,6 +1220,14 @@
1212 1220 return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
1213 1221 }
1214 1222 return condition.toMongoQuery();
  1223 + }
  1224 +
  1225 + public Boolean getFmDataStatu() {
  1226 + return fmDataStatu;
  1227 + }
  1228 +
  1229 + public void setFmDataStatu(Boolean fmDataStatu) {
  1230 + this.fmDataStatu = fmDataStatu;
1215 1231 }
1216 1232  
1217 1233 public String getLiveType() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 6286e41
... ... @@ -186,7 +186,7 @@
186 186 * @param page
187 187 * @param limit
188 188 * @param name 儿童姓名
189   - * @param highRiskType 0 非高危 1 高危 2、全部 3、体弱儿列表
  189 + * @param highRiskType 0 非高危 1 高危 2、全部 3、体弱儿列表 4临时档案列表
190 190 * @return
191 191 */
192 192 @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ 6286e41
... ... @@ -862,6 +862,23 @@
862 862  
863 863  
864 864 /**
  865 + * 秦皇岛电子病历接口
  866 + * @param cardNo
  867 + * @param vcCardNo
  868 + * @param response
  869 + * @return
  870 + */
  871 + @RequestMapping(method = RequestMethod.GET, value = "/getPatientRecordInfo")
  872 + @ResponseBody
  873 + public BaseObjectResponse getPatientRecordInfo(@RequestParam(required = true) String userName,
  874 + @RequestParam(required = false) String cardNo,
  875 + @RequestParam(required = false) String vcCardNo,
  876 + HttpServletResponse response) {
  877 + return viewFacade.getPatientRecordInfo(userName, cardNo, vcCardNo);
  878 + }
  879 +
  880 +
  881 + /**
865 882 * 上传升级包
866 883 *
867 884 * @param request
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 6286e41
... ... @@ -1637,7 +1637,7 @@
1637 1637  
1638 1638 //通过pid查询儿童的建档记录
1639 1639 BabyModelQuery babyQuery = new BabyModelQuery();
1640   - babyQuery.setYn(YnEnums.YES.getId());
  1640 +// babyQuery.setYn(YnEnums.YES.getId());
1641 1641 babyQuery.setPid(babayPerson.getId());
1642 1642  
1643 1643 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) {
... ... @@ -1650,6 +1650,9 @@
1650 1650  
1651 1651 List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC);
1652 1652  
  1653 + //去掉删除的数据
  1654 + builds = removeDeleted(builds);
  1655 +
1653 1656 List<Map<String, String>> list = new ArrayList<>();
1654 1657 if (CollectionUtils.isNotEmpty(builds)) {
1655 1658  
1656 1659  
... ... @@ -1672,7 +1675,12 @@
1672 1675 buildInfo = build;
1673 1676 }
1674 1677  
  1678 + if (build != null && build.getYn() == YnEnums.YES.getId())
  1679 + {
  1680 + result.setIsBuild(true);
  1681 + }
1675 1682  
  1683 +
1676 1684 Map<String, String> buildRecords = new HashMap<>();
1677 1685 buildRecords.put("id", build.getId());
1678 1686 buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
... ... @@ -2102,7 +2110,7 @@
2102 2110 BabyModelQuery babyQuery = new BabyModelQuery();
2103 2111 babyQuery.setVcCardNo(request.getVcCardNo());
2104 2112 babyQuery.setQueryNo(request.getQueryNo());
2105   - babyQuery.setDataStatus(true);//排除自动建档数据
  2113 +
2106 2114 //结案查询
2107 2115 babyQuery.setEndCase(request.getEndCase());
2108 2116 //体弱儿详情
... ... @@ -2229,7 +2237,17 @@
2229 2237 buildType.add(2);//产妇分娩建档
2230 2238 babyQuery.setBuildTypeList(buildType);
2231 2239  
2232   - babyQuery.setYn(YnEnums.YES.getId());
  2240 + if (request.getHighRiskType() != null && request.getHighRiskType() == 4)
  2241 + {
  2242 + babyQuery.setFmDataStatu(true);
  2243 + }
  2244 + else
  2245 + {
  2246 + babyQuery.setDataStatus(true);//排除自动建档数据
  2247 + babyQuery.setYn(YnEnums.YES.getId());
  2248 + }
  2249 +
  2250 +
2233 2251 if (isPage) {
2234 2252 babyQuery.setNeed("true");
2235 2253 }
... ... @@ -2368,6 +2386,7 @@
2368 2386  
2369 2387 babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
2370 2388 babyQuery.setQueryNo(request.getQueryNo());
  2389 + System.out.println(babyQuery.convertToQuery().convertToMongoQuery().toString());
2371 2390 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
2372 2391  
2373 2392 return models;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6286e41
... ... @@ -2396,7 +2396,7 @@
2396 2396 /**
2397 2397 * 针对丰润妇幼需求新添加的字段
2398 2398 *
2399   - * @param data
  2399 + * @param
2400 2400 * @param map
2401 2401 */
2402 2402 private void getSelect(Object object, Map<String, Object> map) {
... ... @@ -5798,6 +5798,94 @@
5798 5798 }
5799 5799 }
5800 5800  
  5801 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  5802 + objectResponse.setErrormsg("成功");
  5803 + return objectResponse;
  5804 + }
  5805 +
  5806 + public BaseObjectResponse getPatientRecordInfo(String userName, String cardNo, String vcCardNo) {
  5807 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  5808 + PatientsQuery patientsQuery = new PatientsQuery();
  5809 + patientsQuery.setName(userName);
  5810 + if (StringUtils.isNotEmpty(cardNo)) {
  5811 + patientsQuery.setCardNo(cardNo);
  5812 + } else if (StringUtils.isNotEmpty(vcCardNo)) {
  5813 + patientsQuery.setVcCardNo(vcCardNo);
  5814 + }
  5815 + patientsQuery.setYn(YnEnums.YES.getId());
  5816 +
  5817 +
  5818 + Map data = new HashMap();
  5819 +
  5820 + List<Patients> list = patientsService.queryPatient(patientsQuery);
  5821 + if (CollectionUtils.isNotEmpty(list)) {
  5822 + Patients patients = list.get(0);
  5823 +
  5824 + data.put("userName",patients.getUsername());
  5825 + data.put("sex","女");
  5826 + data.put("age",DateUtil.getAge(patients.getBirth()));
  5827 + data.put("lastMenses",DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
  5828 + data.put("phone",patients.getPhone());
  5829 +
  5830 + //户籍地址
  5831 + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
  5832 + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
  5833 +
  5834 + data.put("addressRegister",addressRegister);
  5835 +
  5836 + data.put("husbandName",patients.getHusbandName() == null ? "" : patients.getHusbandName());
  5837 + data.put("husbandSex","男");
  5838 + data.put("husbandAge",patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth()));
  5839 + data.put("husbandPhone",patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
  5840 +
  5841 + data.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
  5842 +
  5843 + String husbandAddress = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(),
  5844 + patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(),
  5845 + basicConfigService);
  5846 + data.put("husbandAddress",husbandAddress);
  5847 +
  5848 + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
  5849 + StringBuffer risks = new StringBuffer();
  5850 +
  5851 + if (CollectionUtils.isNotEmpty(highScoreResult.getHighRisk()))
  5852 + {
  5853 + for (Object obj : highScoreResult.getHighRisk())
  5854 + {
  5855 + Map map = (Map)obj;
  5856 + Object name = map.get("name");
  5857 + risks.append(name);
  5858 + risks.append(",");
  5859 + }
  5860 + }
  5861 +
  5862 + data.put("risks",risks.toString());
  5863 + data.put("riskScor",highScoreResult.getScoreStr());
  5864 +
  5865 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  5866 + antExChuQuery.setYn(YnEnums.YES.getId());
  5867 + antExChuQuery.setParentId(patients.getId());
  5868 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  5869 + String hivkt = "";
  5870 + String xhdb = "";
  5871 + String bxbjs = "";
  5872 + String platelet = "";
  5873 + if (CollectionUtils.isNotEmpty(antExChuModels)) {
  5874 + AntExChuModel an = antExChuModels.get(0);
  5875 + hivkt = an.getHivkt() == null ? "" : (an.getHivkt().equals("yin") ? "阴性" : "阳性"); //FunvCommonUtil.checkYiGan(an.getHivkt());
  5876 + xhdb = an.getXhdb() == null ? "" : an.getXhdb();
  5877 + bxbjs = an.getBxbjs() == null ? "" : an.getBxbjs();
  5878 + platelet = an.getPlatelet() == null ? "" : an.getPlatelet();
  5879 + }
  5880 + data.put("hivkt", hivkt);
  5881 + data.put("xhdb", xhdb);
  5882 + data.put("bxbjs", bxbjs);
  5883 + data.put("platelet", platelet);
  5884 +
  5885 + }
  5886 +
  5887 +
  5888 + objectResponse.setData(data);
5801 5889 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
5802 5890 objectResponse.setErrormsg("成功");
5803 5891 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java View file @ 6286e41
... ... @@ -14,9 +14,18 @@
14 14 private String cardNo;
15 15 private String id;
16 16  
  17 + //是否已经建档
  18 + private boolean isBuild;
17 19  
18 20 private List<Map<String,String>> buildRecords;
19 21  
  22 + public boolean isBuild() {
  23 + return isBuild;
  24 + }
  25 +
  26 + public void setIsBuild(boolean isBuild) {
  27 + this.isBuild = isBuild;
  28 + }
20 29  
21 30 public String getId() {
22 31 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 6286e41
... ... @@ -253,7 +253,7 @@
253 253 criteria.and("pid").in(ids);
254 254 }
255 255  
256   - PageResult pageResult = findMongoPage(BloodPressure.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
  256 + PageResult pageResult = findMongoPage(BloodPressure.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
257 257 List<BloodPressure> bloodPressures = (List<BloodPressure>) pageResult.getGrid();
258 258 List<Map<String, Object>> restList = new ArrayList<>();
259 259 for (BloodPressure bloodPressure : bloodPressures) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ 6286e41
... ... @@ -252,46 +252,46 @@
252 252 return null;
253 253 }
254 254  
255   -// public static void main(String[] args){
256   -// queryMsgList(null, null,null,
257   -// null,null,
258   -// null,null,null,null,
259   -// null,null ,2,null,null,
260   -// 1,10);
261   -// }
262   -
263   -
264   - public static void main(String[] args) {
265   - List<MsgRequest> messages = new ArrayList<>();
266   - MsgRequest mr = new MsgRequest();
267   - mr.setFirst("【XX】" + "aaaaaaaaaaa");
268   - mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
269   - mr.setPhone("13122132");
270   - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
271   - mr.setTypeId(ProjectTypeEnums.YNXT.getId());
272   - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
273   - mr.setSubTypeId(SmsServiceEnums.FWDGTX.getId());
274   - mr.setStatus(SmsStatusEnums.WFS.getId());
275   - mr.setHospitalId("216");
276   - mr.setTempId("sfasdf");
277   - mr.setPatientId("sdfasdf");
278   - mr.setSmsStatus(SmsStatusEnums.WFS.getId());
279   - messages.add(mr);
280   -
281   - MsgListRequest smsList = new MsgListRequest();
282   - smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
283   - smsList.setMessages(messages);
284   -
285   - String json = JsonUtil.obj2Str(smsList);
286   - System.out.println("参数："+json);
287   -
288   - String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", json);
289   - //
290   - //
291   - // int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1,
292   - // 1, null, null, null);
293   - System.out.println(result);
  255 + public static void main(String[] args){
  256 + queryMsgList(null, null,null,
  257 + null,null,
  258 + null,null,null,null,
  259 + null,null ,2,null,null,
  260 + 1,10);
294 261 }
  262 +
  263 +//
  264 +// public static void main(String[] args) {
  265 +// List<MsgRequest> messages = new ArrayList<>();
  266 +// MsgRequest mr = new MsgRequest();
  267 +// mr.setFirst("【XX】" + "aaaaaaaaaaa");
  268 +// mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
  269 +// mr.setPhone("13122132");
  270 +// mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
  271 +// mr.setTypeId(ProjectTypeEnums.YNXT.getId());
  272 +// mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
  273 +// mr.setSubTypeId(SmsServiceEnums.FWDGTX.getId());
  274 +// mr.setStatus(SmsStatusEnums.WFS.getId());
  275 +// mr.setHospitalId("216");
  276 +// mr.setTempId("sfasdf");
  277 +// mr.setPatientId("sdfasdf");
  278 +// mr.setSmsStatus(SmsStatusEnums.WFS.getId());
  279 +// messages.add(mr);
  280 +//
  281 +// MsgListRequest smsList = new MsgListRequest();
  282 +// smsList.setTypeId(ProjectTypeEnums.YNXT.getId());
  283 +// smsList.setMessages(messages);
  284 +//
  285 +// String json = JsonUtil.obj2Str(smsList);
  286 +// System.out.println("参数："+json);
  287 +//
  288 +// String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", json);
  289 +// //
  290 +// //
  291 +// // int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1,
  292 +// // 1, null, null, null);
  293 +// System.out.println(result);
  294 +// }
295 295  
296 296 }