From 214b0462236390399ea184b3c4a3993fc0daf504 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 08 十二月 2023 10:10:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-分配治疗修改
---
phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java
index 71793c3..4616ccf 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/service/treat/impl/TreatV3ServiceImpl.java
@@ -309,12 +309,15 @@
values.put("orderClassify", treatSingle.getOrderClassify());
values.put("isWillPhoto", treatSingle.getIsWillPhoto());
values.put("allergyInfo", treatSingle.getAllergyInfo());
+ values.put("isFirstFm", treatSingle.getIsFirstFm());
+ values.put("isRd", treatSingle.getIsRd());
sql.delete(0,sql.length());
//operatorName = #{m.operatorName},operatorId = #{m.operatorId},
sql.append(" developerName = #{m.developerName},developerId = #{m.developerId},remarkInfo = #{m.remarkInfo} ");
sql.append(" ,developerShopName = #{m.developerShopName},developerShopId = #{m.developerShopId} ");
sql.append(" ,shopName = #{m.shopName},shopId = #{m.shopId},status = #{m.status} ");
sql.append(" , orderClassify = #{m.orderClassify}, isWillPhoto = #{m.isWillPhoto}, allergyInfo = #{m.allergyInfo} ");
+ sql.append(" , isFirstFm = #{m.isFirstFm}, isRd = #{m.isRd} ");
sql.append(" where id = #{m.id} ");
sqlSentence.setSqlSentence(sql.toString());
if (treatSingleMapper.updateWhere(sqlSentence) != 1) {
@@ -387,7 +390,7 @@
if(tpList != null && tpList.size() > 0){
sqlSentence.setSqlSentence("SELECT e.id, e.cnName, e.userId, d.type from treat_project_doctor d left join employee e on e.id = d.commonId where d.isDel=0 and d.treatSingleId = #{m.treatSingleId} and d.treatProjectId = #{m.treatProjectId} ");
List<Map<String, Object>> treatProjectDoctors ;
- for(Map<String, Object> m : tpList){
+ for(Map<String, Object> m : tpList) {
sb.append(m.get("projectName")).append(";");
//鏌ヨ椤圭洰瀵瑰簲澶氫釜鍖荤敓鎴栨姢澹�
values.put("treatProjectId", m.get("id"));
@@ -402,14 +405,15 @@
}
//鍒犻櫎娌荤枟鍗�
- sqlSentence.setSqlSentence(" isDel = 1 where id = #{m.treatSingleId} and isDel = 0 ");
+ values.put("status", TreatSingleConstants.STATUS_CANCEL);
+ sqlSentence.setSqlSentence(" status = #{m.status}, isDel = 1, editTime = now() where id = #{m.treatSingleId} ");
if (treatSingleMapper.updateWhere(sqlSentence)!= 1) {
- throw new PlatTipsException(PlatformCode.ERROR_TIPS, "鍒犻櫎娌荤枟娌荤枟閫氱煡鍗曚俊鎭紓甯革紒");
+ throw new PlatTipsException(PlatformCode.ERROR_TIPS, "浣滃簾娌荤枟閫氱煡鍗曞け璐ワ紒");
}
- sqlSentence.setSqlSentence(" isDel = 1 where treatSingleId = #{m.treatSingleId} and isDel = 0 ");
- //鍒犻櫎娌荤枟鍗曢」鐩瓑淇℃伅
- treatProjectMapper.updateWhere(sqlSentence);
+// sqlSentence.setSqlSentence(" isDel = 1 where treatSingleId = #{m.treatSingleId} and isDel = 0 ");
+// //鍒犻櫎娌荤枟鍗曢」鐩瓑淇℃伅
+// treatProjectMapper.updateWhere(sqlSentence);
// //鍒犻櫎娌荤枟鍗曞尰鐢熶俊鎭�
// treatProjectDoctorMapper.updateWhere(sqlSentence);
// //鍒犻櫎娌荤枟閫氱煡鍗曢」鐩儴鍒嗕俊鎭�
@@ -520,6 +524,7 @@
values.put("indication", project.getIndication());
values.put("indicationId", project.getIndicationId());
values.put("partType", project.getPartType());
+ values.put("sdRemark", project.getSdRemark());
values.put("id", oldTp.getId());
if (treatProjectMapper.updateEditInfo(values) != 1) {
throw new PlatTipsException(PlatformCode.ERROR_TIPS, "淇敼娌荤枟椤圭洰鏁伴噺澶辫触锛�");
--
Gitblit v1.8.0