excel 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/DiagnoseItemsController.java

@@ -94,7 +94,8 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
          diagnoseItems = new DiagnoseItems();
          QueryWrapper<DiagnoseItems> queryWrapper = QueryGenerator.initQueryWrapper(diagnoseItems, req.getParameterMap());
          Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
-         queryWrapper.isNull("item_id");
+         queryWrapper.isNull("medical_diagnose_code");
+		 queryWrapper.or().eq("medical_diagnose_code","");
          IPage<DiagnoseItems> pageList = diagnoseItemsService.page(page, queryWrapper);
          return Result.OK("以下数据请填写医保药品编码", pageList);
      }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MaterialItemsController.java

@@ -71,6 +71,8 @@ public class MaterialItemsController extends JeecgController<MaterialItems, IMat
 		 QueryWrapper<MaterialItems> queryWrapper = QueryGenerator.initQueryWrapper(materialItems, req.getParameterMap());
 		 Page<MaterialItems> page = new Page<MaterialItems>(pageNo, pageSize);
 		 queryWrapper.isNull("item_id");
+		 queryWrapper.or().eq("item_id","");
+
 		 IPage<MaterialItems> pageList = materialItemsService.page(page, queryWrapper);
 		 return Result.OK("以下数据请填写医保药品编码", pageList);
 	 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsuranceDrugsController.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -88,6 +89,7 @@ public class MedicalInsuranceDrugsController extends JeecgController<MedicalInsu
         QueryWrapper<MedicalInsuranceDrugs> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsuranceDrugs, req.getParameterMap());
         Page<MedicalInsuranceDrugs> page = new Page<MedicalInsuranceDrugs>(pageNo, pageSize);
         queryWrapper.isNull("medicine_code");
+        queryWrapper.or().eq("medicine_code","");
         IPage<MedicalInsuranceDrugs> pageList = medicalInsuranceDrugsService.page(page, queryWrapper);
         return Result.OK("以下数据请填写医保药品编码", pageList);
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/OperativeItemsController.java

@@ -85,6 +85,8 @@ public class OperativeItemsController extends JeecgController<OperativeItems, IO
         QueryWrapper<OperativeItems> queryWrapper = QueryGenerator.initQueryWrapper(operativeItems, req.getParameterMap());
         Page<OperativeItems> page = new Page<OperativeItems>(pageNo, pageSize);
         queryWrapper.isNull("medical_operative_code");
+        queryWrapper.or().eq("medical_operative_code","");
+
         IPage<OperativeItems> pageList = operativeItemsService.page(page, queryWrapper);
         return Result.OK("以下数据请填写医保药品编码", pageList);
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/TreatmentItemsController.java

@@ -86,6 +86,8 @@ public class TreatmentItemsController extends JeecgController<TreatmentItems, IT
 		 QueryWrapper<TreatmentItems> queryWrapper = QueryGenerator.initQueryWrapper(treatmentItems, req.getParameterMap());
 		 Page<TreatmentItems> page = new Page<TreatmentItems>(pageNo, pageSize);
 		 queryWrapper.isNull("item_id");
+		 queryWrapper.or().eq("item_id","");
+
 		 IPage<TreatmentItems> pageList = treatmentItemsService.page(page, queryWrapper);
 		 return Result.OK("以下数据请填写医保药品编码", pageList);
 	 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/DiagnoseItemsMapper.xml

@@ -24,8 +24,10 @@
 
     </select>
     <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.DiagnoseItems">
-        select *From diagnose_items d where medical_diagnose_code not in(select diagnose_code from diagnoses)
-
+        SELECT d.*
+        FROM diagnose_items d
+                 LEFT JOIN diagnoses di ON d.medical_diagnose_code = di.diagnose_code
+        WHERE di.diagnose_code IS NULL;
 
     </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MaterialItemsMapper.xml

@@ -3,6 +3,8 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.MaterialItemsMapper">
 
     <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.MaterialItems">
-        select *From material_items d where item_id not in(select consumable_code from consumable_material)
-    </select>
+        SELECT d.*
+        FROM material_items d
+                 LEFT JOIN consumable_material c ON d.item_id = c.consumable_code
+        WHERE c.consumable_code IS NULL;    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MedicalInsuranceDrugsMapper.xml

@@ -3,6 +3,8 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.MedicalInsuranceDrugsMapper">
 
     <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.MedicalInsuranceDrugs">
-        select *From medical_insurance_drugs d where medicine_code not in(select medicine_code from medicine)
-    </select>
+        SELECT d.*
+        FROM medical_insurance_drugs d
+                 LEFT JOIN medicine m ON d.medicine_code = m.medicine_code
+        WHERE m.medicine_code IS NULL;    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/OperativeItemsMapper.xml

@@ -3,8 +3,10 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.OperativeItemsMapper">
 
     <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.OperativeItems">
-        select *From operative_items d where medical_operative_code not in(select oper_code from operative)
-
+        SELECT d.*
+        FROM operative_items d
+                 LEFT JOIN operative o ON d.medical_operative_code = o.oper_code
+        WHERE o.oper_code IS NULL;
 
     </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/TreatmentItemsMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.TreatmentItemsMapper">
 
     <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.TreatmentItems">
-        select *From treatment_items d where item_id not in(select project_code from diagnosis_treatment)
-
+        SELECT d.*
+        FROM treatment_items d
+                 LEFT JOIN diagnosis_treatment t ON d.item_id = t.project_code
+        WHERE t.project_code IS NULL;
     </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/FactorEnchangeFactory.java

@@ -83,7 +83,7 @@ public class FactorEnchangeFactory {
 
     public static Map<Integer, List<FactorCondRela>> factorCondRelaMap = new HashMap<>();
 
-//    @PostConstruct
+    @PostConstruct
     public void init() {
         List<EventAttr> eventAttrList = eventAttrService.lambdaQuery().eq(EventAttr::getDelFlag, CommonConstant.DEL_FLAG_0).list();
         enchanceAttrMap = eventAttrList.stream().collect(Collectors.toMap(EventAttr::getId, v -> v, (v1, v2) -> v1));

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/RuleEngine.java

@@ -141,7 +141,7 @@ public class RuleEngine {
     public static List<Integer> advanceWaringRuleIdList = new ArrayList<>();
     public static Map<String, Set<Integer>> itemCodeAndRuleIdMap = new HashMap<>();
 
-//    @PostConstruct
+    @PostConstruct
     public void initMedicalInsRule() {
         List<MedicalInsRuleInfo> medicalInsRuleInfoList = medicalInsRuleInfoService.lambdaQuery().eq(MedicalInsRuleInfo::getState, Constant.EFF_STATE).list();
         if (!CollectionUtil.isNotEmpty(medicalInsRuleInfoList)) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -26,7 +26,9 @@ import org.jeecg.modules.medical.service.IAfterwardsAuditService;
 import org.jeecg.modules.medical.service.IMedicalDoctorAppealRecordService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
 import org.jeecg.modules.system.model.DepartIdModel;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,7 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     private final ISysUserService sysUserService;
     private final HisMedicalProjectCache hisMedicalProjectCache;
     private final ISysUserDepartService sysUserDepartService;
+    private final ISysDepartService departService;
 
     @Override
     public IPage<ReportAfterQueryResponseBO> departmentStatistics(Page<AfterwardsAudit> page, AfterwardsAudit afterwardsAudit) {
@@ -432,23 +435,18 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     @Override
     public IPage<AfterwardsAudit> getDoctorViolations(Page<AfterwardsAudit> page, QueryWrapper<AfterwardsAudit> queryWrapper, LoginUser loginUser,String doctorId) {
         // 根据当前登录，先获取到医生面板
-        List<DepartIdModel> departIdModels = sysUserDepartService.queryDepartIdsOfUser(doctorId);
-        if (oConvertUtils.isEmpty(departIdModels)) {
+        SysUser user = sysUserService.lambdaQuery().eq(SysUser::getDoctorId,doctorId).one();
+        List<SysUserDepart> list = sysUserDepartService.lambdaQuery().eq(SysUserDepart::getUserId, user.getId()).list();
+        if (list.size()==0) {
             log.error("找不到当前医生的科室，请检查");
             throw new JeecgBootException("找不到当前医生的科室，请检查！");
         }
         // 当前登录科室/医生端的科室code
-        String medicalDeptCode = departIdModels.get(0).getValue();
+        SysDepart departById = departService.getDepartById(list.get(0).getDepId());
+        String medicalDeptCode = departById.getMedicalDeptCode();
         // 获取医生code
-        SysUser userByName = sysUserService.getUserByName(loginUser.getUsername());
-        if (null == userByName) {
-            log.error("找不到登录用户信息={}", loginUser.getUsername());
-            throw new JeecgBootException("找不到登录用户的医生用户信息，请检查！");
-        }
-        if (!StringUtils.hasText(userByName.getDoctorId())) {
-            log.error("找不到登录用户信息={},的医生编码信息，请检查", loginUser.getUsername());
-            throw new JeecgBootException("找不到登录用户的医生编码（医生id）信息，请检查！");
-        }
+
+
 //        queryWrapper.eq("doctor_id", userByName.getDoctorId());
         queryWrapper.eq("medical_dept_code", medicalDeptCode);