diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java index 9ef8b07..08e8b6d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java @@ -30,7 +30,29 @@ public class BasicConfigService implements InitializingBean { @Autowired private IBasicConfigDao basicConfigDao; - private LoadingCache cached=null; + private LoadingCache cached = null; + + //获取产检的筛查结果字符串 + public String getScreenResult(List screen) { + StringBuilder sb = new StringBuilder(56); + //筛查结果 + if (CollectionUtils.isNotEmpty(screen)) { + for (String srt : screen) { + if (StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + return sb.substring(0, sb.length() - 1); + } else { + return sb.toString(); + } + } + return "-"; + } public void addBasicConfig(BasicConfig obj) { obj.setModifiedDate(System.currentTimeMillis()); @@ -74,9 +96,9 @@ public class BasicConfigService implements InitializingBean { public BasicConfig getOneBasicConfigById(String id) { - try{ + try { return cached.get(id); - }catch (Exception e){ + } catch (Exception e) { } return basicConfigDao.getOneBasicConfigById(id); } @@ -97,7 +119,7 @@ public class BasicConfigService implements InitializingBean { public BasicConfig load(String key) throws Exception { return basicConfigDao.getOneBasicConfigById(key); } - },400,3); + }, 400, 3); } public BaseObjectResponse getAddressItems(String address) { @@ -111,25 +133,21 @@ public class BasicConfigService implements InitializingBean { regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setYn(YnEnums.YES.getId()); - if (items != null && items.size() == 4) - { + if (items != null && items.size() == 4) { regionsQuery.setOrName(items.get(0)); List provinceList = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(provinceList)) - { + if (CollectionUtils.isNotEmpty(provinceList)) { regionsQuery = new BasicConfigQuery(); regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setParentId(provinceList.get(0).getId()); - map.put("provinceId",provinceList.get(0).getId()); + map.put("provinceId", provinceList.get(0).getId()); List cityList = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(cityList)) - { + if (CollectionUtils.isNotEmpty(cityList)) { List cityIds = new ArrayList<>(); - for (BasicConfig basicConfig : cityList) - { + for (BasicConfig basicConfig : cityList) { cityIds.add(basicConfig.getId()); } @@ -140,10 +158,9 @@ public class BasicConfigService implements InitializingBean { List area = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(area)) - { - map.put("cityId",area.get(0).getParentId()); - map.put("areaId",area.get(0).getId()); + if (CollectionUtils.isNotEmpty(area)) { + map.put("cityId", area.get(0).getParentId()); + map.put("areaId", area.get(0).getId()); regionsQuery = new BasicConfigQuery(); @@ -152,57 +169,50 @@ public class BasicConfigService implements InitializingBean { regionsQuery.setParentId(area.get(0).getId()); List street = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(street)) - { - map.put("streetId",street.get(0).getId()); + if (CollectionUtils.isNotEmpty(street)) { + map.put("streetId", street.get(0).getId()); } } } } - map.put("address", items.get(items.size()-1)); - } - else if (items != null && items.size() == 5) - { + map.put("address", items.get(items.size() - 1)); + } else if (items != null && items.size() == 5) { regionsQuery.setOrName(items.get(0)); List provinceList = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(provinceList)) - { - map.put("provinceId",provinceList.get(0).getId()); + if (CollectionUtils.isNotEmpty(provinceList)) { + map.put("provinceId", provinceList.get(0).getId()); regionsQuery = new BasicConfigQuery(); regionsQuery.setParentId(provinceList.get(0).getId()); regionsQuery.setOrName(items.get(1)); List cityList = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(cityList)) - { - map.put("cityId",cityList.get(0).getId()); + if (CollectionUtils.isNotEmpty(cityList)) { + map.put("cityId", cityList.get(0).getId()); regionsQuery = new BasicConfigQuery(); regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setOrName(items.get(2)); regionsQuery.setParentId(cityList.get(0).getId()); List area = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(area)) - { - map.put("areaId",area.get(0).getId()); + if (CollectionUtils.isNotEmpty(area)) { + map.put("areaId", area.get(0).getId()); regionsQuery = new BasicConfigQuery(); regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); regionsQuery.setOrName(items.get(3)); regionsQuery.setParentId(area.get(0).getId()); List street = queryBasicConfig(regionsQuery); - if (CollectionUtils.isNotEmpty(street)) - { - map.put("streetId",street.get(0).getId()); + if (CollectionUtils.isNotEmpty(street)) { + map.put("streetId", street.get(0).getId()); } } } } - map.put("address",items.get(items.size()-1)); + map.put("address", items.get(items.size() - 1)); } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 312f4e2..edfbb72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2362,10 +2362,13 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(configModels) && StringUtils.isNotEmpty(configModels.get(0).getEnable())) { antexListResult.setEnableConfig(configModels.get(0).getEnable()); } + List> screenList = getscreenResult(patients.getScreenResult()); + antexListResult.setScreenResult(screenList); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } + public List handlAntData(List antExChulist, List list) { List dataList = new ArrayList<>(); Organization organization = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 0637426..d47a548 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -843,7 +843,8 @@ public class ApplyOrderFacade { } applyOrderResult.setrLevel(rLevel); Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); - + String screenStr = basicConfigService.getScreenResult(patients.getScreenResult()); + applyOrderResult.setScreenResult(screenStr); if (null != patients) { applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1"); if (1 == patients.getDueStatus()) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 08eab52..6d1cede 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -31,7 +31,8 @@ public class AntexListResult { private List treatmentOpinion2; /** 处理意见 */ private String treatmentOpinion2Types; - + //筛查结果 + private List> screenResult; private String pid; //名字 private String name; @@ -72,6 +73,14 @@ public class AntexListResult { // + public List> getScreenResult() { + return screenResult; + } + + public void setScreenResult(List> screenResult) { + this.screenResult = screenResult; + } + public String getEnableConfig() { return enableConfig; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java index a28acc1..a9f0637 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java @@ -33,7 +33,8 @@ public class ApplyOrderOutResult { private List rLevel; //风险因素 private String rRisk; - + //筛查结果 + private String screenResult; private Integer score = 0; //病情描述 private String diseaseDesc; @@ -68,6 +69,13 @@ public class ApplyOrderOutResult { //1 孕妇 0 产妇 private String isGravida; + public String getScreenResult() { + return screenResult; + } + + public void setScreenResult(String screenResult) { + this.screenResult = screenResult; + } public String getIsGravida() { return isGravida; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index 9c9713d..8f0da86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -15,7 +15,6 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntExRecordModel; import com.lyms.platform.pojo.AntenatalExaminationModel; -import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.AntExRecordQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; @@ -199,23 +198,9 @@ public class AntExRecordWorker implements Callable> { //筛查结果 List screen = e.getScreenResult(); - if (CollectionUtils.isNotEmpty(screen)) { - StringBuilder sb = new StringBuilder(56); - for (String srt : screen) { - if (org.apache.commons.lang.StringUtils.isNotEmpty(srt)) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); - if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { - sb.append(basicConfig.getName()).append(','); - } - } - } - if (sb.toString().endsWith(",")) { - antExManagerResult.setScreenResult(sb.substring(0, sb.length() - 1)); - } else { - antExManagerResult.setScreenResult(sb.toString()); - } - } + String screenStr = basicConfigService.getScreenResult(screen); + antExManagerResult.setScreenResult(screenStr); antExManagerResult.setRiskFactor(ri); antExManagerResult.setRiskScore((e.gethScore() + score) + ""); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index f65ff61..95b533f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -92,23 +92,8 @@ public class QuanPatientWorker implements Callable> { } } //筛查结果 - List screen = patients.getScreenResult(); - if (CollectionUtils.isNotEmpty(screen)) { - StringBuilder sb = new StringBuilder(56); - for (String srt : screen) { - if (StringUtils.isNotEmpty(srt)) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); - if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { - sb.append(basicConfig.getName()).append(','); - } - } - } - if (sb.toString().endsWith(",")) { - quanPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1)); - } else { - quanPatientsResult.setScreenResult(sb.toString()); - } - } + String screenStr = basicConfigService.getScreenResult(patients.getScreenResult()); + quanPatientsResult.setScreenResult(screenStr); quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); stopWatch.start("query ant count"); antExChuQuery1.setPid(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 0526d79..d9f006b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -178,22 +178,9 @@ public class WorkHR implements Callable> { stopWatch.start("query findLastRisk"); //筛查结果 List screen = patients.getScreenResult(); - if (CollectionUtils.isNotEmpty(screen)) { - StringBuilder sb = new StringBuilder(56); - for (String srt : screen) { - if (StringUtils.isNotEmpty(srt)) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); - if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { - sb.append(basicConfig.getName()).append(','); - } - } - } - if (sb.toString().endsWith(",")) { - riskPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1)); - } else { - riskPatientsResult.setScreenResult(sb.toString()); - } - } + + String screenStr = basicConfigService.getScreenResult(screen); + riskPatientsResult.setScreenResult(screenStr); //高危因素 List factor = patients.getRiskFactorId();