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 518ee15..6f5b442 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 @@ -6560,6 +6560,60 @@ public class BasicConfigServiceTest { } } + + public static void saveBabyBone(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); + BoneConfigModel model = new BoneConfigModel(); + model.setType(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: + String[] arrs = str.split("-"); + model.setStart(Integer.parseInt(arrs[0])); + model.setEnd(Integer.parseInt(arrs[1])); + continue; + case 1: + List list2 = Arrays.asList(str.split("\n")); + model.setNormals(list2); + continue; + case 2: + List list3 = Arrays.asList(str.split("\n")); + model.setReduces(list3); + continue; + case 3: + List list4 = Arrays.asList(str.split("\n")); + model.setSerious(list4); + continue; + + } + } + } + mongoTemplate.save(model); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void main(String[] args) { // getData(); //weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); @@ -6607,7 +6661,8 @@ public class BasicConfigServiceTest { //saveDiteSuggest("F:\\儿童营养报告\\秦皇岛儿童膳食营养报告\\每类食物不爱吃的指导建议.xls"); //saveDiteDoctorSuggest("F:\\儿童营养报告\\秦皇岛儿童膳食营养报告\\医生建议内容.xls"); //saveMicroelements("E:\\dev\\微量元素指导报告模板.xls"); - saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls"); + //saveBabyMicroelements("F:\\技术文档\\儿童微量元素\\儿童微量元素指导报告模板.xls"); + saveBabyBone("F:\\技术文档\\骨密度\\儿童骨密度报告模板内容表.xls"); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BoneConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BoneConfigModel.java new file mode 100644 index 0000000..01951b2 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BoneConfigModel.java @@ -0,0 +1,87 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.List; + +/** + * 骨密度 + * + */ +@Document(collection = "lyms_bone_config") +public class BoneConfigModel extends BaseModel { + + + private String id; + + private Integer start; + private Integer end; + //正常 + private List normals; + //减少 + private List reduces; + //严重 + private List serious; + + + //0 孕前 1 儿童 + private Integer type; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getStart() { + return start; + } + + public void setStart(Integer start) { + this.start = start; + } + + public Integer getEnd() { + return end; + } + + public void setEnd(Integer end) { + this.end = end; + } + + public List getNormals() { + return normals; + } + + public void setNormals(List normals) { + this.normals = normals; + } + + public List getReduces() { + return reduces; + } + + public void setReduces(List reduces) { + this.reduces = reduces; + } + + public List getSerious() { + return serious; + } + + public void setSerious(List serious) { + this.serious = serious; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java index 580ef01..0ce3bf9 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java @@ -57,7 +57,7 @@ public class LisService { itemsMan.put("lyms011","肾功能检测（肌酐）"); itemsMan.put("lyms013","梅毒螺旋体筛查"); Connection conn = null; - String sql = "insert into TI_申请信息孕(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + + String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; PreparedStatement ps = null; ResultSet rs = null; @@ -176,7 +176,7 @@ public class LisService { itemsMan.put("lymsh011","肾功能检测（肌酐）"); itemsMan.put("lymsh013","梅毒螺旋体筛查"); Connection conn = null; - String sql = "insert into TI_申请信息孕(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + + String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; PreparedStatement ps = null; ResultSet rs = null; 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 5296811..0414a2c 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 @@ -278,6 +278,11 @@ public class BoneFacade { boneModel.setModified(new Date()); BoneService.add(boneModel); } + else + { + return new BaseResponse(). + setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有关联数据"); + } } //儿童骨密度 else @@ -303,6 +308,11 @@ public class BoneFacade { } BoneService.add(boneModel); } + else + { + new BaseResponse(). + setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有关联数据"); + } } return new BaseResponse(). setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java index 90ca60c..534f509 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java @@ -6,6 +6,7 @@ import com.lyms.platform.comm.JsonUtil; import com.lyms.platform.conn.BoneConnectionFactory; import com.lyms.platform.conn.inf.ConnectionFactoryMethod; import com.lyms.platform.conn.inf.IConnection; +import org.apache.commons.httpclient.util.DateUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -39,14 +41,16 @@ public class BoneWorker { conn = iConnection.getConnection(); sta = conn.createStatement(); - rst = sta.executeQuery("select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge from PatientInfo where status is null"); + 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")+"#"); while (rst.next()) { Map map = new HashMap(); String PatientID = rst.getString("PatientID"); //身份证后八位 //String position = rst.getString(""); map.put("cardNo",PatientID); - map.put("position","左侧桡骨远端1/3处"); + + String PartDisplayName = rst.getString("PartDisplayName"); + map.put("position",PartDisplayName); String ZScore = rst.getString("ZScore"); String TScore = rst.getString("TScore"); @@ -71,6 +75,7 @@ public class BoneWorker { map.put("adultPercent",adultPercent); map.put("agePercent",agePercent); map.put("age",age); + map.put("type",1); // if (map.size() > 0 && PatientID != null) { diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/MicroelementWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/MicroelementWorker.java index 00ddf26..30955dc 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/MicroelementWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/MicroelementWorker.java @@ -29,7 +29,7 @@ public class MicroelementWorker { @Autowired private ApplicationProperties properties; - @Scheduled(cron = "0 0/2 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void getMicroelementRecords() { System.out.println("getMicroelementRecords start"); diff --git a/platform-transfer/src/main/resources/application.yml b/platform-transfer/src/main/resources/application.yml index 7e03c91..f3ef2bf 100644 --- a/platform-transfer/src/main/resources/application.yml +++ b/platform-transfer/src/main/resources/application.yml @@ -4,9 +4,9 @@ server: param: #微量元素access路径 - microelement-path: D://EK-8800181001-net_Plus//System//Patient.mdb + microelement-path: D://tc.mdb #骨密度access数据库路径 - bone-path: D://tc.mdb + bone-path: D://EK-8800181001-net_Plus//System//Patient.mdb #区域url地址 url: https://dev-rp-api.healthbaby.com.cn type: 0 # 0孕妇 1儿童 \ No newline at end of file diff --git a/platform-transfer/src/main/resources/lib/Access_JDBC30.jar b/platform-transfer/src/main/resources/lib/Access_JDBC30.jar deleted file mode 100644 index e69de29..0000000