|
@@ -263,15 +263,20 @@ public class PatientService {
|
|
|
}
|
|
|
|
|
|
private @NotNull String getCrm(String socialNo) {
|
|
|
- String type = dao.getCrmBySocialNo(socialNo);
|
|
|
- if (StringUtil.isBlank(type)) {
|
|
|
+ String chronicDiseaseTypes = dao.getCrmBySocialNo(socialNo);
|
|
|
+ if (StringUtil.isBlank(chronicDiseaseTypes)) {
|
|
|
return "";
|
|
|
}
|
|
|
- List<String> typeList = dao.getCrmTypeName(type);
|
|
|
+ String[] types = chronicDiseaseTypes.split(",");
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ for (String type : types) {
|
|
|
+ sb.append(",'").append(type).append("'");
|
|
|
+ }
|
|
|
+ List<String> typeList = dao.getCrmTypeName(sb.substring(1));
|
|
|
if (ListUtil.isBlank(typeList)) {
|
|
|
return "";
|
|
|
}
|
|
|
- return String.join(",", typeList);
|
|
|
+ return String.join(",", typeList);
|
|
|
}
|
|
|
|
|
|
private String getBirthdayFromSocialNo(String socialNo) {
|