From 5a7bbb355c1f4288470f00067afea35bad5d99f3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 25 Aug 2022 10:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/BasicConfigServiceTest.java | 71 +++++++++++++++++++++- .../com/lyms/platform/common/utils/DateUtil.java | 13 +++- .../platform/pojo/PatientRegistrationModel.java | 9 +++ .../query/PatientRegistrationModelQuery.java | 14 ++++- .../web/result/PatientRegistrationResult.java | 11 +++- 5 files changed, 114 insertions(+), 4 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index b85e10a..6e645f4 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -7413,8 +7413,77 @@ public class BasicConfigServiceTest { } + public static void saveInout(String fileName) { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); + MongoTemplate mongoTemplate + = (MongoTemplate) applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + File file = new File(fileName); + Workbook wb = null; + try { + wb = Workbook.getWorkbook(file); + + Sheet s = wb.getSheet(0); + System.out.println(s.getName() + " : "); + int rows = s.getRows(); + if (rows > 0) { + //遍历每行 + for (int i = 1; i < rows; i++) { + System.out.println("rows=" + i); + PatientRegistrationModel model = new PatientRegistrationModel(); + model.setHospitalId("216"); + model.setType("1"); + model.setOutType(1); + model.setModifyDate(new Date()); + model.setYn(1); + Cell[] cells = s.getRow(i); + if (cells.length > 0) { + for (int j = 0; j < cells.length; j++) { + + String str = cells[j].getContents().trim(); + switch (j) { + case 0: + model.setName(str); + continue; + case 1: + model.setPhone(str); + continue; + case 2: + model.setCardno(str); + continue; + case 3: + if ("LDRP（家庭化产房）".equals(str)) + { + model.setBedType(1); + }else if ("普通房间（产前） +单人分娩产房 +单人间（产后）".equals(str)) + { + model.setBedType(2); + }else if ("普通房间（产前+产后）".equals(str)) + { + model.setBedType(3); + } + continue; + case 4: + model.setCreateDate(DateUtil.parseYMDHMS(str)); + continue; + case 5: + model.setOrderDate(DateUtil.pareYyyy_MM_dd1(str)); + continue; + } + } + } + //mongoTemplate.save(model); + System.out.println(model); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void main(String[] args) { - compareYqys("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\联网.xls","C:\\Users\\liquanyu\\Desktop\\doc\\temp\\单机.xls"); + saveInout("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\预约.xls"); + // compareYqys("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\联网.xls","C:\\Users\\liquanyu\\Desktop\\doc\\temp\\单机.xls"); //saveGw("C:\\Users\\liquanyu\\Desktop\\doc\\承德工位\\承德工位机构表.xls","C:\\Users\\liquanyu\\Desktop\\doc\\承德工位\\龙源承德机构表.xls"); //savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\隆化妇幼保健院孕前上传正式\\承德区划对照表.xls"); // dic(); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index b8e4d3a..d3d3078 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -688,6 +688,17 @@ public class DateUtil { } } + public static Date pareYyyy_MM_dd1(String d) { + if (d == null) { + return null; + } + try { + return y_m_d1.parse(d); + } catch (Exception e) { + return null; + } + } + public static String getMMdd(Date d) { if (d == null) { return null; @@ -1925,7 +1936,7 @@ public class DateUtil { // BigDecimal bg = new BigDecimal(1.0/30*a); // double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); // -// System.out.println(f1); + System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS("2022-8-4 9:49:48"))); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java index 16815c6..81a440d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java @@ -34,7 +34,16 @@ public class PatientRegistrationModel extends BaseModel { //预约时间 private Date orderDate; + //是否出院 1未出院 2出院 + private Integer outType; + public Integer getOutType() { + return outType; + } + + public void setOutType(Integer outType) { + this.outType = outType; + } public String getId() { return id; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java index d8f7023..ecdc4a4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java @@ -40,7 +40,8 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert //登记时间 private Date createDateStart; private Date createDateEnd; - + //是否出院 1未出院 2出院 + private Integer outType; @Override public MongoQuery convertToQuery() { @@ -50,6 +51,10 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert condition = condition.and("name", name, MongoOper.IS); } + if (outType == null) { + + condition = condition.and("outType", outType, MongoOper.IS); + } // 就诊卡号 if (StringUtils.isNotEmpty(phone)) { @@ -119,6 +124,13 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert return condition.toMongoQuery(); } + public Integer getOutType() { + return outType; + } + + public void setOutType(Integer outType) { + this.outType = outType; + } public Integer getBedType() { return bedType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java index e28716a..47c2403 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java @@ -22,7 +22,8 @@ public class PatientRegistrationResult implements IBasicResultConvert