|
@@ -3,12 +3,14 @@ package com.diagbot.repository;
|
|
|
import com.diagbot.dto.DrugBillNeoDTO;
|
|
|
import com.diagbot.dto.HighRiskNeoDTO;
|
|
|
import com.diagbot.dto.NodeNeoDTO;
|
|
|
+import com.diagbot.entity.node.Gender;
|
|
|
import com.diagbot.entity.node.Group;
|
|
|
import com.diagbot.entity.node.MedAllergen;
|
|
|
import com.diagbot.entity.node.MedCodeName;
|
|
|
import com.diagbot.entity.node.MedRegName;
|
|
|
import com.diagbot.entity.node.Medicine;
|
|
|
import com.diagbot.entity.node.Vital;
|
|
|
+import com.diagbot.entity.relationship.MedRegNameGender;
|
|
|
import com.diagbot.entity.relationship.MedRegNameGroup;
|
|
|
import com.diagbot.entity.relationship.MedRegNameMedAllergen;
|
|
|
import com.diagbot.entity.relationship.MedRegNameMedRegName;
|
|
@@ -33,6 +35,8 @@ public class MedRegNameNode {
|
|
|
VitalRepository vitalRepository;
|
|
|
@Autowired
|
|
|
MedRegNameRepository medRegNameRepository;
|
|
|
+ @Autowired
|
|
|
+ GenderRepository genderRepository;
|
|
|
|
|
|
/**
|
|
|
* 获取高危药品数据
|
|
@@ -44,7 +48,7 @@ public class MedRegNameNode {
|
|
|
String drugname, drugform;
|
|
|
List<Medicine> medicine;
|
|
|
List<MedCodeName> medcdnames;
|
|
|
-// MedRegName medreg;
|
|
|
+ // MedRegName medreg;
|
|
|
|
|
|
// Long t1 = System.currentTimeMillis();
|
|
|
|
|
@@ -91,18 +95,17 @@ public class MedRegNameNode {
|
|
|
if (NeoUtil.isExist(medvital.getVital())) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
Vital vital = medvital.getVital();
|
|
|
- String name = (vital.getVitalidx()==null)?vital.getName():vital.getVitalidx();
|
|
|
+ String name = (vital.getVitalidx() == null) ? vital.getName() : vital.getVitalidx();
|
|
|
nodeInfo.setName(name);
|
|
|
nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
|
|
|
nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));
|
|
|
nodeInfo.setUnit(vital.getUnit());
|
|
|
nodeInfo.setRange(vital.getRange());
|
|
|
nodeInfo.setTypeval(name);
|
|
|
-// NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(medvital.getVital());
|
|
|
+ // NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(medvital.getVital());
|
|
|
if (name.equals(Constants.age)) {
|
|
|
drugBillNeoDTO.setAgeNeoDTO(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
drugBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
}
|
|
@@ -145,15 +148,23 @@ public class MedRegNameNode {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- String conflict_gender = medRegName.getConflict_gender();
|
|
|
+ /*String conflict_gender = medRegName.getConflict_gender();
|
|
|
if (null != conflict_gender) {
|
|
|
NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
|
|
|
nodeNeoDTO.setName(conflict_gender);
|
|
|
nodeNeoDTO.setTermtype(Constants.gender);
|
|
|
drugBillNeoDTO.setGender(nodeNeoDTO);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
+ MedRegNameGender medRegNameGender = medRegName.getMedRegNameGender();
|
|
|
+ if (NeoUtil.isExist(medRegNameGender)) {
|
|
|
+ if (NeoUtil.isExist(medRegNameGender.getGender())) {
|
|
|
+ NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
|
|
|
+ nodeNeoDTO.setName(medRegNameGender.getGender().getName());
|
|
|
+ nodeNeoDTO.setTermtype(Constants.gender);
|
|
|
+ drugBillNeoDTO.setGender(nodeNeoDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
String conflict_geiyao = medRegName.getConflict_geiyao();
|
|
|
if (null != conflict_geiyao) {
|
|
@@ -174,6 +185,15 @@ public class MedRegNameNode {
|
|
|
Boolean isExist = false;
|
|
|
try {
|
|
|
switch (relname) {
|
|
|
+ case "药品注册名称禁忌性别":
|
|
|
+ Gender gender = genderRepository.findByNameIs(e_name).get(0);
|
|
|
+ MedRegNameGender medRegNameGender = new MedRegNameGender();
|
|
|
+ medRegNameGender.setGender(gender);
|
|
|
+ medRegNameGender.setMedRegName(medRegName);
|
|
|
+ medRegNameGender.setStatus(status);
|
|
|
+ medRegNameGender.setRuleType(ruleType);
|
|
|
+ medRegName.setMedRegNameGender(medRegNameGender);
|
|
|
+ break;
|
|
|
case "药品注册名称禁忌禁忌人群":
|
|
|
Group group = groupRepository.findByNameIs(e_name).get(0);
|
|
|
Set<MedRegNameGroup> medRegNameGroupSet = medRegName.getMedRegNameGroup();
|