diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHighRiskService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHighRiskService.java index 0175f39..dbc2032 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHighRiskService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHighRiskService.java @@ -269,8 +269,8 @@ public class QhdfyHighRiskService { { ExceptionUtils.catchException(e,"qhd risk error."); }finally { -// DbUtils.closeQuietly(connHis); -// DbUtils.closeQuietly(conn); + DbUtils.closeQuietly(connHis); + DbUtils.closeQuietly(conn); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 46e9541..db50690 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -267,8 +267,18 @@ public class BabyBookbuildingFacade { babyModelQuery.setPid(pid); babyModelQuery.setSource(null); babyModelQuery.setEnable(null); - babyModel = findBabyCond(babyModelQuery, groupsFacade.findGroupHospital(userId, false), false); - babyModel.setSource(babyModel.getId()); + babyModelQuery.setHospitalIdList(null); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel model : babyModels) + { + if (StringUtils.isEmpty(model.getSource())) + { + babyModel.setSource(model.getId()); + break; + } + } + } babyModel.setId(null); babyModel.setHospitalId(hospitalId); babyModel.setCreated(new Date()); 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 e7038ed..47e52b4 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 @@ -2,13 +2,12 @@ package com.lyms.platform.worker; import com.lyms.platform.comm.ApplicationProperties; import com.lyms.platform.comm.StringUtils; -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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import java.sql.*; @@ -20,6 +19,7 @@ import java.util.Map; * 骨密度 */ @Component +@Scope("singleton") public class BoneTransferWorker extends TransferAbstract implements ITransfer{ private static final Logger logger = LoggerFactory.getLogger(BoneTransferWorker.class); @Autowired @@ -35,7 +35,7 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ String url = "jdbc:Access:///"+properties.getDataPath(); conn = DriverManager.getConnection(url, "", ""); } catch (Exception e) { - logger.error("getConnection error."+e.toString()); + logger.error("getConnection error.",e); } return conn; } @@ -55,56 +55,59 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ sta = conn.createStatement(); String sql = "select PatientID,ZScore,TScore,dbSos,dbBqi,dbRrf,dbEoa,YoungAdult,ageMatched,dbAge,PartDisplayName,PatientName 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(); - String PatientID = rst.getString("PatientID"); //身份证后八位 - map.put("cardNo",PatientID); - - String PartDisplayName = rst.getString("PartDisplayName"); - map.put("position",PartDisplayName); - - String PatientName = rst.getString("PatientName"); //孕妇姓名 - map.put("username",PatientName); - - String ZScore = rst.getString("ZScore"); - String TScore = rst.getString("TScore"); - String dbSos = rst.getString("dbSos"); - - String bqi = rst.getString("dbBqi"); - String rrf = rst.getString("dbRrf"); - String eoa = rst.getString("dbEoa"); - - String adultPercent = rst.getString("YoungAdult"); - String agePercent = rst.getString("ageMatched"); - String age = rst.getString("dbAge"); - - map.put("zvalue",ZScore); - map.put("tvalue",TScore); - map.put("sos",dbSos); - - map.put("bqi",bqi); - map.put("rrf",rrf); - map.put("eoa",eoa); - - map.put("adultPercent",adultPercent); - map.put("agePercent",agePercent); - map.put("age",age); - map.put("type",properties.getType()); // - map.put("hospitalId",properties.getHospitalId()); // - - if (map.size() > 0 && StringUtils.isNotEmpty(PatientID)) - { - String response = send(map, properties.getUrl() + "/saveBone"); - if (response.contains("0")) + if (!rst.isClosed()) + { + while (rst.next()) { + Map map = new HashMap(); + String PatientID = rst.getString("PatientID"); //身份证后八位 + map.put("cardNo",PatientID); + + String PartDisplayName = rst.getString("PartDisplayName"); + map.put("position",PartDisplayName); + + String PatientName = rst.getString("PatientName"); //孕妇姓名 + map.put("username",PatientName); + + String ZScore = rst.getString("ZScore"); + String TScore = rst.getString("TScore"); + String dbSos = rst.getString("dbSos"); + + String bqi = rst.getString("dbBqi"); + String rrf = rst.getString("dbRrf"); + String eoa = rst.getString("dbEoa"); + + String adultPercent = rst.getString("YoungAdult"); + String agePercent = rst.getString("ageMatched"); + String age = rst.getString("dbAge"); + + map.put("zvalue",ZScore); + map.put("tvalue",TScore); + map.put("sos",dbSos); + + map.put("bqi",bqi); + map.put("rrf",rrf); + map.put("eoa",eoa); + + map.put("adultPercent",adultPercent); + map.put("agePercent",agePercent); + map.put("age",age); + map.put("type",properties.getType()); // + map.put("hospitalId",properties.getHospitalId()); // + + if (map.size() > 0 && StringUtils.isNotEmpty(PatientID)) { - sta.executeUpdate("update PatientInfo set status='1' where PatientID='" + PatientID + "'"); - conn.commit(); + String response = send(map, properties.getUrl() + "/saveBone"); + if (response.contains("0")) + { + sta.executeUpdate("update PatientInfo set status='1' where PatientID='" + PatientID + "'"); + conn.commit(); + } } } + Thread.sleep(30000); } - Thread.sleep(30000); } catch (Exception e) { - logger.error("getBoneRecords Exception. "+e.toString()); + logger.error("getBoneRecords Exception. ",e); } finally { iConnection.close(conn, sta,rst);