From e95d5f4ced16b9e57b01fed79481bce3e15c1488 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 9 Mar 2017 13:07:31 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/operate/web/Test.java | 62 ++++++++++++---- .../web/facade/PredictedStatisticsFacade.java | 4 +- .../platform/operate/web/facade/ViewFacade.java | 86 +++++++++++++++++++--- 3 files changed, 125 insertions(+), 27 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index fe52568..eb86f8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -7,6 +7,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.*; +import org.apache.commons.lang.*; import org.apache.commons.lang.math.*; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -14,10 +15,7 @@ import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.query.Update; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * Created by Administrator on 2016/8/22 0022. @@ -28,18 +26,52 @@ public class Test { // String id="1"; // System.out.print(String.format("%07d", id)); - String addr="四川省华蓥市双河街道办事处民太村"; +// String addr="四川省华蓥市双河街道办事处民太村"; +// +// PatientsQuery patientsQuery = new PatientsQuery(); +// patientsQuery.setYn(YnEnums.YES.getId()); +// patientsQuery.setBuildType(1); +// //查询主档案 +// patientsQuery.setExtEnable(false); +// patientsQuery.setCardNo("aaaa"); +// patientsQuery.setPid("aaaa"); +// System.out.println(patientsQuery.convertToQuery().convertToMongoQuery()); +// +// +// System.out.print("5878388d0cf235c11f845399".length()); - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setBuildType(1); - //查询主档案 - patientsQuery.setExtEnable(false); - patientsQuery.setCardNo("aaaa"); - patientsQuery.setPid("aaaa"); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery()); + String str = "{\"yesOrNo\":\"yes\",\"26cac65c-a040-4898-b7da-8deed3ba0ec3\":{\"checkBox\":true,\"proName\":\"循环系统类\",\"selected\":[\"6c46f0c0-97f1-4b72-a11c-98eacfff9a8f\",\"3beb4592-0fda-4041-b148-97d315fccb94\",\"87f35a26-379d-4a05-8ab8-01e634835474\",\"17e9c0ff-92e6-4f48-9f02-264711a8689d\",\"fd51e86b-d3ef-4b38-9dc3-174cf5431855\",\"f14e3084-2ad5-4e25-a634-196e96949ef3\",\"f9acf716-50b0-4b45-bebc-9d21983c616f\",\"31f9dcd6-d7f0-42b5-bd7d-72dd7fe3b01a\",\"322ad477-8130-46d0-a67c-de1b4dc9c640\",\"e7582017-b94c-46ed-b7fd-e36c747da13a\",\"04f8bb8b-f074-41bc-8f41-d3bedb65874b\"]},\"57e4bedbf0f0baa1bee496cd\":{\"checkBox\":true,\"proName\":\"其他\",\"selected\":\"其他既往史\"}}"; - System.out.print("5878388d0cf235c11f845399".length()); + //既往史 + String pastHistory = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(str)) + { + Map map = JsonUtil.str2Obj(str, Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + pastHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + + for(Object key : map.keySet()) + { + Object obj = map.get(key); + if (obj != null && !"yes".equals(obj.toString())) + { + System.out.println(obj.toString()); +// Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class); +// if (itemMap != null && itemMap.size() > 0) +// { +// String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString(); +// String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString(); +// } + } + } + } + } + System.out.println(pastHistory); } -} \ No newline at end of file +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index 05c3c51..8bd423c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -70,7 +70,7 @@ public class PredictedStatisticsFacade { patientsQuery.setDueDateEnd(endDate); patientsQuery.setNeed(YnEnums.YES.name()); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setNotEnable("2"); + //patientsQuery.setNotEnable("2"); 王平说的 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId())); List typeList = new ArrayList<>(); typeList.add(1); @@ -135,7 +135,7 @@ public class PredictedStatisticsFacade { Date endDate = DateUtil.getMonthEndTime(temp); patientsQuery.setDueDateStart(startDate); patientsQuery.setDueDateEnd(endDate); - patientsQuery.setNotEnable("2"); + //patientsQuery.setNotEnable("2"); 王平说的 int count = patientsService.queryPatientCount(patientsQuery); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); String dateStr = simpleDateFormat.format(new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 03b4a38..01dd049 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1766,7 +1766,7 @@ public class ViewFacade { if (StringUtils.isNotEmpty(checkModel.getBregma())) { Map map = JsonUtil.str2Obj(checkModel.getBregma(), Map.class); - String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString(); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); if ("yes".equals(yesOrNo)) { bregma = "闭合"; @@ -1960,17 +1960,83 @@ public class ViewFacade { result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLiveTypeId(), basicConfigService)); result.setLevelType(FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService)); result.setProfessionType(FunvCommonUtil.getBaseicConfigByid(model.getProfessionTypeId(), basicConfigService)); - result.setAge(DateUtil.getAge(model.getBirthday(),new Date())); + result.setAge(DateUtil.getAge(model.getBirthday(), new Date())); + + result.setPhone(model.getPhone()); + result.setWorkUnit(model.getWorkUnit()); + //居住地 + String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), + model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); + + //户籍地址 + String addressRegister = CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(), + model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService); + + result.setAddressRegister(addressRegister); + result.setLiveAddress(liveAddress); + //既往史 + String pastHistory = ""; + if (StringUtils.isNotEmpty(model.getPastHistory())) + { + Map map = JsonUtil.str2Obj(model.getPastHistory(), Map.class); + String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); + if ("no".equals(yesOrNo)) + { + pastHistory = "无"; + } + else if ("yes".equals(yesOrNo)) + { + + for(Object key : map.keySet()) + { + Object obj = map.get(key); + if (obj != null && !"yesOrNo".equals(obj.toString())) + { + Map itemMap = JsonUtil.str2Obj(obj.toString(), Map.class); + if (itemMap != null && itemMap.size() > 0) + { + String proName = itemMap.get("proName") == null ? "" : itemMap.get("proName").toString(); + String selected = itemMap.get("selected") == null ? "" : itemMap.get("selected").toString(); + } + } + } + } + } + + result.setPastHistory(pastHistory); + + +// //既往史 +// private String pastHistory; +// //家族史 +// private String familyHistory; +// //个人史 +// private String personalHistory; +// //药物过敏史 +// private String ywgmHistory; +// //现病史 +// private String presentHistory; + + result.setVcCardNo(model.getVcCardNo()); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBuildDoctor())) { + if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(model.getBuildDoctor())) { + result.setBuildDoctor("产科病房"); + } + else + { + Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + String name = users.getName(); + result.setBuildDoctor(name); + } + } + } + + result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDay())); + result.setId(model.getId()); + -// //手机号 -// private String phone; -// //工作单位 -// private String workUnit; -// //居住地 -// private String liveAddress; -// //户籍地址 -// private String addressRegister; return null; } -- 1.8.3.1