From 6293fc37539d5e7939f4926d69fe08976d5484df Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 9 Oct 2016 10:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 4 ++-- .../main/java/com/lyms/platform/operate/web/Test.java | 19 ++++++++++++++----- .../platform/operate/web/facade/PatientFacade.java | 8 +++++--- .../session/strategy/LocalCacheSessionStrategy.java | 4 +++- platform-resource/resources/config-dev.properties | 10 ++++++++++ 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 0a35d41..7400799 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -165,7 +165,7 @@ public class PatientsService { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); Date endDate = DateUtil.addDay(new Date(), -146); - sieveQuery.setLastMensesStart(endDate); + sieveQuery.setLastMensesEnd(endDate); List list = sieveDao.queryList(sieveQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list)) { for (SieveModel sieveModel : list) { @@ -189,7 +189,7 @@ public class PatientsService { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); - patientsQuery.setLastMensesStart(endDate); + patientsQuery.setLastMensesEnd(endDate); List patientses = queryPatient(patientsQuery); for (Patients patients : patientses) { patients.setType(3); 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 70b9d7b..c8713fa 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 @@ -1,20 +1,29 @@ package com.lyms.platform.operate.web; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.Patients; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import java.util.Calendar; +import java.util.Date; + /** * Created by Administrator on 2016/8/22 0022. */ public class Test{ public static void main(String[] args){ - ApplicationContext applicationContext=new ClassPathXmlApplicationContext("spring/applicationContext-dal.xml"); - UsersService usersMapper= applicationContext.getBean(UsersService.class); - Users users=new Users(); - users.setName("测试双master"); - usersMapper.addUsers(users); + Patients patients=new Patients(); + patients.setId("1111"); + patients.setBirth(DateUtil.parseYMD("2016-4-12")); + String s= JsonUtil.obj2Str(patients); + System.out.println(s); + + System.out.println(DateUtil.getymdhm(JsonUtil.jkstr2Obj(s, Patients.class).getBirth())); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 65c9d55..e475cf6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -527,7 +528,7 @@ public class PatientFacade { antExQuery.setPid(patients.getPid()); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(null); - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); + //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setPid(patients.getPid()); @@ -575,6 +576,7 @@ public class PatientFacade { riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); riskPatientsResult.setcTime(nextCheckTime); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); riskPatientsResult.sethScore(highScoreResult.getScore()); @@ -751,8 +753,8 @@ public class PatientFacade { OutputStream out = response.getOutputStream(); ExcelUtil.toExcel(out, datas, cnames); - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + ExceptionUtils.catchException(e,e.getMessage()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java index 7cfb263..ce50593 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/session/strategy/LocalCacheSessionStrategy.java @@ -92,7 +92,9 @@ public class LocalCacheSessionStrategy implements ISessionProvider { } return loginContext; } - + public static void main(String[] args){ + System.out.print(MD5Utils.md5("123456").toUpperCase()); + } @Override public LoginContext register(String userId, String phone, String account, String pwd) { LoginContext loginContext = new LoginContext(); diff --git a/platform-resource/resources/config-dev.properties b/platform-resource/resources/config-dev.properties index 29911da..58fb8c2 100644 --- a/platform-resource/resources/config-dev.properties +++ b/platform-resource/resources/config-dev.properties @@ -22,6 +22,16 @@ mysql.jdbcurl=jdbc:mysql://119.90.57.26:3306/platform?autoReconnect=true&useUnic mysql.maxpoolsize=5 mysql.initialpoolsize=2 mysql.minpoolsize=2 + + + + +mysql.master.db.name=platform +mysql.master.db.password=platform123 +mysql.master.driver=com.mysql.jdbc.Driver +mysql.master.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 + + redis.servers=localhost:6379 -- 1.8.3.1