diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 6d3c88b..91cd4c8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -65,6 +65,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private Integer type; private String neqId; + + private Date modifiedStart; + private Date modifiedEnd; //处理意见 private String treatOpinion; @@ -234,6 +237,22 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery return birthStart; } + public Date getModifiedStart() { + return modifiedStart; + } + + public void setModifiedStart(Date modifiedStart) { + this.modifiedStart = modifiedStart; + } + + public Date getModifiedEnd() { + return modifiedEnd; + } + + public void setModifiedEnd(Date modifiedEnd) { + this.modifiedEnd = modifiedEnd; + } + public void setBirthStart(Date birthStart) { this.birthStart = birthStart; } @@ -690,6 +709,14 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery } } + if (null != modifiedStart && modifiedEnd != null) { + if (null != c) { + c = c.where("modified").gte(modifiedStart).lte(modifiedEnd); + } else { + c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + } + if (null != c) { condition = condition.andCondition(new MongoCondition(c)); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java index 78a0d05..eb29814 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java @@ -53,6 +53,9 @@ public class FolicAcidQuery extends BaseQuery implements IConvertToNativeQuery { //患者ID private List parentIds; + private Date modifiedStart; + private Date modifiedEnd; + public List getParentIds() { return parentIds; } @@ -103,12 +106,35 @@ public class FolicAcidQuery extends BaseQuery implements IConvertToNativeQuery { c1 = c1.lte(drawTimeEnd); } } + if (null != modifiedStart && modifiedEnd != null) { + if (null != c1) { + c1 = c1.where("modified").gte(modifiedStart).lte(modifiedEnd); + } else { + c1 = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + } if (c1!=null) { condition = condition.andCondition(new MongoCondition(c1)); } return condition.toMongoQuery(); } + public Date getModifiedStart() { + return modifiedStart; + } + + public void setModifiedStart(Date modifiedStart) { + this.modifiedStart = modifiedStart; + } + + public Date getModifiedEnd() { + return modifiedEnd; + } + + public void setModifiedEnd(Date modifiedEnd) { + this.modifiedEnd = modifiedEnd; + } + public List getHospitalList() { return hospitalList; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index 6946287..0e0ca25 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -30,6 +30,8 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private Date premaritalUpTimeEnd; //医院ID private String hospitalId; + + private List hospitalIds; //创建时间 private Date created; //修改时间 @@ -51,6 +53,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ //建档ID List parentIds; + private Date modifiedStart; + private Date modifiedEnd; + @Override public MongoQuery convertToQuery() { @@ -64,6 +69,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (StringUtils.isNotBlank(hospitalId)) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(hospitalIds)) { + condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); + } if(CollectionUtils.isNotEmpty(parentIds)){ condition = condition.and("parentId", parentIds, MongoOper.IN); } @@ -108,12 +116,44 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ c1 = c1.lte(premaritalUpTimeEnd); } } + if (null != modifiedStart && modifiedEnd != null) { + if (null != c1) { + c1 = c1.where("modified").gte(modifiedStart).lte(modifiedEnd); + } else { + c1 = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + } + if (c1!=null) { condition = condition.andCondition(new MongoCondition(c1)); } return condition.toMongoQuery(); } + public Date getModifiedStart() { + return modifiedStart; + } + + public void setModifiedStart(Date modifiedStart) { + this.modifiedStart = modifiedStart; + } + + public Date getModifiedEnd() { + return modifiedEnd; + } + + public void setModifiedEnd(Date modifiedEnd) { + this.modifiedEnd = modifiedEnd; + } + + public List getHospitalIds() { + return hospitalIds; + } + + public void setHospitalIds(List hospitalIds) { + this.hospitalIds = hospitalIds; + } + public List getParentIds() { return parentIds; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java index e564421..d44644d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveResultQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -49,6 +50,9 @@ public class SieveResultQuery extends BaseQuery implements IConvertToNativeQuery //是否通知 private Integer isNotify; + private Date modifiedStart; + private Date modifiedEnd; + public Integer getIsNotify() { return isNotify; } @@ -123,9 +127,36 @@ public class SieveResultQuery extends BaseQuery implements IConvertToNativeQuery if (null != renShenResult) { condition = condition.and("renShenResult", renShenResult, MongoOper.IS); } + Criteria c1 = null; + if (null != modifiedStart && modifiedEnd != null) { + if (null != c1) { + c1 = c1.where("modified").gte(modifiedStart).lte(modifiedEnd); + } else { + c1 = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + } + if (null != c1) { + condition = condition.andCondition(new MongoCondition(c1)); + } + return condition.toMongoQuery(); } + public Date getModifiedStart() { + return modifiedStart; + } + + public void setModifiedStart(Date modifiedStart) { + this.modifiedStart = modifiedStart; + } + + public Date getModifiedEnd() { + return modifiedEnd; + } + + public void setModifiedEnd(Date modifiedEnd) { + this.modifiedEnd = modifiedEnd; + } public Integer getCqResult() { return cqResult; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index 2063cd8..f365547 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -4,7 +4,6 @@ package com.lyms.hospitalapi.rcfy; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.FmTypeEnums; -import com.lyms.platform.common.enums.RenShenJieJuEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; @@ -20,15 +19,12 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.MapUtils; -import org.apache.commons.dbutils.QueryRunner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.sql.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -51,6 +47,8 @@ public class RcGlxtService { @Autowired + private PremaritalCheckupService premaritalCheckupService; + @Autowired private AntenatalExaminationService antenatalExaminationService; @Autowired @@ -63,10 +61,17 @@ public class RcGlxtService { @Autowired private MatDeliverService matDeliverService; + @Autowired + private MatDeliverFollowService matDeliverFollowService; + @Autowired private SieveService sieveService; + + @Autowired + private AntExRecordService recordService; + @Autowired private FolicAcidService folicAcidService; @@ -74,14 +79,253 @@ public class RcGlxtService { private ResidentsArchiveService residentsArchiveService; private static Map hospitalsMap = new HashMap<>(); - static { + static{ hospitalsMap.put("2100001785","371082007011");//荣成市人民医院 +// hospitalsMap.put("216","216");//荣成市人民医院 hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院 hospitalsMap.put("2100001772","371082007001");//荣成市中医院 hospitalsMap.put("2100001750","371082000011");//荣成市妇幼保健院 + + } + + public List getHids() + { + List hids = new ArrayList<>(); + for (String key : hospitalsMap.keySet()) + { + hids.add(hospitalsMap.get(key)); + } + return hids; } + + public void saveRcPatientRiskRecord(AntExRecordModel model) { + Connection conn = null; + PreparedStatement ps = null; + try { + conn = ConnTools.makeConnection(); + + Patients patients = patientsService.findOnePatientById(model.getParentId()); + + List risks = model.gethRisk(); + List screens = model.getScreenResult(); + //风险妊娠 + String fmInfoSql = "insert into MATERNAL_PREGNANCY_RISK(ID,ID_CARD,NAME," + + "RIS_TIME,RISK_CATE,RISK_SCREENING_PROGRAM,RISK_SCREENING_CONTENT,RISK_SCREENING_DETAIL,RISK_SCREENING_EXPLAIN,RISK_SCREENING_DETAIL3,RISK_SCREENING_DETAIL4," + + "STATUS,HOSPITAL,DOCTOR,OPERATOR,OPERAT_TIME,CREATE_TIME,UPDATE_TIME) " + + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + if (CollectionUtils.isNotEmpty(risks)) + { + for (String rid : risks) + { + ps = conn.prepareStatement("delete from MATERNAL_PREGNANCY_RISK WHERE ID='" + model.getId()+rid + "'"); + ps.executeUpdate(); + + ps = conn.prepareStatement(fmInfoSql); + ps.setString(1,model.getId()+rid); + ps.setString(2, patients.getCardNo()); + ps.setString(3, patients.getUsername()); + ps.setTimestamp(4, new Timestamp(model.getCheckTime().getTime())); + ps.setString(5, "2"); //风险评估 + List ids = new LinkedList<>(); + getRiskInfo(rid, ids); + Collections.reverse(ids); + int size = ids.size(); + ps.setString(6, size > 0 ? ids.get(0) : null); + ps.setString(7, size > 1 ? ids.get(1) : null); + ps.setString(8, size > 2 ? ids.get(2) : null); + ps.setString(9, size > 3 ? ids.get(3) : null); + ps.setString(10, size > 4 ? ids.get(4) : null); + ps.setString(11, size > 5 ? ids.get(5) : null); + String status = ""; + int week = 0; + if (patients.getLastMenses() != null && model.getCheckTime() != null) + { + week = DateUtil.getWeek(patients.getLastMenses(),model.getCheckTime()); + + //怀孕1~12周为早孕。 怀孕13周~27周为孕中，28周到40周围孕晚期，分娩后是产后，产后42天后不再属于孕期妇女 + if (week >=0 && 12 >= week) + { + status= "1"; + } + else if (week >=13 && 27 >= week) + { + status= "2"; + } + else if (week >=28 && 40 >= week) + { + status= "3"; + } + else + { + status= "4"; + } + } + ps.setString(12, status); + ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); + ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor()); + ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor()); + ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime())); + ps.setTimestamp(17, new Timestamp(model.getCreated().getTime())); + ps.setTimestamp(18, new Timestamp(model.getModified().getTime())); + + int saveRcPatientRiskRecord = ps.executeUpdate(); + System.out.println("saveRcPatientRiskRecord="+saveRcPatientRiskRecord); + } + + } + + if (CollectionUtils.isNotEmpty(screens)) + { + for (String sid : screens) + { + ps = conn.prepareStatement("delete from MATERNAL_PREGNANCY_RISK WHERE ID='" + model.getId()+sid + "'"); + ps.executeUpdate(); + + + ps = conn.prepareStatement(fmInfoSql); + ps.setString(1, model.getId() + sid); + ps.setString(2, patients.getCardNo()); + ps.setString(3, patients.getUsername()); + ps.setTimestamp(4, new Timestamp(model.getCheckTime().getTime())); + ps.setString(5, "1");//风险筛查 + List ids = new LinkedList<>(); + getScreenInfo(sid, ids); + Collections.reverse(ids); + int size = ids.size(); + ps.setString(6, size > 0 ? ids.get(0) : null); + ps.setString(7, size > 1 ? ids.get(1) : null); + ps.setString(8, size > 2 ? ids.get(2) : null); + ps.setString(9, size > 3 ? ids.get(3) : null); + ps.setString(10, size > 4 ? ids.get(4) : null); + ps.setString(11, size > 5 ? ids.get(5) : null); + String status = ""; + int week = 0; + if (patients.getLastMenses() != null && model.getCheckTime() != null) + { + week = DateUtil.getWeek(patients.getLastMenses(),model.getCheckTime()); + + //怀孕1~12周为早孕。 怀孕13周~27周为孕中，28周到40周围孕晚期，分娩后是产后，产后42天后不再属于孕期妇女 + if (week >=0 && 12 >= week) + { + status= "1"; + } + else if (week >=13 && 27 >= week) + { + status= "2"; + } + else if (week >=28 && 40 >= week) + { + status= "3"; + } + else + { + status= "4"; + } + } + ps.setString(12, status); + ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService)); + ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor()); + ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor()); + ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime())); + ps.setTimestamp(17, new Timestamp(model.getCreated().getTime())); + ps.setTimestamp(18, new Timestamp(model.getModified().getTime())); + + int saveRcPatientRiskRecord = ps.executeUpdate(); + System.out.println("saveRcPatientRiskRecord="+saveRcPatientRiskRecord); + } + } + } + catch (Exception e) + { + ExceptionUtils.catchException(e,"saveRcPatientRiskRecord error."); + }finally { + try { + if (ps != null) + { + ps.close(); + } + if (conn != null) + { + conn.close(); + } + } catch (SQLException e) { + } + } + + } + + public void riskAndScreen() + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("5b023e73422b03d4ad2bf8af"); + List list = basicConfigService.queryBasicConfig(basicConfigQuery); + for(BasicConfig base : list) + { + System.out.println(base.getId()+" "+base.getName()); + } + System.out.println("======"); + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); + basicConfigQuery1.setEnable(1); + basicConfigQuery1.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + List list1 = basicConfigService.queryBasicConfig(basicConfigQuery1); + for(BasicConfig base : list1) + { + System.out.println(base.getId()+" "+base.getName()); + } + } + + + public void getScreenInfo(String id,List ids) + { + + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(id); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("5b023e73422b03d4ad2bf8af"); + List list1 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(list1)) + { + String pid = list1.get(0).getpId(); + if (!"筛查结果".equals(list1.get(0).getName()) && pid!= null) + { + ids.add(id); + getScreenInfo(pid, ids); + } + else + { + ids.add(id); + } + } + } + + + + public void getRiskInfo(String id,List ids) + { + + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setId(id); + basicConfigQuery.setEnable(1); + basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + List list1 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isNotEmpty(list1)) + { + String pid = list1.get(0).getpId(); + if (!"妊娠风险预警".equals(list1.get(0).getName()) && pid!= null) + { + ids.add(id); + getRiskInfo(pid, ids); + } + else + { + ids.add(id); + } + } + } + /** * * @@ -103,7 +347,7 @@ public class RcGlxtService { * 产前筛查 * @param model */ - public void saveRcSieveInfo(SieveResultModel model) + public void saveRcSieveInfo(SieveResultModel model,List hids) { Connection conn = null; PreparedStatement ps = null; @@ -114,7 +358,16 @@ public class RcGlxtService { ps.executeUpdate(); - Patients patients = patientsService.findOnePatientById(model.getParentId()); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setId(model.getParentId()); + patientsQuery.setHospitalList(hids); + patientsQuery.setYn(YnEnums.YES.getId()); + List patientses = patientsService.queryPatient(patientsQuery); + if (!CollectionUtils.isNotEmpty(patientses)) + { + return; + } + Patients patients = patientses.get(0); // private String tszhz;// 唐氏综合症 // private String sjgjx;// 神经管畸形 @@ -420,9 +673,9 @@ public class RcGlxtService { ps = conn.prepareStatement(sql); ps.setString(1,model.getId()); ps.setString(2,resident.getUsername()); - ps.setString(3,resident.getCertificateNum()); - ps.setString(4,null); - ps.setString(5,null); + ps.setString(3, resident.getCertificateNum()); + ps.setString(4, null); + ps.setString(5, null); ps.setString(6,null); ps.setString(7,null); @@ -431,7 +684,7 @@ public class RcGlxtService { ps.setString(8,null); ps.setString(9,null); ps.setString(10,null); - ps.setString(11,null); + ps.setString(11, null); ps.setString(12,null); ps.setString(13, StringUtils.isNum(model.getHunJianDoctor()) ? CommonsHelper.getUserName(model.getHunJianDoctor(), usersService) : model.getHunJianDoctor()); @@ -472,7 +725,7 @@ public class RcGlxtService { * 产后访视 * @param model */ - public void saveRcMatdeliverFollowInfo(MatdeliverFollowModel model) + public void saveRcMatdeliverFollowInfo(MatdeliverFollowModel model,List hids) { Connection conn = null; PreparedStatement ps = null; @@ -486,6 +739,7 @@ public class RcGlxtService { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setId(model.getDeliverId()); + matDeliverQuery.setFmHospitalList(hids); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isEmpty(maternalDeliverModelList)) { @@ -922,4 +1176,143 @@ public class RcGlxtService { } } + + public void taskWorker() + { + //十分钟执行一次 + java.util.Date end = new java.util.Date(); + java.util.Date start = new java.util.Date(end.getTime()-2*60*1000); + + List hids = getHids(); + + //孕妇基本信息 + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setModifiedEnd(end); + patientsQuery1.setModifiedStart(start); + List patientses = patientsService.queryPatient(patientsQuery1); + System.out.println("xxxxxxpatientses="+patientses.size()+"===="+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(patientses)) + { + for (Patients pat : patientses) + { + saveRcPatientInfo(pat); + } + } + + + //孕妇分娩信息 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setFmHospitalList(hids); + matDeliverQuery.setModifiedStart(start); + matDeliverQuery.setModifiedEnd(end); + List list2 = matDeliverService.query(matDeliverQuery); + System.out.println("xxxxxx fm="+list2.size()+"===="+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) + { + for (MaternalDeliverModel maternalDeliverModel : list2) + { + saveRcFmInfo(maternalDeliverModel); + } + } + + + //新生儿 + MatDeliverQuery matDeliverQuery1 = new MatDeliverQuery(); + matDeliverQuery1.setYn(YnEnums.YES.getId()); + matDeliverQuery1.setFmHospitalList(hids); + matDeliverQuery1.setModifiedStart(start); + matDeliverQuery1.setModifiedEnd(end); + List list1 = matDeliverService.query(matDeliverQuery1); + System.out.println("xxxxxx new baby="+list1.size()+"===="+matDeliverQuery1.convertToQuery().convertToMongoQuery().toString()); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list1)) + { + for (MaternalDeliverModel maternalDeliverModel : list1) + { + saveRcNewBabyInfo(maternalDeliverModel); + } + } + + //产后访视 + MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery(); + matDeliverFollowQuery.setCreatedTimeEnd(end); + matDeliverFollowQuery.setCreatedTimeStart(start); + matDeliverFollowQuery.setVisitStatus(2); + List matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery); + System.out.println("xxxxxx fs="+matdeliverFollowModels.size()+"===="+matDeliverFollowQuery.convertToQuery().convertToMongoQuery().toString()); + if (CollectionUtils.isNotEmpty(matdeliverFollowModels)) + { + for (MatdeliverFollowModel matdeliverFollowModel : matdeliverFollowModels) + { + saveRcMatdeliverFollowInfo(matdeliverFollowModel, hids); + } + } + + + //婚检 + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setYn(YnEnums.YES.getId()); + query.setModifiedStart(start); + query.setModifiedEnd(end); + query.setHospitalIds(hids); + query.setSexType(1); + List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); + System.out.println("xxxxxx hj="+checkupList.size()+"===="+query.convertToQuery().convertToMongoQuery().toString()); + if (CollectionUtils.isNotEmpty(checkupList)) + { + for (PremaritalCheckup premaritalCheckup : checkupList) + { + saveRcPremaritalCheckupInfo(premaritalCheckup); + } + } + + //叶酸发放 + FolicAcidQuery folicAcidQuery = new FolicAcidQuery(); + folicAcidQuery.setYn(YnEnums.YES.getId()); + folicAcidQuery.setModifiedStart(start); + folicAcidQuery.setModifiedEnd(end); + folicAcidQuery.setHospitalList(hids); + List folicAcidList = folicAcidService.queryFolicAcidWithSort(folicAcidQuery, "drawTime", Sort.Direction.ASC); + System.out.println("xxxxxx ys="+folicAcidList.size()+"===="+folicAcidQuery.convertToQuery().convertToMongoQuery().toString()); + if (CollectionUtils.isNotEmpty(folicAcidList)) + { + for (FolicAcid folicAcid : folicAcidList) + { + saveRcFolicAcidInfo(folicAcid); + } + } + + + //产筛 + SieveResultQuery sieveResultQuery = new SieveResultQuery(); + sieveResultQuery.setYn(YnEnums.YES.getId()); + sieveResultQuery.setModifiedStart(start); + sieveResultQuery.setModifiedEnd(end); + List list = sieveService.queryListSieveResult(sieveResultQuery); + System.out.println("xxxxxx sieve=" + list.size()+"===="+sieveResultQuery.convertToQuery().convertToMongoQuery().toString()); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list)) + { + for (SieveResultModel sieveResultModel : list) + { + saveRcSieveInfo(sieveResultModel,hids); + } + } + + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setHospitalList(hids); + antExRecordQuery.setModifiedStart(start); + antExRecordQuery.setModifiedEnd(end); + List recordModels = recordService.queryAntExRecords(antExRecordQuery); + System.out.println("xxxxxx recordModels=" + recordModels.size()+"===="+antExRecordQuery.convertToQuery().convertToMongoQuery().toString()); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(recordModels)) + { + for (AntExRecordModel antExRecordModel : recordModels) + { + saveRcPatientRiskRecord(antExRecordModel); + } + } + + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index acde84c..b222ac7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -2498,12 +2498,11 @@ public class TestController extends BaseController { MatDeliverFollowQuery matDeliverFollowQuery = new MatDeliverFollowQuery(); List matdeliverFollowModels = matDeliverFollowService.query(matDeliverFollowQuery); matDeliverFollowQuery.setVisitStatus(2); - if (CollectionUtils.isNotEmpty(matdeliverFollowModels)) { for (MatdeliverFollowModel matdeliverFollowModel : matdeliverFollowModels) { - rcGlxtService.saveRcMatdeliverFollowInfo(matdeliverFollowModel); + rcGlxtService.saveRcMatdeliverFollowInfo(matdeliverFollowModel,rcGlxtService.getHids()); } } } @@ -2544,7 +2543,6 @@ public class TestController extends BaseController { FolicAcidQuery folicAcidQuery = new FolicAcidQuery(); folicAcidQuery.setYn(YnEnums.YES.getId()); - folicAcidQuery.setId("587621160cf248988f190469"); List folicAcidList = folicAcidService.queryFolicAcidWithSort(folicAcidQuery, "drawTime", Sort.Direction.ASC); @@ -2557,21 +2555,43 @@ public class TestController extends BaseController { } } - + /** + * 孕期筛查表 + * @param hospitalId + */ @RequestMapping(value = "/rcSieveInfo", method = RequestMethod.GET) @ResponseBody public void rcSieveInfo(@RequestParam(required = false) String hospitalId) { - - SieveResultQuery sieveResultQuery = new SieveResultQuery(); sieveResultQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(list)) { for (SieveResultModel sieveResultModel : list) { - rcGlxtService.saveRcSieveInfo(sieveResultModel); + rcGlxtService.saveRcSieveInfo(sieveResultModel, rcGlxtService.getHids()); + } + } + } + + + /** + * 风险妊娠 + * @param hospitalId + */ + @RequestMapping(value = "/rcPatientRiskRecord", method = RequestMethod.GET) + @ResponseBody + public void rcPatientRiskRecord(@RequestParam(required = false) String hospitalId) { + + rcGlxtService.riskAndScreen(); + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setHospitalList(rcGlxtService.getHids()); + List recordModels = recordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(recordModels)) + { + for (AntExRecordModel antExRecordModel : recordModels) + { + rcGlxtService.saveRcPatientRiskRecord(antExRecordModel); } } } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 4a37431..839b999 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -347,6 +347,22 @@ + + + + + + + + + + + + + + + + @@ -364,6 +380,7 @@ +