代码回滚

openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
 import com.core.common.core.domain.entity.SysDictData;
+import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
 import com.core.common.utils.poi.ExcelUtil;
@@ -400,6 +401,21 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         // 新增外来诊疗目录
         activityDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
         
+        // 显式设置创建者和租户ID，确保插入时不为null
+        String createBy = "system";
+        Integer tenantId = null;
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser != null) {
+                createBy = loginUser.getUsername();
+                tenantId = loginUser.getTenantId();
+            }
+        } catch (Exception e) {
+            // 如果获取失败，使用默认值
+        }
+        activityDefinition.setCreateBy(createBy);
+        activityDefinition.setTenantId(tenantId != null ? tenantId : 1); // 默认租户ID为1
+        
         // 检查编码是否已存在
         List<ActivityDefinition> existingDefinitions = activityDefinitionMapper.selectList(
             new LambdaQueryWrapper<ActivityDefinition>()
@@ -624,6 +640,20 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
                 .setYbMatchFlag(CommonUtil.tryParseInt(importDto.getYbMatchFlag()))
                 .setStatusEnum(PublicationStatus.ACTIVE.getValue())
                 .setChrgitmLv(CommonUtil.tryParseInt(importDto.getChrgitmLv()));
+        // 显式设置创建者和租户ID，确保插入时不为null
+        String createBy = "system";
+        Integer tenantId = null;
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            if (loginUser != null) {
+                createBy = loginUser.getUsername();
+                tenantId = loginUser.getTenantId();
+            }
+        } catch (Exception e) {
+            // 如果获取失败，使用默认值
+        }
+        activityDefinition.setCreateBy(createBy);
+        activityDefinition.setTenantId(tenantId != null ? tenantId : 1); // 默认租户ID为1
         return activityDefinition;
     }
 }

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml

@@ -112,7 +112,6 @@
                            ON T1.context_enum = #{activity}
                                AND T1.product_id = T2.id
                                AND T2.delete_flag = '0'
-                               AND T2.status_enum = 1
                  LEFT JOIN med_medication_definition AS T3
                            ON T1.context_enum = #{medication}
                                AND T1.product_id = T3.id
@@ -206,7 +205,6 @@
                                  ON T1.context_enum = #{activity}
                                      AND T1.product_id = T2.id
                                      AND T2.delete_flag = '0'
-                                     AND T2.status_enum = 1
                        LEFT JOIN med_medication_definition AS T3
                                  ON T1.context_enum = #{medication}
                                      AND T1.product_id = T3.id

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -231,16 +231,13 @@
                     AND T3.organization_id = #{organizationId}
                 </if>
                 WHERE T1.delete_flag = '0'
-                <if test="pricingFlag != null and pricingFlag == 1">
+                    AND (T1.pricing_flag = 1 OR T1.pricing_flag IS NULL)
-                    AND (T1.pricing_flag = #{pricingFlag} OR T1.pricing_flag IS NULL)
-                </if>
                 <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
                     AND T1.id IN
                     <foreach collection="adviceDefinitionIdParamList" item="itemId" open="(" separator="," close=")">
                         #{itemId}
                     </foreach>
                 </if>
-                AND T1.status_enum = #{statusEnum}
                 )
             </if>
         </if>

openhis-server-new/sql/diagnose_treatment_items_issue.sql

@@ -90,3 +90,5 @@ WHERE aci.context_enum = 'ACTIVITY'
 
 
 
+
+