commit

src/main/java/thyyxxk/webserver/service/medicaladvice/nursing/NursingManagementService.java

@@ -1135,8 +1135,21 @@ public class NursingManagementService {
                     if (StrUtil.isNotBlank(psInfo.getPsStatus())) {
                         psResult = "1".equals(psInfo.getPsStatus()) ? "阳性" : "阴性";
                     }
-                    scdBaseInfo.setTypeValue(psResult);
-                    log.info("setPsInfoTypes - 设置皮试结果: 日期={}, 类型码={}, 结果={}", itemDate, typeCode, psResult);
+                    
+                    // 组合医嘱名称和皮试结果：医嘱名称 + 皮试结果
+                    String orderName = StrUtil.isNotBlank(psInfo.getOrderName()) ? psInfo.getOrderName() : "";
+                    String combinedResult = "";
+                    if (StrUtil.isNotBlank(orderName) && StrUtil.isNotBlank(psResult)) {
+                        combinedResult = orderName + ":" + psResult;
+                    } else if (StrUtil.isNotBlank(orderName)) {
+                        combinedResult = orderName;
+                    } else if (StrUtil.isNotBlank(psResult)) {
+                        combinedResult = psResult;
+                    }
+                    
+                    scdBaseInfo.setTypeValue(combinedResult);
+                    log.info("setPsInfoTypes - 设置皮试结果: 日期={}, 类型码={}, 医嘱名称={}, 结果={}, 组合结果={}", 
+                            itemDate, typeCode, orderName, psResult, combinedResult);
                 } else {
                     scdBaseInfo.setTypeValue("");
                 }