From 25c83db11eed5c55b7450370dbd8879edc15e1b9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 17 Aug 2021 17:43:02 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyBookbuildingFacade.java | 13 +- .../web/service/impl/NewbornServiceImpl.java | 16 +-- .../web/service/impl/ReportServiceImpl.java | 43 +----- .../lyms/platform/worker/BoneTransferWorker.java | 14 +- .../com/lyms/platform/worker/TransferAbstract.java | 7 +- .../src/main/resources/application.yml | 5 +- .../src/main/resources/log4j_config.xml | 107 --------------- .../src/main/resources/logback-spring.xml | 151 +++++++++++++++++++++ 8 files changed, 192 insertions(+), 164 deletions(-) delete mode 100644 platform-transfer/src/main/resources/log4j_config.xml create mode 100644 platform-transfer/src/main/resources/logback-spring.xml 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 4a16833..5a60907 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 @@ -990,7 +990,9 @@ public class BabyBookbuildingFacade { BabyEarResult babyEarResult = (BabyEarResult) babyEarById.getData();//获取要保存的眼保健档案 /babyear BabyEarAddRequest babyEarAddRequest = new BabyEarAddRequest(); - babyEarAddRequest.setBase(babyEarResult.getBase()); + BabyEarBase babyEarBase = babyEarResult.getBase(); + babyEarBase.setCreateUserId(model.getBuildDoctor()); + babyEarAddRequest.setBase(babyEarBase); babyEarAddRequest.setBabyBirth(babyEarResult.getBabyBirth()); BabyPatientExtendEarMotherRequest patientExtendEarMother = new BabyPatientExtendEarMotherRequest(); @@ -2688,10 +2690,10 @@ public class BabyBookbuildingFacade { babyQuery.setDueWeekEnd(request.getDueWeekEnd()); if (String.valueOf("true").equals(request.getIsArea())) { - List list = new ArrayList(); - list.add("1");//转诊，建档已接受 - list.add("2");//隐藏建档 - babyQuery.setEnableListNot(list); +// List list = new ArrayList(); +// list.add("1");//转诊，建档已接受 +// list.add("2");//隐藏建档 +// babyQuery.setEnableListNot(list); OrganizationQuery organizationQuery = new OrganizationQuery(); if (!StringUtils.isEmpty(request.getHospitalId())) { hospitalIdList.add(request.getHospitalId()); @@ -3319,6 +3321,7 @@ public class BabyBookbuildingFacade { babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); babyQuery.setQueryNo(request.getQueryNo()); + System.out.println(babyQuery.convertToQuery().convertToMongoQuery().toString()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); return models; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index e4d40b4..18f9953 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -99,7 +99,8 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit String hospitalId = autoMatchFacade.getHospitalId(userId); newbornVisit.setHospitalId(hospitalId); if(StringUtils.isEmpty(newbornVisit.getId())) { - if(!buildArchive(userId, newbornVisit.getPid(), newbornVisit.getBabyId())) { + BabyModel babyModel = buildArchive(userId, newbornVisit.getPid(), newbornVisit.getBabyId()); + if(babyModel == null) { return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD); } newbornVisit.setId(UUID.randomUUID().toString().replace("-", "")); @@ -113,7 +114,6 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit newbornVisit.setOperationId(userId.toString()); newbornVisit.setCreated(new Date()); newbornVisit.setYn("1"); - BabyModel babyModel = mongoTemplate.findById(newbornVisit.getBabyId(), BabyModel.class); if(babyModel != null) { newbornVisit.setPid(babyModel.getPid()); } @@ -148,7 +148,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit * @param userId * @return */ - private boolean buildArchive(Integer userId, String pid, String babyId) { + private BabyModel buildArchive(Integer userId, String pid, String babyId) { if(StringUtils.isEmpty(pid)) { BabyModel babyModel = mongoTemplate.findById(babyId, BabyModel.class); if(babyModel != null) { @@ -160,7 +160,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit // 如果本院已有记录 直接走正常流程 BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); if(baby != null) { - return true; + return baby; } List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true); @@ -168,7 +168,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds) .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); if(babyModel == null) { - return false; // 需 要建档 + return null; // 需 要建档 } babyModel.setId(null); babyModel.setHospitalId(hospitalId); @@ -176,10 +176,10 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit // babyModel.setEnable("2"); babyModel.setSource(babyId); babyModel.setCreated(new Date()); - mongoTemplate.save(babyModel); - return true; + babyModel = babyService.addOneBaby(babyModel); + return babyModel; } - return false; + return null; } @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 919b6f5..fd9158b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -3446,49 +3446,14 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService String hospitalId = autoMatchFacade.getHospitalId(userId); Set patientIds = new HashSet<>(); - Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").nin(0); - /** 产前检查： lyms_antexc（初诊），lyms_antex（复诊）设置pid */ - List antenatalExaminationModels = mongoUtil.findField(AntenatalExaminationModel.class, criteria, "parentId"); - for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) { - patientIds.add(antenatalExaminationModel.getParentId()); - } - List antExChuModels = mongoUtil.findField(AntExChuModel.class, criteria, "parentId"); - for (AntExChuModel antExChuModel : antExChuModels) { - patientIds.add(antExChuModel.getParentId()); - } - - /** 产妇分娩: lyms_matdeliver */ - List deliverModels = mongoUtil.findField(MaternalDeliverModel.class, criteria, "parentId"); - for (MaternalDeliverModel deliverModel : deliverModels) { - patientIds.add(deliverModel.getParentId()); - } - - /** 出院小结: lyms_discharge_abstract_mother 医院需要确定下 */ - Criteria disCriteria = Criteria.where("createDate").gte(DateUtil.getYearDate(year)) - .lt(DateUtil.getNextYearDate(year)).and("yn").nin(0); - List dischargeAbstractMotherModels = mongoUtil.findField(DischargeAbstractMotherModel.class, disCriteria, "patientId"); - for (DischargeAbstractMotherModel dischargeAbstractMotherModel : dischargeAbstractMotherModels) { - patientIds.add(dischargeAbstractMotherModel.getPatientId()); - } - - /** 产后复查: lyms_postreview */ - List postReviewModels = mongoUtil.findField(PostReviewModel.class, criteria, "parentId"); - for (PostReviewModel postReviewModel : postReviewModels) { - patientIds.add(postReviewModel.getParentId()); - } - - /** 产前筛查: lyms_sieveapplyorder */ - List sieveModels = mongoUtil.findField(SieveApplyOrderModel.class, criteria, "parentId"); - for (SieveApplyOrderModel sieveModel : sieveModels) { - patientIds.add(sieveModel.getParentId()); - } /** 增加年份条件限制 */ - criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) + Criteria criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year)) .lt(DateUtil.getNextYearDate(year)) - .and("hospitalId").is(hospitalId).and("id").in(patientIds).and("yn").nin(0); - + .and("hospitalId").is(hospitalId).and("yn").is(1) + .and("enable").nin(Arrays.asList(1,2)).and("buildType").ne(1); + System.out.println(Query.query(criteria).toString()); if (StringUtils.isNotEmpty(provinceId)) { criteria.and("provinceRegisterId").in(CollectionUtils.asList(provinceId)); } 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 d55763a..4dca319 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 @@ -5,6 +5,8 @@ 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.stereotype.Component; @@ -21,12 +23,13 @@ import java.util.Map; */ @Component public class BoneTransferWorker extends TransferAbstract implements ITransfer{ - + private static final Logger logger = LoggerFactory.getLogger(BoneTransferWorker.class); @Autowired private ApplicationProperties properties; @Override public void doTransfer() { + logger.info("getBoneRecords start"); System.out.println("getBoneRecords start"); Connection conn = null; Statement sta = null; @@ -38,11 +41,17 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ conn = iConnection.getConnection(); 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"); + logger.info("getBoneRecords sql="+sql); rst = sta.executeQuery(sql); while (rst.next()) { + + Map map = new HashMap(); String PatientID = rst.getString("PatientID"); //身份证后八位 + + logger.info("getBoneRecords PatientID"+PatientID); + map.put("cardNo",PatientID); String PartDisplayName = rst.getString("PartDisplayName"); @@ -88,10 +97,11 @@ public class BoneTransferWorker extends TransferAbstract implements ITransfer{ } } } catch (Exception e) { + logger.error("getBoneRecords Exception.",e.toString()); try { conn.rollback(); } catch (SQLException e1) { - e1.printStackTrace(); + logger.error("getBoneRecords error.",e1.toString()); } } finally { diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java index 599e631..1aae7b0 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/TransferAbstract.java @@ -2,6 +2,8 @@ package com.lyms.platform.worker; import com.lyms.platform.comm.HttpClientUtil; import com.lyms.platform.comm.JsonUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; @@ -9,7 +11,7 @@ import java.util.Map; * Created by Administrator on 2020-03-23. */ public abstract class TransferAbstract implements ITransfer { - + private static final Logger logger = LoggerFactory.getLogger(BoneTransferWorker.class); public abstract void doTransfer(); @Override @@ -17,9 +19,10 @@ public abstract class TransferAbstract implements ITransfer { if (data != null && data.size() > 0) { String json = JsonUtil.obj2Str(data); - System.out.println(json); + logger.info("http json= " + json); String result = HttpClientUtil.doPostSSL(path, json); System.out.println("http result= "+result); + logger.info("http result= "+result); return result; } return ""; diff --git a/platform-transfer/src/main/resources/application.yml b/platform-transfer/src/main/resources/application.yml index a153cf8..93ce738 100644 --- a/platform-transfer/src/main/resources/application.yml +++ b/platform-transfer/src/main/resources/application.yml @@ -3,4 +3,7 @@ server: spring: profiles: - active: test \ No newline at end of file + active: xlxfy +logging: + config: classpath:logback-spring.xml + path: logs \ No newline at end of file diff --git a/platform-transfer/src/main/resources/log4j_config.xml b/platform-transfer/src/main/resources/log4j_config.xml deleted file mode 100644 index a170453..0000000 --- a/platform-transfer/src/main/resources/log4j_config.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform-transfer/src/main/resources/logback-spring.xml b/platform-transfer/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..7c874b7 --- /dev/null +++ b/platform-transfer/src/main/resources/logback-spring.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + ${logbase}/log_error.log + + + ${logbase}/log-error-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + error + ACCEPT + DENY + + + + + + + + + ${logbase}/log_debug.log + + + ${logbase}/log-debug-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + debug + ACCEPT + DENY + + + + + + + + + ${logbase}/log_info.log + + + ${logbase}/log-info-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + info + ACCEPT + DENY + + + + + + + + ${logbase}/log_warn.log + + + ${logbase}/log-warn-%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + true + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + warn + ACCEPT + DENY + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger Line:%-3L - %msg%n + utf-8 + + + + info + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 1.8.3.1