diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index 28d2351..533e3c9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -282,30 +282,28 @@ public class ExcelUtil { }else if (j==2){ params.put("birth",str); }else if (j==3){ - params.put("phone",str); - }else if (j==4){ params.put("age",str); + }else if (j==4){ + params.put("phone",str); }else if (j==5){ - params.put("xian",str); + params.put("bookbuildingDate",str); }else if (j==6){ - params.put("xiang",str); + params.put("lastMenses",str); }else if (j==7){ - params.put("cun",str); + params.put("dueDate",str); }else if (j==8){ - params.put("checkDate",str); + params.put("riskFactorId",getRiskFactorId(str)); }else if (j==9){ - params.put("bookbuildingDate",str); + params.put("name",str); }else if (j==10){ params.put("currentDueDate",str); }else if (j==11){ - params.put("riskFactorId",getRiskFactorId(str)); + params.put("checkDate",str); }else if (j==12){ - params.put("name",str); - }else if (j==13){ params.put("operator",str); - }else if (j==14){ + }else if(j==13){ params.put("nextCheckTime",str); - }else if (j==15){ + }else if (j==14){ params.put("num",str); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index be4d2e4..6269179 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -4922,7 +4922,11 @@ public class BookbuildingFacade { patient.setLastReportDoctorName(users.get(0).getName()); } } - patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("checkDate"))); + if (StringUtils.isEmpty(map.get("lastMenses"))){ + patient.setLastMenses(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("checkDate"))); + }else { + patient.setLastMenses(DateUtil.parseYMD(map.get("lastMenses"))); + } Integer type = 1; //1孕妇 2儿童 3产妇 //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 Integer buildType = 0; @@ -4965,21 +4969,28 @@ public class BookbuildingFacade { patient.setUsername(map.get("username")); patient.setCardNo(map.get("cardNo")); patient.setHospitalId("2100001504"); - patient.setBookbuildingDate(DateUtil.parseYMD(map.get("checkDate"))); + patient.setBookbuildingDate(DateUtil.parseYMD(map.get("bookbuildingDate"))); patient.setAge(Integer.valueOf(map.get("age"))); patient.setBirth(DateUtil.parseYMD(map.get("birth"))); - patient.setAddressRegister(map.get("xian") + map.get("xiang") + map.get("cun")); + // patient.setAddressRegister(map.get("xian") + map.get("xiang") + map.get("cun")); patient.setPhone(map.get("phone")); patient.setFirstCheckId(String.valueOf(patient.getOperator())); patient.setFirstCheckTime(patient.getBookbuildingDate()); if (patient.getLastMenses() != null) { patient.setBuildDays(DateUtil.getDays(patient.getLastMenses(), new Date())); - patient.setDueDate(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(DateUtil.addDay(patient.getLastMenses(), 42 * 7)))); + String dueDate=null; + if (StringUtils.isNotEmpty(map.get("dueDate"))){ + dueDate= map.get("dueDate"); + }else { + dueDate=DateUtil.getyyyy_MM_dd(DateUtil.addDay(patient.getLastMenses(), 42 * 7)); + } + patient.setDueDate(DateUtil.parseYMD(dueDate)); } patient.setDueStatus(0); //1孕妇 3 产妇 patient.setType(type); + patient.setNextCheckTime(DateUtil.parseYMD(map.get("nextCheckTime"))); if (type == 3) { patient.setIsAutoFm(YnEnums.YES.getId()); } @@ -5034,11 +5045,18 @@ public class BookbuildingFacade { } } } else { - patient.setFirstCheckTime(patient.getBookbuildingDate()); + //patient.setFirstCheckTime(patient.getBookbuildingDate()); patient.setNextCheckTime(DateUtil.parseYMD(map.get("nextCheckTime"))); if (patient.getDueDate() != null) { } else { - patient.setDueDate(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.getCurrentDueDate(map.get("currentDueDate"), map.get("bookbuildingDate")), 42 * 7)))); + String dueDate=null; + if (StringUtils.isNotEmpty(map.get("dueDate"))){ + dueDate= map.get("dueDate"); + }else { + dueDate=DateUtil.getyyyy_MM_dd(DateUtil.addDay(patient.getLastMenses(), 42 * 7)); + } + patient.setDueDate(DateUtil.parseYMD(dueDate)); + } OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); @@ -5061,8 +5079,77 @@ public class BookbuildingFacade { Integer num = Integer.valueOf(map.get("num")); AntExRecordModel antExRecordModel = new AntExRecordModel(); AntExChuModel antExChuModel = new AntExChuModel(); - if (num > 0) { + String riskFactor = map.get("name"); + List riskFactorlist = new ArrayList<>(); + List nameList = new ArrayList<>(); + List riskFactorlists = new ArrayList<>(); + List riskLevelId = new ArrayList<>(); + antExRecordModel.setHospitalId("2100001504"); + antExRecordModel.setLastMenses(patient.getLastMenses()); + antExRecordModel.setName(patient.getUsername()); + antExRecordModel.setNextCheckTime(DateUtil.parseYMD(map.get("nextCheckTime"))); + antExRecordModel.setBrith(DateUtil.parseYMD(map.get("birth"))); + antExRecordModel.setParentId(patient.getId()); + antExRecordModel.setPid(patient.getPid()); + antExRecordModel.setDueDate(patient.getDueDate()); + antExRecordModel.setCardNo(patient.getCardNo()); + antExRecordModel.setCheckDoctor(String.valueOf(patient.getOperator())); + antExRecordModel.setType(1); + antExRecordModel.setCheckTime(DateUtil.parseYMD(map.get("checkDate"))); + antExRecordModel.setBuildTime(DateUtil.parseYMD(map.get("checkDate"))); + if (antExRecordModel.getDueDate() != null) { + antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1); + antExRecordModel.setDueStatus(antExRecordModel.getStatus()); + } + if (StringUtils.isNotEmpty(riskFactor)) { + String[] split = riskFactor.split(","); + for (String s : split) { + nameList.add(s); + } + } + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setEnable(1); + basicConfigQuery.setNames(nameList); + basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + //所有数据 + List listBasic = basicConfigService.queryBasicConfig(basicConfigQuery); + if (CollectionUtils.isEmpty(listBasic)) { + riskFactorlists.add(map.get("riskFactorId")); + List list1 = new ArrayList(); + list1.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); + antExRecordModel.sethRisk(list1); + antExRecordModel.sethLevel(riskFactorlists); + antExChuModel.setHighrisk(JsonUtil.array2JsonString(riskFactorlists)); + patient.setoRiskFactor(JsonUtil.array2JsonString(antExRecordModel.gethRisk())); + patient.setRiskFactorId(antExRecordModel.gethRisk()); + patient.setRiskLevelId(JsonUtil.array2JsonString(antExRecordModel.gethLevel())); + logger.info("riskFactorlists," + riskFactorlists.toString()); + } else { + Integer score = 0; + for (BasicConfig basicConfig : listBasic) { + riskFactorlist.add(basicConfig.getId()); + riskLevelId.add(basicConfig.getParentId()); + score += Integer.valueOf(basicConfig.getCode() != null ? basicConfig.getCode() : "0"); + } + if (CollectionUtils.isNotEmpty(riskFactorlist)) { + antExChuModel.setHighrisk(JsonUtil.array2JsonString(riskFactorlist)); + patient.setRiskFactorId(riskFactorlist); + antExChuModel.setHighriskSocre(String.valueOf(score)); + patient.setRiskScore(score); + antExRecordModel.sethScore(score); + antExRecordModel.sethRisk(riskFactorlist); + patient.setoRiskFactor(JsonUtil.array2JsonString(antExRecordModel.gethRisk())); + + } + if (CollectionUtils.isNotEmpty(riskLevelId)) { + antExRecordModel.sethLevel(riskLevelId); + patient.setRiskLevelId(JsonUtil.array2JsonString(riskLevelId)); + } + } + yunBookbuildingService.update(patient, patient.getId()); + + if (num == 1) { antExChuModel.setParentId(patient.getId()); antExChuModel.setName(patient.getUsername()); antExChuModel.setYn(YnEnums.YES.getId()); @@ -5073,84 +5160,15 @@ public class BookbuildingFacade { antExChuModel.setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(patient.getLastMenses(), new Date()))); antExChuModel.setPid(patient.getPid()); antExChuModel.setProdDoctor(String.valueOf(patient.getOperator())); - String riskFactor = map.get("name"); - List riskFactorlist = new ArrayList<>(); - List riskLevelId = new ArrayList<>(); - if (StringUtils.isNotEmpty(riskFactor)) { - String[] split = riskFactor.split(","); - for (String s : split) { - riskFactorlist.add(s); - } - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setEnable(1); - basicConfigQuery.setNames(riskFactorlist); - basicConfigQuery.setTypeId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); - //所有数据 - List listBasic = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isEmpty(listBasic)) { - riskFactorlist.clear(); - riskFactorlist.add(map.get("riskFactorId")); - List list1 = new ArrayList(); - list1.add("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); - antExRecordModel.sethRisk(list1); - antExRecordModel.sethLevel(riskFactorlist); - antExChuModel.setHighrisk(JsonUtil.array2JsonString(riskFactorlist)); - patient.setoRiskFactor(JsonUtil.array2JsonString(antExRecordModel.gethRisk())); - patient.setRiskFactorId(antExRecordModel.gethRisk()); - patient.setRiskLevelId(JsonUtil.array2JsonString(antExRecordModel.gethLevel())); - logger.info("riskFactorlist," + riskFactorlist.toString()); - } else { - riskFactorlist.clear(); - Integer score = 0; - - for (BasicConfig basicConfig : listBasic) { - riskFactorlist.add(basicConfig.getId()); - riskLevelId.add(basicConfig.getParentId()); - score += Integer.valueOf(basicConfig.getCode() != null ? basicConfig.getCode() : "0"); - } - if (CollectionUtils.isNotEmpty(riskFactorlist)) { - antExChuModel.setHighrisk(JsonUtil.array2JsonString(riskFactorlist)); - patient.setRiskFactorId(riskFactorlist); - antExChuModel.setHighriskSocre(String.valueOf(score)); - patient.setRiskScore(score); - antExRecordModel.sethScore(score); - antExRecordModel.sethRisk(riskFactorlist); - patient.setoRiskFactor(JsonUtil.array2JsonString(antExRecordModel.gethRisk())); - - } - if (CollectionUtils.isNotEmpty(riskLevelId)) { - antExRecordModel.sethLevel(riskLevelId); - patient.setRiskLevelId(JsonUtil.array2JsonString(riskLevelId)); - } - } - yunBookbuildingService.update(patient, patient.getId()); - } - antExRecordModel.setHospitalId(antExChuModel.getHospitalId()); - antExRecordModel.setLastMenses(antExChuModel.getLastMenses()); - antExRecordModel.setName(antExChuModel.getName()); - antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime()); - antExRecordModel.setBrith(DateUtil.parseYMD(map.get("birth"))); - antExRecordModel.setParentId(patient.getId()); - antExRecordModel.setPid(patient.getPid()); - antExRecordModel.setDueDate(patient.getDueDate()); - antExRecordModel.setCardNo(patient.getCardNo()); - antExRecordModel.setCheckDoctor(String.valueOf(patient.getOperator())); - antExRecordModel.setType(1); - antExRecordModel.setCheckTime(antExChuModel.getCheckTime()); - antExRecordModel.setBuildTime(DateUtil.parseYMD(map.get("checkDate"))); - if (antExRecordModel.getDueDate() != null) { - antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1); - antExRecordModel.setDueStatus(antExRecordModel.getStatus()); - } antExRecordService.addOneRecord(antExRecordModel); antenatalExaminationService.addOneAntEx(antExChuModel); //初诊是添加追访记录 addTrackDownInfo(patient.getOperator(), patient); } + if (num > 1) { - for (int i = 0, j = num - 1; i < j; i++) { antExRecordModel.setId(null); antExRecordModel.setType(2); AntenatalExaminationModel antenatalExaminationModel = new AntenatalExaminationModel(); @@ -5168,7 +5186,6 @@ public class BookbuildingFacade { antenatalExaminationModel.setCheckDate(DateUtil.parseYMD(map.get("checkDate"))); antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel); antExRecordService.addOneRecord(antExRecordModel); - } } } });