Yaxin
/
virtual-patient
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manage:疾病处置计划添加修改接口

Browse Source
dev_2.1.0
xueqingkun 1 year ago
parent 5405910566
commit 5112abaa2e
8 changed files with 78 additions and 34 deletions
Show Stats Download Patch File Download Diff File

13
virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java
Unescape Escape View File

@ -30,6 +30,15 @@ public class TreatmentPlanManageController {
}
/* @ApiOperation("查询一级处置计划")
@GetMapping("/queryFirstMeasures")
public List<ConfigTreatmentPlan> queryFirstMeasures(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod,
@ApiParam("处置计划id")@RequestParam(required = false) String disposalPlanId) {
return configTreatmentPlanManageService.queryFirstMeasures(disposalMethod);
}*/
@ApiOperation("根据id查询处置计划详情")
@GetMapping("/findById")
@ -52,9 +61,9 @@ public class TreatmentPlanManageController {
@ApiOperation("保存处置计划")
@PostMapping("/save")
public String saveTreatmentPlan(@RequestBody ConfigTreatmentPlan configDrug) {
public String saveTreatmentPlan(@RequestBody ConfigTreatmentPlan configTreatmentPlan) {
ConfigTreatmentPlan result = configTreatmentPlanManageService.saveTreatmentPlan(configDrug);
ConfigTreatmentPlan result = configTreatmentPlanManageService.saveTreatmentPlan(configTreatmentPlan);
return result.getId();
}

10
virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class DiseaseTreatmentPlanManageController {
@ApiOperation("保存处置信息")
@PostMapping("/save")
public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlan diseaseTreatmentPlan) {
public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
DiseaseTreatmentPlan result = diseaseTreatmentPlanManageService.saveTreatmentPlan(diseaseTreatmentPlan);
return result.getId();
@ -57,6 +57,14 @@ public class DiseaseTreatmentPlanManageController {
}
@ApiOperation("修改处置计划")
@PutMapping("/update")
public boolean updateDiseaseTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
return diseaseTreatmentPlanManageService.updateDiseaseTreatmentPlan(diseaseTreatmentPlan);
}
@ApiOperation("查询处置计划树")
@GetMapping("/queryTree")
public List<DiseaseTreatmentPlanTreeNode> queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod,

6
virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.supervision.manage.service;
import com.supervision.model.ConfigTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlan;
import com.supervision.vo.manage.DiseaseTreatmentPlanReqVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
@ -11,7 +11,7 @@ public interface DiseaseTreatmentPlanManageService {
List<DiseaseTreatmentPlanResVo> queryListByDiseaseId(String diseaseId);
DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan);
DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan);
void batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList);
@ -20,4 +20,6 @@ public interface DiseaseTreatmentPlanManageService {
boolean deleteByDiseaseId(String diseaseId);
List<DiseaseTreatmentPlanTreeNode> queryDiseaseTreatmentPlanTree(Integer disposalMethod, String diseaseId);
boolean updateDiseaseTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan);
}

31
virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java
Unescape Escape View File

@ -10,13 +10,16 @@ import com.supervision.model.DiseaseTreatmentPlan;
import com.supervision.model.DiseaseTreatmentPlanDrug;
import com.supervision.service.DiseaseTreatmentPlanDrugService;
import com.supervision.service.DiseaseTreatmentPlanService;
import com.supervision.vo.manage.DiseaseTreatmentPlanReqVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanResVo;
import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode;
import com.supervision.vo.manage.TreatmentPlanTreeNode;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@ -37,7 +40,7 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
}
@Override
public DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) {
public DiseaseTreatmentPlan saveTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
assertDiseaseTreatmentPlan(diseaseTreatmentPlan);
@ -62,11 +65,6 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
@Override
public void batchSaveTreatmentPlan(List<DiseaseTreatmentPlan> diseaseTreatmentPlanList) {
Assert.notEmpty(diseaseTreatmentPlanList,"数据不能为空");
diseaseTreatmentPlanList.forEach(item->{
if (StrUtil.isEmpty(item.getTreatmentPlanId())){
item.setTreatmentPlanId(item.getPlanId());
}
});
diseaseTreatmentPlanList.forEach(this::assertDiseaseTreatmentPlan);
diseaseTreatmentPlanService.saveBatch(diseaseTreatmentPlanList);
@ -110,6 +108,25 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
return rootNode.getChild();
}
@Override
@Transactional(rollbackFor=Exception.class)
public boolean updateDiseaseTreatmentPlan(DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) {
Assert.notEmpty(diseaseTreatmentPlan.getId(),"id允许为空");
DiseaseTreatmentPlan dtp = diseaseTreatmentPlanService.getById(diseaseTreatmentPlan.getId());
// 删除旧的数据
if (Objects.nonNull(dtp)){
diseaseTreatmentPlanService.removeById(diseaseTreatmentPlan.getId());
diseaseTreatmentPlanDrugService.lambdaUpdate()
.eq(DiseaseTreatmentPlanDrug::getTreatmentPlanId,dtp.getTreatmentPlanId())
.eq(DiseaseTreatmentPlanDrug::getDiseaseId,dtp.getDiseaseId()).remove();
}
diseaseTreatmentPlan.setId(null);
this.saveTreatmentPlan(diseaseTreatmentPlan);
return false;
}
private void assertDiseaseTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan){
@ -118,6 +135,6 @@ public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPl
Assert.notEmpty(diseaseTreatmentPlan.getDiseaseId(),"疾病id不能为空");
Assert.notEmpty(diseaseTreatmentPlan.getPlanId(),"处置计划id不能为空");
Assert.notEmpty(diseaseTreatmentPlan.getTreatmentPlanId(),"处置方式id不能为空");
}
}

3
virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java
Unescape Escape View File

@ -39,9 +39,6 @@ public class DiseaseTreatmentPlan implements Serializable {
*/
private String treatmentPlanId;
@ApiModelProperty("药物列表")
private List<String> drugIds;
/**
* 创建人ID
*/

16
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanReqVo.java
Unescape Escape View File

@ -0,0 +1,16 @@
package com.supervision.vo.manage;
import com.supervision.model.DiseaseTreatmentPlan;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class DiseaseTreatmentPlanReqVo extends DiseaseTreatmentPlan {
@ApiModelProperty("药物列表")
private List<String> drugIds;
}

3
virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java
Unescape Escape View File

@ -16,9 +16,12 @@ public class DiseaseTreatmentPlanResVo extends ConfigTreatmentPlan {
@ApiModelProperty("疾病id")
private String diseaseId;
@Deprecated
@ApiModelProperty("计划id")
private String planId;
@ApiModelProperty("计划id 用来代替planId")
private String treatmentPlanId;
}

30
virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml
Unescape Escape View File

@ -21,26 +21,18 @@
</sql>
<resultMap id="queryListByDiseaseIdResultMap" type="com.supervision.vo.manage.DiseaseTreatmentPlanResVo">
<result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
<result property="planId" column="planId" jdbcType="VARCHAR"/>
<result property="disposalPlan" column="disposalPlan" jdbcType="VARCHAR"/>
<result property="disposalMethod" column="disposalMethod" jdbcType="VARCHAR"/>
<result property="secondMeasures" column="secondMeasures" jdbcType="VARCHAR"/>
<result property="recommendedMedication" column="recommendedMedication" jdbcType="ARRAY" typeHandler="com.supervision.handler.StringListTypeHandler"/>
</resultMap>
<select id="queryListByDiseaseId" resultMap="queryListByDiseaseIdResultMap">
<select id="queryListByDiseaseId" resultType="com.supervision.vo.manage.DiseaseTreatmentPlanResVo">
select
dtp.id as id,
dtp.disease_id as diseaseId,
dtp.treatment_plan_id as planId,
ctp.disposal_plan as disposalPlan,
ctp.disposal_method as disposalMethod,
ctp.first_measures as firstMeasures,
ctp.second_measures as secondMeasures,
ctp.recommended_medication as recommendedMedication
dtp.id as id,
dtp.disease_id as diseaseId,
dtp.treatment_plan_id as treatmentPlanId,
ctp.disposal_plan_id as disposalPlanId,
ctp.disposal_plan as disposalPlan,
ctp.disposal_method as disposalMethod,
ctp.first_measures_id as firstMeasuresId,
ctp.first_measures as firstMeasures,
ctp.second_measures as secondMeasures,
ctp.recommended_medication as recommendedMedication
from vp_disease_treatment_plan dtp
left join vp_config_treatment_plan ctp on dtp.treatment_plan_id = ctp.id
where dtp.disease_id = #{diseaseId}

Write Preview
Loading…
Cancel
Save