From 3b372356f46e96ad350dc9fc3567ea71cc097b8e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 24 九月 2024 10:44:46 +0800
Subject: [PATCH] Merge branch 'fwq-stander-皮肤测试报告' into master-xlk-test
---
phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java b/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
index 21c10b4..fc583c1 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
@@ -1375,12 +1375,18 @@
detailVoMap.put(indication.getName(), mjIndicationDetailVo);
}
}
+ //鏌ヨ娌荤枟寤鸿-绋嬪害绫诲瀷鏁版嵁
+ sqlMap.put("degreeType", BaseClassifyConstants.TYPE_TREAT_PLAN_DEGREE);
+ sqlSentence.sqlSentence(" select id,name,sortNo,type from base_classify where isDel = 0 and isUp = 1 AND type = #{m.degreeType} ", sqlMap);
+ List<Map<String, Object>> degreeTypeList = commonService.selectListMap(BaseClassifyMapper.class, sqlSentence);
+ //杞崲绋嬪害绫诲瀷鍒楄〃<绋嬪害鍚嶇О,绋嬪害鏍囪瘑>
+ Map<String, String> degreeMap = degreeTypeList.stream().collect(Collectors.toMap(m -> m.get("name").toString(), m -> m.get("id").toString()));
//3.澶勭悊娌荤枟璁惧鍜屾不鐤楅」鐩�
if (indicationList != null && indicationList.size() > 0) {
//鍏堟煡璇㈤�傚簲鐥囧叧鑱旂殑娌荤枟鏂规
sqlMap.put("typeStr", TreatPlan.TYPE_STR_INDICATION);
sql.delete(0, sql.length());
- sql.append(" SELECT t.id,d.name FROM treat_plan AS t ");
+ sql.append(" SELECT t.id,d.name,t.degreeTypeId FROM treat_plan AS t ");
sql.append(" JOIN treat_plan_indication AS p ON p.treatPlanId = t.id ");
sql.append(" JOIN indication AS d ON d.id = p.indicationId ");
sql.append(" WHERE t.isDel = #{m.isDel} AND t.typeStr = #{m.typeStr} AND t.isUp = #{m.isUp} ");
@@ -1410,6 +1416,12 @@
if (mjIndicationDetailVo == null) {
continue;
}
+ //鏌ョ湅绋嬪害鍖归厤搴�
+ String degreeId = degreeMap.get(mjIndicationDetailVo.getDegree());
+ if (StringUtils.noNull(degreeId) && !degreeId.equals(treatPlan.getDegreeTypeId())) {
+ logger.info("褰撳墠娌荤枟鏂规涓庨�傚簲鐥囩殑鍖归厤绋嬪害涓嶅尮閰�,褰撳墠鏄瘂},瀹㈡埛閫傚簲鐥囨槸{},{}", treatPlan.getDegreeTypeId(), degreeId, mjIndicationDetailVo.getDegree());
+ continue;
+ }
deviceTotalList = mjIndicationDetailVo.getDeviceList();
if (deviceTotalList == null){
deviceTotalList = new ArrayList<>();
--
Gitblit v1.8.0