|
|
@@ -13,6 +13,7 @@ import com.diagbot.entity.DeptVital;
|
|
|
import com.diagbot.entity.QuestionInfo;
|
|
|
import com.diagbot.entity.VitalOrder;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
+import com.diagbot.enums.QuestionTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
@@ -22,6 +23,7 @@ import com.diagbot.web.DeptInfoController;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.sun.corba.se.impl.ior.OldJIDLObjectKeyTemplate;
|
|
|
import com.sun.xml.internal.ws.config.metro.dev.FeatureReader;
|
|
|
+import org.aspectj.weaver.patterns.TypePatternQuestions;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
@@ -100,19 +102,19 @@ public class PushFacade {
|
|
|
Map<String, Object> labMap = list2Map(labs);
|
|
|
Map<String, Object> pacsMap = list2Map(pacs);
|
|
|
|
|
|
- if (featureTypeSet.contains("5")) {
|
|
|
+ if (featureTypeSet.contains(QuestionTypeEnum.Lis.getKey())) {
|
|
|
pushDTO.setLabMap(labMap);
|
|
|
- } else if (featureTypeSet.contains("6")) {
|
|
|
+ } else if (featureTypeSet.contains(QuestionTypeEnum.Pacs.getKey())) {
|
|
|
pushDTO.setPacsMap(pacsMap);
|
|
|
- } else if (featureTypeSet.contains("7")) {
|
|
|
+ } else if (featureTypeSet.contains(QuestionTypeEnum.Disease.getKey())) {
|
|
|
pushDTO.setDisMap(disMap);
|
|
|
}
|
|
|
//症状(主诉 type=1;现病史 type=2) 返回 tagName+填写单
|
|
|
- else if (featureTypeSet.contains("1") || featureTypeSet.contains("2")) {
|
|
|
+ else if (featureTypeSet.contains(QuestionTypeEnum.Mainsuit.getKey()) || featureTypeSet.contains(QuestionTypeEnum.Symptom.getKey())) {
|
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
|
|
|
questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
|
|
|
in("tag_name", symptomMap.keySet()).
|
|
|
- eq("type", "2");
|
|
|
+ eq("type", QuestionTypeEnum.Symptom.getKey());
|
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
Map<String, QuestionInfo> questionInfoMap = EntityUtil.makeEntityMap(questionInfoList, "tagName");
|
|
|
for (Map.Entry<String, Object> entry : symptomMap.entrySet()) {
|
|
|
@@ -127,7 +129,7 @@ public class PushFacade {
|
|
|
pushDTO.setSymptomMap(symptomMap);
|
|
|
}
|
|
|
//查体 返回模板
|
|
|
- else if (featureTypeSet.contains("4") && dis != null && dis.size() > 0) {
|
|
|
+ else if (featureTypeSet.contains(QuestionTypeEnum.Vital.getKey()) && dis != null && dis.size() > 0) {
|
|
|
String deptName = dis.get(0).getExtraProperty();
|
|
|
QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
|
|
|
deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
|
|
|
@@ -186,4 +188,4 @@ public class PushFacade {
|
|
|
}
|
|
|
return map;
|
|
|
}
|
|
|
-}
|
|
|
+}
|
Zhaops