性别

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

@@ -242,6 +242,19 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         }
         return Result.OK(factorEnchance);
     }
+    @ApiOperation(value = "factor_enchance-通过id查询", notes = "factor_enchance-通过id查询")
+    @GetMapping(value = "/queryDynamicDataById")
+    public Result<FactorEnchance> queryDynamicDataById(@RequestParam(name = "id", required = true) String id) {
+        FactorEnchance factorEnchance = factorEnchanceService.getById(id);
+        if (factorEnchance == null) {
+            return Result.error("未找到对应数据");
+        }
+        if (factorEnchance.getEnhanceType() == 2) {
+            List<FactorCondRela> factorCondRelaList = factorCondRelaService.lambdaQuery().eq(FactorCondRela::getFactorEnhanceId, factorEnchance.getId()).list();
+            factorEnchance.setFactorCondRelaList(factorCondRelaList);
+        }
+        return Result.OK(factorEnchance);
+    }
 
     /**
      * 导出excel
@@ -302,12 +315,18 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
     public Result<List<CommonResponse>> relaChildrenList(@RequestParam(name = "medicalInsRuleInfoId") Integer medicalInsRuleInfoId, HttpServletRequest req) {
 
         List<RuleFactorRela> list = ruleFactorRelaService.list(medicalInsRuleInfoId);
+        List<FactorEnchance> factorEnchanceList = factorEnchanceService.list();
         List<CommonResponse> responses = new ArrayList<>();
         if (list.size() > 0) {
             for (RuleFactorRela info : list) {
                 CommonResponse response = new CommonResponse();
                 response.setId(info.getId());
                 response.setName("（" + info.getFactorEnhanceId() + "）" + info.getRuleEnchanceName());
+                Optional<FactorEnchance> first = factorEnchanceList.stream().filter(o ->
+                        ObjectUtils.nullSafeEquals(o.getId(), info.getFactorEnhanceId())).findFirst();
+                if (first.isPresent()) {
+                    response.setType(first.get().getEnhanceType().toString());
+                }
                 responses.add(response);
             }
         }

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

@@ -192,6 +192,10 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
                     case "correlationMedicalDiagnoseCode":
                         it.setComponent("a-textarea");
                         break;
+                    case "gender":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("sex");
+                        break;
                     default:
                         it.setComponent("a-input");
                         break;

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

@@ -190,7 +190,7 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
     public ModelAndView exportTemplateXls(HttpServletRequest request, MedicalInsRuleProject medicalInsRuleProject) {
 //		 return super.exportXls(request, medicalInsRuleProject, MedicalInsRuleProject.class, "medical_ins_rule_project");
         try {
-            return medicalInsRuleProjectService.exportTemplateXls(request, medicalInsRuleProject, MedicalInsRuleProject.class, "666");
+            return medicalInsRuleProjectService.exportTemplateXls(request, medicalInsRuleProject, MedicalInsRuleProject.class, medicalInsRuleProject.getProjectName());
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }
@@ -206,6 +206,7 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
 	 @RequestMapping(value = "/import/templateExcel", method = RequestMethod.POST)
 	 public Result<?> importTemplateExcel(HttpServletRequest request, HttpServletResponse response) {
 //		 return super.importExcel(request, response, MedicalInsRuleProject.class);
+
 		 return medicalInsRuleProjectService.importTemplateExcel(request, response, MedicalInsRuleProject.class);
 	 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/vo/CommonResponse.java

@@ -6,4 +6,6 @@ import lombok.Data;
 public class CommonResponse {
     private Integer id;
     private String name;
+
+    private String type;
 }