|
@@ -5,9 +5,11 @@ import com.google.common.collect.Maps;
|
|
|
import com.lantone.common.util.ListUtil;
|
|
|
import com.lantone.common.util.StringUtil;
|
|
|
import com.lantone.structure.facade.tran.util.CommonAnalysisUtil;
|
|
|
+import com.lantone.structure.model.Development;
|
|
|
import com.lantone.structure.model.doc.BeHospitalizedDoc;
|
|
|
import com.lantone.structure.model.entity.*;
|
|
|
import com.lantone.structure.model.label.PastLabel;
|
|
|
+import com.lantone.structure.model.label.PersonalLabel;
|
|
|
import com.lantone.structure.util.MapUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -216,18 +218,20 @@ public class BeHospitalizedTran extends TargetTran {
|
|
|
//发育情况代码
|
|
|
if(StringUtil.isNotEmpty(retMap.get("个人史"))){
|
|
|
List<String> caseStr = Arrays.asList("预防接种史");
|
|
|
- List<String> standStr = Arrays.asList("正常");
|
|
|
- List<String> badStr = Arrays.asList("迟缓","缓慢","落后","欠理想");
|
|
|
+ /* List<String> standStr = Arrays.asList("正常");
|
|
|
+ List<String> badStr = Arrays.asList("迟缓","缓慢","落后","欠理想");*/
|
|
|
String casePerson = retMap.get("个人史");
|
|
|
+ String development = "";
|
|
|
if(casePerson.contains("生长发育史")){
|
|
|
- casePerson = casePerson.substring(casePerson.indexOf("生长发育史")+"生长发育史".length());
|
|
|
+ development = casePerson.substring(casePerson.indexOf("生长发育史")+"生长发育史".length());
|
|
|
}
|
|
|
for (String str : caseStr) {
|
|
|
- if(casePerson.contains(str)){
|
|
|
- casePerson = casePerson.substring(0,casePerson.indexOf(str));
|
|
|
+ if(development.contains(str)){
|
|
|
+ development = development.substring(0,development.indexOf(str));
|
|
|
}
|
|
|
}
|
|
|
- for (String str : standStr) {
|
|
|
+ retMap.put("生长发育史",development);
|
|
|
+ /* for (String str : standStr) {
|
|
|
if(casePerson.contains(str)) {
|
|
|
retMap.put("发育情况代码","1");
|
|
|
}
|
|
@@ -237,7 +241,7 @@ public class BeHospitalizedTran extends TargetTran {
|
|
|
if(casePerson.contains(str)) {
|
|
|
retMap.put("发育情况代码","2");
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1161,7 +1165,10 @@ public class BeHospitalizedTran extends TargetTran {
|
|
|
if(StringUtil.isNotEmpty(rep.get("既往史"))){
|
|
|
rep.remove("既往史");
|
|
|
}
|
|
|
- if( beHospitalizedDoc !=null && beHospitalizedDoc.getPastLabel() != null){
|
|
|
+ if(StringUtil.isNotEmpty(rep.get("生长发育史"))){
|
|
|
+ rep.remove("生长发育史");
|
|
|
+ }
|
|
|
+ if( beHospitalizedDoc != null && beHospitalizedDoc.getPastLabel() != null){
|
|
|
PastLabel pastLabel = beHospitalizedDoc.getPastLabel();
|
|
|
if(pastLabel != null){
|
|
|
//输血史
|
|
@@ -1190,6 +1197,20 @@ public class BeHospitalizedTran extends TargetTran {
|
|
|
commomRecord(vaccinates,rep,"预防接种史");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if( beHospitalizedDoc != null && beHospitalizedDoc.getPersonalLabel() != null){
|
|
|
+ PersonalLabel personalLabel = beHospitalizedDoc.getPersonalLabel();
|
|
|
+ if(personalLabel != null){
|
|
|
+ //生长发育史
|
|
|
+ Development development = personalLabel.getDevelopment();
|
|
|
+ if(null != development && StringUtils.isNotEmpty(development.getName())){
|
|
|
+ String name = development.getName().replace("正立型","1")
|
|
|
+ .replace("无力型","2").replace("超力型","3");
|
|
|
+ rep.put("生长发育史",name);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public static void flagMethod( Map<String,String> rep){
|