诊断编码

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

@@ -72,6 +72,18 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 		IPage<DiagnoseItems> pageList = diagnoseItemsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+
+	 @ApiOperation(value="diagnose_items-分页列表查询", notes="diagnose_items-分页列表查询")
+	 @GetMapping(value = "/page")
+	 public Result<IPage<DiagnoseItems>> page(DiagnoseItems diagnoseItems,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		 QueryWrapper<DiagnoseItems> queryWrapper = QueryGenerator.initQueryWrapper(diagnoseItems, req.getParameterMap());
+		 Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
+		 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/MedicalInsRuleInfoController.java

@@ -189,6 +189,9 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
                     case "medicalDiagnoseCode":
                         it.setComponent("a-textarea");
                         break;
+                    case "correlationMedicalDiagnoseCode":
+                        it.setComponent("a-textarea");
+                        break;
                     default:
                         it.setComponent("a-input");
                         break;

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

@@ -96,14 +96,14 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
             List<String> code = Arrays.asList(medicalDiagnoseCode.split("\n"));
             medicalInsRuleProject.setCode(code);
             Integer projectCodeType = 1;
-            diagnoseService.saveDiagnose(code, medicalInsRuleProject.getMedicalInsRuleInfoId(), projectCodeType, medicalInsRuleProject.getProjectCode());
+            diagnoseService.saveDiagnose(code,projectCodeType, medicalInsRuleProject.getMedicalInsRuleInfoId(), medicalInsRuleProject.getProjectCode());
 
         }
         if (StringUtils.hasText(correlationMedicalDiagnoseCode)) {
             List<String> code = Arrays.asList(correlationMedicalDiagnoseCode.split("\n"));
             medicalInsRuleProject.setCode(code);
             Integer projectCodeType = 2;
-            diagnoseService.saveDiagnose(code, medicalInsRuleProject.getMedicalInsRuleInfoId(), projectCodeType, medicalInsRuleProject.getProjectCode());
+            diagnoseService.saveDiagnose(code,projectCodeType, medicalInsRuleProject.getMedicalInsRuleInfoId(), medicalInsRuleProject.getProjectCode());
 
         }
         return Result.OK("添加成功！");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsRuleProject.java

@@ -20,134 +20,184 @@ import lombok.experimental.Accessors;
 /**
  * @Description: medical_ins_rule_project
  * @Author: jeecg-boot
- * @Date:   2023-05-09 14:39:13
+ * @Date: 2023-05-09 14:39:13
  * @Version: V1.0
  */
 @Data
 @TableName("medical_ins_rule_project")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="medical_ins_rule_project对象", description="medical_ins_rule_project")
+@ApiModel(value = "medical_ins_rule_project对象", description = "medical_ins_rule_project")
 public class MedicalInsRuleProject implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键ID*/
-	@TableId(type = IdType.AUTO)
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
-	/**医保规则ID*/
-	@Excel(name = "医保规则ID", width = 15)
+    /**
+     * 医保规则ID
+     */
+    @Excel(name = "医保规则ID", width = 15)
     @ApiModelProperty(value = "医保规则ID")
     private java.lang.Integer medicalInsRuleInfoId;
 
-	/**医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)*/
-	@Excel(name = "医保主数据类型", width = 15)
+    /**
+     * 医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)
+     */
+    @Excel(name = "医保主数据类型", width = 15)
     @ApiModelProperty(value = "医保主数据类型;MEDICINE（药品主数据表）、CONSUMABLE_METERIAL(耗材主数据表)、DIAGNOSIS_TREATMENT（诊疗主数据表）、DIAGNOSIS(诊断主数据表)、OPERATIVE(手术主数据表)")
     @Dict(dicCode = "medicine_data_type")
     private java.lang.String medicineDataType;
-	/**主数据表编码*/
-	@Excel(name = "项目编码", width = 15)
+    /**
+     * 主数据表编码
+     */
+    @Excel(name = "项目编码", width = 15)
     @ApiModelProperty(value = "主数据表编码")
     private java.lang.String projectCode;
-	/**项目名称*/
-	@Excel(name = "项目名称", width = 15)
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称", width = 15)
     @ApiModelProperty(value = "项目名称")
     private java.lang.String projectName;
-	/**主数据表ID*/
-	@Excel(name = "主数据表ID", width = 15)
+    /**
+     * 主数据表ID
+     */
+    @Excel(name = "主数据表ID", width = 15)
     @ApiModelProperty(value = "主数据表ID")
     private java.lang.String projectId;
-	/**关联项目编号*/
-	@Excel(name = "关联项目编号", width = 15)
+    /**
+     * 关联项目编号
+     */
+    @Excel(name = "关联项目编号", width = 15)
     @ApiModelProperty(value = "关联项目编号")
     private java.lang.String correlationProjectCode;
-	/**关联项目名称*/
-	@Excel(name = "关联项目名称", width = 15)
+    /**
+     * 关联项目名称
+     */
+    @Excel(name = "关联项目名称", width = 15)
     @ApiModelProperty(value = "关联项目名称")
     private java.lang.String correlationProjectName;
-	/**收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类*/
-	@Excel(name = "收费等级", width = 15)
+    /**
+     * 收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类
+     */
+    @Excel(name = "收费等级", width = 15)
     @ApiModelProperty(value = "收费等级;01 甲类 02 乙类 03 丙类 04 可报丙类")
     @Dict(dicCode = "change_class")
     private java.lang.String changeClass;
-    /**医疗收费项目类别*/
+    /**
+     * 医疗收费项目类别
+     */
     @Excel(name = "医疗收费项目类别", width = 15)
     @ApiModelProperty(value = "医疗收费项目类别;01\t床位费 02\t诊察费 03\t检查费 04\t化验费 05\t治疗费 06\t手术费 07\t护理费 08\t卫生材料费 09\t西药费 10\t中药饮片费 11\t中成药费 12\t一般诊疗费 13\t挂号费 14\t其他费 14012\t单病种除外内容 14013\t单病种超标准床位费 14014\t单病种定额标准费 1407\t救护车费 1408\tMRI费 1409\tCT费 1410\t彩超费 1411\t输氧费 1412\t输血费 1413\t麻醉费 1414\t麻醉相关项目费 1415\t其他医疗费")
     @Dict(dicCode = "categories_items")
     private java.lang.String categoriesItems;
-	/**年龄;*/
-	@Excel(name = "年龄", width = 15)
+    /**
+     * 年龄;
+     */
+    @Excel(name = "年龄", width = 15)
     @ApiModelProperty(value = "年龄;")
     private java.lang.Integer age;
 
-    /**数量;*/
+    /**
+     * 数量;
+     */
     @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量;")
     private java.lang.Integer quantity;
-    /**金额;*/
+    /**
+     * 金额;
+     */
     @Excel(name = "金额", width = 15)
     @ApiModelProperty(value = "金额;")
     private java.lang.Double amount;
-    /**性别;0 未知的性别 1 男性 2 女性 9 未说明性别s*/
+    /**
+     * 性别;0 未知的性别 1 男性 2 女性 9 未说明性别s
+     */
     @Excel(name = "性别;0 未知的性别 1 男性 2 女性 9 未说明性别", width = 15)
     @ApiModelProperty(value = "性别;0 未知的性别 1 男性 2 女性 9 未说明性别")
     private java.lang.String gender;
-	/**医疗机构等级;*/
-	@Excel(name = "医疗机构等级", width = 15)
+    /**
+     * 医疗机构等级;
+     */
+    @Excel(name = "医疗机构等级", width = 15)
     @ApiModelProperty(value = "医疗机构等级;")
     @Dict(dicCode = "medical_ins_level")
     private java.lang.String medicalInsLevel;
-	/**医师级别;*/
-	@Excel(name = "医师级别", width = 15)
+    /**
+     * 医师级别;
+     */
+    @Excel(name = "医师级别", width = 15)
     @ApiModelProperty(value = "医师级别;")
     @Dict(dicCode = "doctor_level")
     private java.lang.String doctorLevel;
-	/**参保类型;*/
-	@Excel(name = "参保类型", width = 15)
+    /**
+     * 参保类型;
+     */
+    @Excel(name = "参保类型", width = 15)
     @ApiModelProperty(value = "参保类型;")
     private java.lang.String insType;
-	/**科室;*/
-	@Excel(name = "科室", width = 15)
+    /**
+     * 科室;
+     */
+    @Excel(name = "科室", width = 15)
     @ApiModelProperty(value = "科室;")
     private java.lang.String medicalDeptCode;
-	/**用药天数;*/
-	@Excel(name = "用药天数", width = 15)
+    /**
+     * 用药天数;
+     */
+    @Excel(name = "用药天数", width = 15)
     @ApiModelProperty(value = "用药天数;")
     private java.lang.String doseDay;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.String state;
 
-    @Excel(name = "关联诊断编码")
-    @ApiModelProperty(value = "关联诊断编码")
-    private String correlationMedicalDiagnoseCode;
 
     @Excel(name = "诊断编码")
     @ApiModelProperty(value = "诊断编码")
     private String medicalDiagnoseCode;
 
-	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private java.lang.Integer revision;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 
-    @TableField
+    @TableField(exist = false)
     private List<String> code;
+
+    @TableField(exist = false)
+    private String correlationMedicalDiagnoseCode;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsRuleProjectDiagnose.java

@@ -48,7 +48,9 @@ public class MedicalInsRuleProjectDiagnose implements Serializable {
 	@Excel(name = "诊断编码", width = 15)
     @ApiModelProperty(value = "诊断编码")
     private java.lang.String medicalDiagnoseCode;
-
+    @Excel(name = "关联诊断编码")
+    @ApiModelProperty(value = "关联诊断编码")
+    private String correlationMedicalDiagnoseCode;
     @ApiModelProperty(value = "项目编码类型;1:项目编码，2:关联项目编码")
     private Integer projectCodeType;
     /**创建人*/

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface IMedicalInsRuleProjectDiagnoseService extends IService<MedicalInsRuleProjectDiagnose> {
 
-    boolean saveDiagnose(List<String> medicalDiagnoseCode,Integer projectCodeType, Integer medicalInsRuleInfoId, String medicalInsProjectCode);
+    boolean saveDiagnose(List<String> medicalDiagnoseCode,Integer projectCodeType, Integer medicalInsRuleInfoId, String projectCode);
 //    boolean saveCorrelationDiagnose(List<String> medicalDiagnoseCode, Integer medicalInsRuleInfoId, String medicalInsProjectCode);
 
 }

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

@@ -21,14 +21,14 @@ public class MedicalInsRuleProjectDiagnoseServiceImpl extends ServiceImpl<Medica
 
 
     @Override
-    public boolean saveDiagnose(List<String> medicalDiagnoseCode,Integer projectCodeType, Integer medicalInsRuleInfoId, String medicalInsProjectCode) {
+    public boolean saveDiagnose(List<String> medicalDiagnoseCode,Integer projectCodeType, Integer medicalInsRuleInfoId, String projectCode) {
         List<MedicalInsRuleProjectDiagnose> list = new ArrayList<>();
         for (String code : medicalDiagnoseCode) {
             MedicalInsRuleProjectDiagnose diagnose = new MedicalInsRuleProjectDiagnose();
             diagnose.setMedicalDiagnoseCode(code);
             diagnose.setProjectCodeType(projectCodeType);
             diagnose.setMedicalInsRuleInfoId(medicalInsRuleInfoId);
-            diagnose.setMedicalInsProjectCode(medicalInsProjectCode);
+            diagnose.setMedicalInsProjectCode(projectCode);
             list.add(diagnose);
         }
         boolean b = saveBatch(list);