Merge remote-tracking branch 'origin/master'

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

@@ -9,6 +9,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -37,125 +38,130 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
- /**
+/**
  * @Description: event_attr
  * @Author: jeecg-boot
- * @Date:   2023-04-23
+ * @Date: 2023-04-23
  * @Version: V1.0
  */
-@Api(tags="event_attr")
+@Api(tags = "event_attr")
 @RestController
 @RequestMapping("/medical/eventAttr")
 @Slf4j
 public class EventAttrController extends JeecgController<EventAttr, IEventAttrService> {
-	@Autowired
-	private IEventAttrService eventAttrService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param eventAttr
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "event_attr-分页列表查询")
-	@ApiOperation(value="event_attr-分页列表查询", notes="event_attr-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<EventAttr>> queryPageList(EventAttr eventAttr,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<EventAttr> queryWrapper = QueryGenerator.initQueryWrapper(eventAttr, req.getParameterMap());
-		Page<EventAttr> page = new Page<EventAttr>(pageNo, pageSize);
-		IPage<EventAttr> pageList = eventAttrService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param eventAttr
-	 * @return
-	 */
-	@AutoLog(value = "event_attr-添加")
-	@ApiOperation(value="event_attr-添加", notes="event_attr-添加")
-	@RequiresPermissions("medical:event_attr:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody EventAttr eventAttr) {
-		eventAttrService.save(eventAttr);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param eventAttr
-	 * @return
-	 */
-	@AutoLog(value = "event_attr-编辑")
-	@ApiOperation(value="event_attr-编辑", notes="event_attr-编辑")
-	@RequiresPermissions("medical:event_attr:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody EventAttr eventAttr) {
-		eventAttrService.updateById(eventAttr);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "event_attr-通过id删除")
-	@ApiOperation(value="event_attr-通过id删除", notes="event_attr-通过id删除")
-	@RequiresPermissions("medical:event_attr:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		eventAttrService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "event_attr-批量删除")
-	@ApiOperation(value="event_attr-批量删除", notes="event_attr-批量删除")
-	@RequiresPermissions("medical:event_attr:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.eventAttrService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "event_attr-通过id查询")
-	@ApiOperation(value="event_attr-通过id查询", notes="event_attr-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<EventAttr> queryById(@RequestParam(name="id",required=true) String id) {
-		EventAttr eventAttr = eventAttrService.getById(id);
-		if(eventAttr==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(eventAttr);
-	}
+    @Autowired
+    private IEventAttrService eventAttrService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param eventAttr
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "event_attr-分页列表查询")
+    @ApiOperation(value = "event_attr-分页列表查询", notes = "event_attr-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<EventAttr>> queryPageList(EventAttr eventAttr,
+                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  HttpServletRequest req) {
+        QueryWrapper<EventAttr> queryWrapper = QueryGenerator.initQueryWrapper(eventAttr, req.getParameterMap());
+        Page<EventAttr> page = new Page<EventAttr>(pageNo, pageSize);
+        IPage<EventAttr> pageList = eventAttrService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @GetMapping(value = "/attrList")
+    public Result<List<EventAttr>> queryPageList(HttpServletRequest req) {
+        return Result.OK(eventAttrService.list());
+    }
+
+    /**
+     * 添加
+     *
+     * @param eventAttr
+     * @return
+     */
+    @AutoLog(value = "event_attr-添加")
+    @ApiOperation(value = "event_attr-添加", notes = "event_attr-添加")
+    @RequiresPermissions("medical:event_attr:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody EventAttr eventAttr) {
+        eventAttrService.save(eventAttr);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param eventAttr
+     * @return
+     */
+    @AutoLog(value = "event_attr-编辑")
+    @ApiOperation(value = "event_attr-编辑", notes = "event_attr-编辑")
+    @RequiresPermissions("medical:event_attr:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody EventAttr eventAttr) {
+        eventAttrService.updateById(eventAttr);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "event_attr-通过id删除")
+    @ApiOperation(value = "event_attr-通过id删除", notes = "event_attr-通过id删除")
+    @RequiresPermissions("medical:event_attr:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        eventAttrService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "event_attr-批量删除")
+    @ApiOperation(value = "event_attr-批量删除", notes = "event_attr-批量删除")
+    @RequiresPermissions("medical:event_attr:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.eventAttrService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "event_attr-通过id查询")
+    @ApiOperation(value = "event_attr-通过id查询", notes = "event_attr-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<EventAttr> queryById(@RequestParam(name = "id", required = true) String id) {
+        EventAttr eventAttr = eventAttrService.getById(id);
+        if (eventAttr == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(eventAttr);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param eventAttr
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param eventAttr
+     */
     @RequiresPermissions("medical:event_attr:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, EventAttr eventAttr) {
@@ -163,12 +169,12 @@ public class EventAttrController extends JeecgController<EventAttr, IEventAttrSe
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequiresPermissions("medical:event_attr:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {

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

@@ -17,11 +17,14 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.EnchanceTypeEnum;
+import org.jeecg.modules.medical.entity.FactorCondRela;
 import org.jeecg.modules.medical.entity.FactorEnchance;
+import org.jeecg.modules.medical.service.IFactorCondRelaService;
 import org.jeecg.modules.medical.service.IFactorEnchanceService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -59,7 +62,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class FactorEnchanceController extends JeecgController<FactorEnchance, IFactorEnchanceService> {
 	@Autowired
 	private IFactorEnchanceService factorEnchanceService;
-	
+	 @Autowired
+	 private IFactorCondRelaService factorCondRelaService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -80,6 +85,12 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 		Page<FactorEnchance> page = new Page<FactorEnchance>(pageNo, pageSize);
 		queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
 		IPage<FactorEnchance> pageList = factorEnchanceService.page(page, queryWrapper);
+		pageList.getRecords().forEach(it->{
+			if(it.getEnhanceType()==2 && it.getExtAttr3().equals("0")){
+				List<FactorCondRela> factorCondRelaList = factorCondRelaService.lambdaQuery().eq(FactorCondRela::getFactorEnhanceId,it.getId()).list();
+				it.setFactorCondRelaList(factorCondRelaList);
+			}
+		});
 		return Result.OK(pageList);
 	}
 	
@@ -91,14 +102,16 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 	 */
 	@AutoLog(value = "factor_enchance-添加")
 	@ApiOperation(value="factor_enchance-添加", notes="factor_enchance-添加")
-	@RequiresPermissions("medical:factor_enchance:add")
+//	@RequiresPermissions("medical:factor_enchance:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody FactorEnchance factorEnchance) {
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		if(sysUser!=null){
+	public Result<String> add(@RequestBody FactorEnchance factorEnchance,HttpServletRequest req) {
+//		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String username = JwtUtil.getUserNameByToken(req);
+
+		if(username!=null){
 //			dto.setUserid(sysUser.getUsername());
 //			dto.setUsername(sysUser.getRealname());
-			factorEnchance.setCreateBy(sysUser.getUsername());
+			factorEnchance.setCreateBy(username);
 			factorEnchance.setCreateTime(new Date(System.currentTimeMillis()));
 			factorEnchance.setState(Constant.EFF_STATE);
 			factorEnchance.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -112,6 +125,9 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 			case LOGICAL_EXPRESSION:
 				factorEnchanceService.saveLogicalFactorEnchance(factorEnchance);
 				break;
+			case PLUGIN:
+				factorEnchanceService.saveSqlFactorEnchance(factorEnchance);
+				break;
 		}
 		return Result.OK("添加成功！");
 	}
@@ -124,7 +140,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 	 */
 	@AutoLog(value = "factor_enchance-编辑")
 	@ApiOperation(value="factor_enchance-编辑", notes="factor_enchance-编辑")
-	@RequiresPermissions("medical:factor_enchance:edit")
+//	@RequiresPermissions("medical:factor_enchance:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody FactorEnchance factorEnchance) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -146,7 +162,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 	 */
 	@AutoLog(value = "factor_enchance-通过id删除")
 	@ApiOperation(value="factor_enchance-通过id删除", notes="factor_enchance-通过id删除")
-	@RequiresPermissions("medical:factor_enchance:delete")
+//	@RequiresPermissions("medical:factor_enchance:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		Wrapper<FactorEnchance> updateWrapper = new UpdateWrapper<>();
@@ -186,6 +202,10 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
 		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);
 	}
 

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

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: event_attr
+ * @Description: 要素管理
  * @Author: jeecg-boot
  * @Date:   2023-04-23
  * @Version: V1.0
@@ -82,7 +82,7 @@ public class EventAttr implements Serializable {
     @TableLogic
     private java.lang.Integer delFlag;
 	/**错误码;当因子类型为判断因子时,需要填写未结算原因,此处对应错误码.*/
-	@Excel(name = "错误码;当因子类型为判断因子时,需要填写未结算原因,此处对应错误码.", width = 15)
+	@Excel(name = "错误码", width = 15)
     @ApiModelProperty(value = "错误码;当因子类型为判断因子时,需要填写未结算原因,此处对应错误码.")
     private java.lang.String errorCode;
 	/**版本号*/

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

@@ -46,6 +46,7 @@ public class MedicalInsRuleInfo implements Serializable {
 	/**类别*/
 	@Excel(name = "类别", width = 15)
     @ApiModelProperty(value = "类别")
+    @Dict(dicCode = "secondary_type")
     private java.lang.String category;
 
     /**规则实体 1:药品，2:诊疗，3:耗材*/
@@ -71,6 +72,7 @@ public class MedicalInsRuleInfo implements Serializable {
     /**违规等级;0:直接违规  1:重度可疑  2:轻度可疑  3：仅提醒展示*/
     @Excel(name = "违规等级", width = 15)
     @ApiModelProperty(value = "违规等级")
+    @Dict(dicCode = "violation_level")
     private java.lang.Integer violationLevel;
 	/**可疑程度*/
 	@Excel(name = "可疑程度", width = 15)
@@ -87,6 +89,7 @@ public class MedicalInsRuleInfo implements Serializable {
 	/**调用场景*/
 	@Excel(name = "调用场景;1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中", width = 15)
     @ApiModelProperty(value = "调用场景;1=事前  2=事后  3=事前/事后 4=事中 5=事后/事中")
+    @Dict(dicCode = "call_scenario")
     private java.lang.String callScenario;
 	/**状态*/
 	@Excel(name = "状态", width = 15)

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

@@ -76,6 +76,7 @@ public class FactorEnchanceServiceImpl extends ServiceImpl<FactorEnchanceMapper,
     public Integer saveLogicalFactorEnchance(FactorEnchance factorEnchance) {
         if(CollectionUtil.isNotEmpty(factorEnchance.getFactorCondRelaList())) {
             for (FactorCondRela factorCondRela : factorEnchance.getFactorCondRelaList()) {
+                factorCondRela.setFactorEnhanceId(factorEnchance.getId());
                 factorCondRelaMapper.insert(factorCondRela);
             }
             return factorEnchance.getFactorCondRelaList().size();

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

@@ -0,0 +1,10 @@
+package org.jeecg.modules.medical.vo;
+
+import lombok.Data;
+
+@Data
+public class eventAttrSelectResponse {
+
+    private Integer id;
+    private String chName;
+}