|
|
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
|
|
|
import thyyxxk.webserver.dao.his.dictionary.HisWjwMatchDao;
|
|
|
import thyyxxk.webserver.entity.dictionary.HisWjwMatchEntity;
|
|
|
import thyyxxk.webserver.utils.StringUtil;
|
|
|
+import thyyxxk.webserver.utils.TokenUtil;
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
@@ -40,17 +41,25 @@ public class HisWjwMatchService {
|
|
|
type = 2;
|
|
|
break;
|
|
|
case "surgery":
|
|
|
- default:
|
|
|
histable = "zd_icd9_cm3";
|
|
|
wjwtable = "t_si_dl_oprtn";
|
|
|
type = 3;
|
|
|
break;
|
|
|
+ case "surgery_chargeCode":
|
|
|
+ default:
|
|
|
+ histable = "zd_icd9_cm3";
|
|
|
+ wjwtable = "zd_charge_item";
|
|
|
+ type = 4;
|
|
|
+ break;
|
|
|
}
|
|
|
List<HisWjwMatchEntity> hisList;
|
|
|
List<HisWjwMatchEntity> wjwList;
|
|
|
if (type == 1) {
|
|
|
hisList = dao.selectHisData(histable);
|
|
|
wjwList = dao.selectWjwData(wjwtable);
|
|
|
+ } else if (type == 4) {
|
|
|
+ hisList = dao.selectSurgeries();
|
|
|
+ wjwList = dao.selectChargeCodes();
|
|
|
} else {
|
|
|
hisList = dao.selectNationTempData(histable);
|
|
|
wjwList = new ArrayList<>();
|
|
|
@@ -83,6 +92,9 @@ public class HisWjwMatchService {
|
|
|
public String executeMatchAction(HisWjwMatchEntity entity) {
|
|
|
log.info("匹配卫健委/国临字典:{}", JSONObject.toJSONString(entity));
|
|
|
dao.executeMatchAction(entity);
|
|
|
+ if (entity.getLabel().equals("surgery_chargeCode")) {
|
|
|
+ dao.updateDateAndOper(entity.getCode(), TokenUtil.getTokenUserId());
|
|
|
+ }
|
|
|
return StringUtil.isBlank(entity.getWjwCode()) ? "撤销匹配成功" : "匹配成功";
|
|
|
}
|
|
|
|