From e5eae569e058db173bcff78fc2731ef7c93fa9ee Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 24 Mar 2020 10:30:35 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/BoneFacade.java | 12 ++++++++++++ .../java/com/lyms/platform/worker/BoneTransferWorker.java | 3 ++- platform-transfer/src/main/resources/application.yml | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index 9993435..d683d18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -124,6 +124,12 @@ public class BoneFacade { data.put("cardNo",patients.getCardNo()); data.put("age", DateUtil.getAge(patients.getBirth(), model.getCreated())); data.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), model.getCreated())); + + data.put("tvalue", model.getTvalue()); + data.put("sos", model.getSos()); + data.put("position", model.getPosition()); + data.put("result", model.getResult() == 0 ? "正常" : ( model.getResult() == 1 ? "骨质减少" : "骨质疏松")); + data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); dataList.add(data); @@ -182,6 +188,12 @@ public class BoneFacade { data.put("mcardNo",babyModel.getMcertNo()); data.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); data.put("mname", babyModel.getMname()); + + data.put("zvalue", model.getZvalue()); + data.put("sos", model.getSos()); + data.put("position", model.getPosition()); + data.put("result", model.getResult() == 0 ? "正常" : ( model.getResult() == 1 ? "骨质减少" : "严重骨质减少")); + data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); dataList.add(data); diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java index d6abebc..71cf333 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneTransferWorker.java @@ -37,7 +37,8 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ conn = iConnection.getConnection(); sta = conn.createStatement(); - rst = sta.executeQuery("select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge,PartDisplayName from PatientInfo where status is null and DayTimeOfSave > #"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd")+"#"); + String sql = "select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge,PartDisplayName from PatientInfo where status is null and DayTimeOfSave > "+ DateUtil.formatDate(new Date(),"yyyy-MM-dd"); + rst = sta.executeQuery(sql); while (rst.next()) { Map map = new HashMap(); diff --git a/platform-transfer/src/main/resources/application.yml b/platform-transfer/src/main/resources/application.yml index 74702b2..897c93e 100644 --- a/platform-transfer/src/main/resources/application.yml +++ b/platform-transfer/src/main/resources/application.yml @@ -1,7 +1,6 @@ server: port: 8888 - param: #access数据库路径 data-path: D://EK-8800181001-net_Plus//System//Patient.mdb -- 1.8.3.1