|
@@ -24,6 +24,7 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
|
|
|
import thyyxxk.webserver.service.PublicServer;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
+import javax.print.DocFlavor;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
@@ -124,13 +125,11 @@ public class ShouShuShenQingServer {
|
|
|
|
|
|
|
|
|
public ResultVo<Map<String, String>> xinZengShouShuShenQing(XinZengShouShu param) {
|
|
|
-
|
|
|
if (ListUtil.isBlank(param.getList())) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择需要上传的数据。");
|
|
|
}
|
|
|
|
|
|
Map<String, String> map = new HashMap<>(param.getList().size());
|
|
|
-
|
|
|
for (int i = 0; i < param.getList().size(); i++) {
|
|
|
OpRecord item = param.getList().get(i);
|
|
|
String error = applyForVerification(item);
|
|
@@ -159,17 +158,16 @@ public class ShouShuShenQingServer {
|
|
|
shenChengYiZhu.add(item);
|
|
|
content.add(String.format("手术名称:<span style='color:#409eff'>【%s】</span><br>" +
|
|
|
"手术时间:<span style='color:#409eff'>【%tF %<tT】</span><br>", item.getOpName(), item.getOpDatetime()));
|
|
|
- // 手术医嘱是全排斥医嘱
|
|
|
-// yiZhuLuRuDao.stopOrder(param.getInpatientNo(), param.getAdmissTimes(), item.getOpDatetime(), userCode);
|
|
|
}
|
|
|
log.info("上传数据:{}", JSON.toJSONString(param));
|
|
|
XinZhenYiZhu huanZheXinXi = yiZhuLuRuDao.huoQuHuanZheXinXi(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
dao.chaRuShouShuYiSheng(param.getList());
|
|
|
dao.chaRuShouShu(param.getList(), param.getInpatientNo(), param.getName(), param.getAdmissTimes(),
|
|
|
huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), userCode, param.getBedNo(), param.getAdmissWard());
|
|
|
+ String yzCode = param.getGenerateRejectedOrders() ? "10399" : "06054";
|
|
|
+ // 插入医嘱
|
|
|
+ dao.chaRuYiZhu(shenChengYiZhu, huanZheXinXi, userCode, param.getExecDept(), yzCode);
|
|
|
|
|
|
- dao.chaRuYiZhu(shenChengYiZhu, PublicServer.getInfantFlag(param.getInpatientNo()),
|
|
|
- userCode, param.getInpatientNo(), param.getAdmissTimes(), huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getExecDept());
|
|
|
publicServer.faSongXiaoXi(huanZheXinXi, content, "新增手术", TokenUtil.getTokenUserId());
|
|
|
return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
|
|
|
}
|
|
@@ -206,7 +204,7 @@ public class ShouShuShenQingServer {
|
|
|
if (op == null) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到该手术的信息。");
|
|
|
}
|
|
|
- if (!op.getStatus().trim().equals("1")) {
|
|
|
+ if (!"1".equals(op.getStatus().trim())) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "无法删除该手术。");
|
|
|
}
|
|
|
dao.genXingShanChuBiaoZhi(recordId);
|