|
|
@@ -243,7 +243,7 @@ public class YiZhuLuRuServer {
|
|
|
if (ITEM.equals(item.getSerial())) {
|
|
|
xiangMuCode.add(item.getOrderCode());
|
|
|
} else {
|
|
|
- yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim());
|
|
|
+ yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -254,7 +254,7 @@ public class YiZhuLuRuServer {
|
|
|
// 获取医生开药品的权限
|
|
|
Integer doctorLevel = dao.huoQuYiShenDengJi(userCode);
|
|
|
XinZhenYiZhu huanZheXinXi = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
- Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getSmallDept());
|
|
|
+ Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getZkWard());
|
|
|
Map<String, List<XinZhenYzActOrder>> project = getProjectInformation(xiangMuCode);
|
|
|
|
|
|
// 是否可以确认
|
|
|
@@ -362,9 +362,9 @@ public class YiZhuLuRuServer {
|
|
|
if (ITEM.equals(data.getSerial())) {
|
|
|
xiangMuCode.add(data.getOrderCode());
|
|
|
} else {
|
|
|
- yaoPingCode.add(data.getOrderCode().trim() + data.getSerial().trim());
|
|
|
+ yaoPingCode.add(data.getOrderCode().trim() + data.getSerial().trim() + data.getGroupNo().trim());
|
|
|
}
|
|
|
- Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getSmallDept());
|
|
|
+ Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getZkWard());
|
|
|
Map<String, List<XinZhenYzActOrder>> project = getProjectInformation(xiangMuCode);
|
|
|
Map<String, Object> errorMessageMap = checkData(data, drug, project, huanZheXinXi, doctorLevel);
|
|
|
|
|
|
@@ -390,7 +390,7 @@ public class YiZhuLuRuServer {
|
|
|
dao.insertDoctorSOrder(transferData);
|
|
|
}
|
|
|
// 判断是不是抗菌药物
|
|
|
- XinZhenYzActOrder kssItem = drug.get(data.getOrderCode().trim() + data.getSerial().trim());
|
|
|
+ XinZhenYzActOrder kssItem = drug.get(data.getOrderCode().trim() + data.getSerial().trim() + data.getGroupNo().trim());
|
|
|
if (kssItem != null && kssItem.getKjywFlag() != null && kssItem.getKjywFlag() == 1) {
|
|
|
YzActRecordKss kss = new YzActRecordKss();
|
|
|
kss.setActOrderNo(data.getActOrderNo());
|
|
|
@@ -402,10 +402,8 @@ public class YiZhuLuRuServer {
|
|
|
kss, userCode, param.getInpatientNo(), param.getAdmissTimes());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
dao.deleteOrderNo(param.getActOrderNo(), param.getInpatientNo(), param.getAdmissTimes());
|
|
|
dao.insertEntryOrder(huanZheXinXi, param.getData(), userCode);
|
|
|
-
|
|
|
if (!errorMessageMap.isEmpty()) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
errorMessageMap.put("data", data);
|
|
|
@@ -665,7 +663,7 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
Integer yiShenDengJi = dao.huoQuYiShenDengJi(TokenUtil.getTokenUserId());
|
|
|
int yiShen = yiShenDengJi == null ? 0 : yiShenDengJi;
|
|
|
- if (yp.getYpLevel() > yiShen + 1) {
|
|
|
+ if (yp.getYpLevel() > yiShen) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "您没有开此药品的权限。");
|
|
|
}
|
|
|
|
|
|
@@ -750,11 +748,11 @@ public class YiZhuLuRuServer {
|
|
|
if (ITEM.equals(item.getSerial().trim())) {
|
|
|
xiangMuCode.add(item.getOrderCode().trim());
|
|
|
} else {
|
|
|
- yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim());
|
|
|
+ yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
|
|
|
}
|
|
|
}
|
|
|
XinZhenYiZhu huanZheXinXi = dao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
- Map<String, Object> errorMessage = checkData(param.getList().get(0), getDrugInformation(yaoPingCode, huanZheXinXi == null ? null : huanZheXinXi.getSmallDept()), getProjectInformation(xiangMuCode), huanZheXinXi, doctorLevel);
|
|
|
+ Map<String, Object> errorMessage = checkData(param.getList().get(0), getDrugInformation(yaoPingCode, huanZheXinXi == null ? null : huanZheXinXi.getZkWard()), getProjectInformation(xiangMuCode), huanZheXinXi, doctorLevel);
|
|
|
errorMessage.put("data", param.getList().get(0));
|
|
|
return ResultVoUtil.success(errorMessage);
|
|
|
}
|
|
|
@@ -782,7 +780,7 @@ public class YiZhuLuRuServer {
|
|
|
if (ITEM.equals(item.getSerial().trim())) {
|
|
|
xiangMuCode.add(item.getOrderCode().trim());
|
|
|
} else {
|
|
|
- yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim());
|
|
|
+ yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
|
|
|
}
|
|
|
doctorSOrderMap.put(item.getId(), item);
|
|
|
}
|
|
|
@@ -797,7 +795,7 @@ public class YiZhuLuRuServer {
|
|
|
|
|
|
boolean isThereAnyErrorMessage = false;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getSmallDept());
|
|
|
+ Map<String, XinZhenYzActOrder> drug = getDrugInformation(yaoPingCode, huanZheXinXi.getZkWard());
|
|
|
Map<String, List<XinZhenYzActOrder>> project = getProjectInformation(xiangMuCode);
|
|
|
|
|
|
int index = 0;
|
|
|
@@ -930,12 +928,6 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public static void main(String[] args) {
|
|
|
- BigDecimal a = new BigDecimal("1");
|
|
|
- BigDecimal b = new BigDecimal("0.2");
|
|
|
- System.out.println(DecimalUtil.divide(a, b));
|
|
|
- }
|
|
|
-
|
|
|
private Map<String, Object> checkData(XinZhenYzActOrder item, Map<String, XinZhenYzActOrder> drug, Map<String, List<XinZhenYzActOrder>> project, XinZhenYiZhu huanZheXinXi, Integer 医生级别) {
|
|
|
boolean 严格校验 = huanZheXinXi != null;
|
|
|
List<String> 错误信息 = new ArrayList<>();
|
|
|
@@ -956,12 +948,12 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
item.setDrugOcc(item.getDrugQuan());
|
|
|
} else {
|
|
|
- XinZhenYzActOrder feiYongXinXi = drug.get(item.getOrderCode().trim() + item.getSerial().trim());
|
|
|
+ XinZhenYzActOrder feiYongXinXi = drug.get(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
|
|
|
if (feiYongXinXi != null) {
|
|
|
if (feiYongXinXi.getDelFlag() == 1) {
|
|
|
错误信息.add("药品已经被停用了,请联系药剂科");
|
|
|
}
|
|
|
- if (feiYongXinXi.getYpLevel() > 医生级别 + 1) {
|
|
|
+ if (feiYongXinXi.getYpLevel() > 医生级别) {
|
|
|
错误信息.add("您没有开此药品的权限");
|
|
|
}
|
|
|
if (StringUtil.isBlank(feiYongXinXi.getNationalCode())) {
|
|
|
@@ -1142,7 +1134,7 @@ public class YiZhuLuRuServer {
|
|
|
* @param xiangMuCode 项目编码
|
|
|
* @return 返回数据
|
|
|
*/
|
|
|
- private Map<String, List<XinZhenYzActOrder>> getProjectInformation(Set<String> xiangMuCode) {
|
|
|
+ public Map<String, List<XinZhenYzActOrder>> getProjectInformation(Set<String> xiangMuCode) {
|
|
|
if (!xiangMuCode.isEmpty()) {
|
|
|
return dao.huoQuXiangMuXinXi(xiangMuCode).stream().collect(Collectors.groupingBy(item -> item.getOrderCode().trim()));
|
|
|
}
|
|
|
@@ -1155,9 +1147,9 @@ public class YiZhuLuRuServer {
|
|
|
* @param yaoPingCode 药品编码
|
|
|
* @return 返回数据
|
|
|
*/
|
|
|
- private Map<String, XinZhenYzActOrder> getDrugInformation(Set<String> yaoPingCode, String dept) {
|
|
|
+ public Map<String, XinZhenYzActOrder> getDrugInformation(Set<String> yaoPingCode, String dept) {
|
|
|
if (!yaoPingCode.isEmpty()) {
|
|
|
- return dao.huoQuYaoPinXinXi(yaoPingCode, publicServer.getGroupNo(), dept).stream().collect(Collectors.toMap(item -> item.getOrderCode().trim() + item.getSerial().trim(), a -> a, (k1, k2) -> k1));
|
|
|
+ return dao.huoQuYaoPinXinXi(yaoPingCode, dept).stream().collect(Collectors.toMap(item -> item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo(), a -> a, (k1, k2) -> k1));
|
|
|
}
|
|
|
return new HashMap<>(0);
|
|
|
}
|
|
|
@@ -1527,7 +1519,7 @@ public class YiZhuLuRuServer {
|
|
|
if (ITEM.equals(item.getSerial())) {
|
|
|
xiangMuCode.add(item.getOrderCode());
|
|
|
} else {
|
|
|
- yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim());
|
|
|
+ yaoPingCode.add(item.getOrderCode().trim() + item.getSerial().trim() + item.getGroupNo().trim());
|
|
|
}
|
|
|
}
|
|
|
String userCode = TokenUtil.getTokenUserId();
|