|
|
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
+import reactor.core.publisher.Flux;
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
|
import java.math.BigDecimal;
|
|
|
@@ -412,7 +413,6 @@ public class FactorEnchangeFactory {
|
|
|
} else {
|
|
|
MidIncidentAuditDetail midIncidentAuditDetail = new MidIncidentAuditDetail();
|
|
|
midIncidentAuditDetail.setAmount(midIncidentAudit.getAmount());
|
|
|
- Double amount = (Double) itemMap.getOrDefault(Constant.AMOUNT_KEY, 0.0);
|
|
|
midIncidentAuditDetail.setMedicalDeptCode(itemMap.get("medical_dept_code").toString());
|
|
|
midIncidentAuditDetail.setMedicalDeptName(itemMap.get("medical_dept_name").toString());
|
|
|
Date date = new Date(System.currentTimeMillis());
|
|
|
@@ -441,17 +441,22 @@ public class FactorEnchangeFactory {
|
|
|
midIncidentAuditDetail.setProejctName(itemMap.get(Constant.PROJECT_NAME_KEY).toString());
|
|
|
midIncidentAuditDetail.setMedicalProjectCode(itemMap.get(Constant.MEDICAL_PROJECT_CODE_KEY).toString());
|
|
|
midIncidentAuditDetail.setMedicalProjectName(itemMap.get(Constant.MEDICAL_PROJECT_NAME_KEY).toString());
|
|
|
- midIncidentAuditDetail.setDoseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_DAY, 0));
|
|
|
- midIncidentAuditDetail.setPrice((BigDecimal) itemMap.getOrDefault(SystemEventAttrConstant.PRICE, 0));
|
|
|
+ midIncidentAuditDetail.setDoseDay(Integer.parseInt(itemMap.getOrDefault(SystemEventAttrConstant.DOSE_DAY, 0).toString()));
|
|
|
+ BigDecimal price = new BigDecimal(itemMap.getOrDefault(SystemEventAttrConstant.PRICE,"0").toString());
|
|
|
+ midIncidentAuditDetail.setPrice(price);
|
|
|
midIncidentAuditDetail.setDoseForm((String) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_FORM, ""));
|
|
|
midIncidentAuditDetail.setTakeFrequence((String) itemMap.getOrDefault(SystemEventAttrConstant.TAKE_FREQUENCE, ""));
|
|
|
- midIncidentAuditDetail.setSingleDoseNumber((Integer) itemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_NUMBER, 0));
|
|
|
+ Integer singleDoseNum = Integer.parseInt(itemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_NUMBER, "0").toString());
|
|
|
+ midIncidentAuditDetail.setSingleDoseNumber(singleDoseNum);
|
|
|
midIncidentAuditDetail.setSingleDoseUnit((String) itemMap.getOrDefault(SystemEventAttrConstant.SINGLE_DOSE_UNIT, ""));
|
|
|
midIncidentAuditDetail.setMedicalSpecification((String) itemMap.getOrDefault(SystemEventAttrConstant.MEDICAL_SPECIFICATION, ""));
|
|
|
- midIncidentAuditDetail.setMedicalNumber((Float) itemMap.getOrDefault(SystemEventAttrConstant.QUANTITY, 1));
|
|
|
+ Float quantity = Float.parseFloat(itemMap.getOrDefault(SystemEventAttrConstant.QUANTITY, "1").toString());
|
|
|
+ midIncidentAuditDetail.setMedicalNumber(quantity);
|
|
|
midIncidentAuditDetail.setDoseUnit((String) itemMap.getOrDefault(SystemEventAttrConstant.DOSE_UNIT, ""));
|
|
|
- midIncidentAuditDetail.setUseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 1));
|
|
|
+ Integer useDay = Integer.parseInt(itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, "1").toString());
|
|
|
+ midIncidentAuditDetail.setUseDay(useDay);
|
|
|
midIncidentAuditDetail.setProjectType(itemMap.getOrDefault(Constant.PROJECT_TYPE_KEY, "default").toString());
|
|
|
+ Double amount = (Double) itemMap.getOrDefault(Constant.AMOUNT_KEY, 0.0);
|
|
|
midIncidentAuditService.lambdaUpdate().setSql("amount = amount +" + amount.doubleValue()).eq(MidIncidentAudit::getId, midIncidentAudit.getId()).update();
|
|
|
midIncidentAuditDetailService.save(midIncidentAuditDetail);
|
|
|
}
|