requestMapping修改

business/base-service/src/main/java/com/yihu/jw/dict/service/HospitalParameterService.java

@@ -0,0 +1,65 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.entity.hospital.dict.BaseHospitalParameterDO;
import com.yihu.jw.hospital.dict.BaseHospitalParameterDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class HospitalParameterService extends BaseJpaService<BaseHospitalParameterDO, BaseHospitalParameterDao> {
    @Autowired
    private BaseHospitalParameterDao hospitalParameterDao;
    public BaseHospitalParameterDO createOrUpdateParameter(BaseHospitalParameterDO hospitalParameterDO) {
        //判断新增或编辑
        if (hospitalParameterDO.getId() == null) {
            hospitalParameterDO.setCreateTime(new Date());
            hospitalParameterDO.setDel(1);
            hospitalParameterDO.setUpdateTime(new Date());
            return hospitalParameterDao.save(hospitalParameterDO);
        } else {
            BaseHospitalParameterDO oldHospitalParameter = hospitalParameterDao.findOne(hospitalParameterDO.getId());
            BeanUtils.copyProperties(hospitalParameterDO, oldHospitalParameter, getNullPropertyNames(hospitalParameterDO));
            oldHospitalParameter.setUpdateTime(new Date());
            return hospitalParameterDao.save(oldHospitalParameter);
        }
    }
    public void delHospitalParameter(Integer id) {
        hospitalParameterDao.delete(id);
    }
    public MixEnvelop getHospitalParameterList(String name, String hospital, Integer del, Integer page, Integer pageSize) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        String filters = "";
        if (StringUtils.isNotBlank(name)) {
            filters += "name?" + name + ";";
        }
//        if (StringUtils.isNotBlank(number)) {
//            filters += "number?" + number + ";";
//        }
        if (StringUtils.isNotBlank(hospital)) {
            filters += "hospital=" + hospital + ";";
        }
        if (del != null) {
            filters += "del=" + del + ";";
        }
        Integer count = this.search(null, filters, null).size();
        List<BaseHospitalParameterDO> list = this.search(null, filters, null, page, pageSize);
        mixEnvelop.setMessage("获取成功！");
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setTotalCount(count);
        mixEnvelop.setDetailModelList(list);
        return mixEnvelop;
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/dict/BaseHospitalParameterDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.hospital.dict;
import com.yihu.jw.entity.hospital.dict.BaseHospitalParameterDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseHospitalParameterDao extends PagingAndSortingRepository<BaseHospitalParameterDO, Integer>, JpaSpecificationExecutor<BaseHospitalParameterDO> {
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/BaseHospitalParameterDO.java

@@ -0,0 +1,85 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
@Table(name = "base_hospital_parameter")
@Entity
public class BaseHospitalParameterDO extends IntegerIdentityEntityWithOperator {
    private String number;//参数编码
    private String name;//参数名称
    private String value;//参数值
    private String hospital;//所属机构
    private String hospitalName;//所属机构名称
    private String description;//参数描述
    private String explain;//参数值说明
    private Integer del;//是否有效（1是 0否）
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDescription() {
        return description;
    }
    public void setDescription(String description) {
        this.description = description;
    }
    public String getExplain() {
        return explain;
    }
    public void setExplain(String explain) {
        this.explain = explain;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1461,6 +1461,11 @@ public class BaseHospitalRequestMapping {
        public static final String findModelDict = "/findModelDict";
        public static final String updateDictGroup = "/updateDictGroup";
        public static final String delDictGroup = "/delDictGroup";
        //系统参数配置
        public static final String getHospitalParameterList = "/getHospitalParameterList";
        public static final String createOrUpdateParameter = "createOrUpdateParameter";
        public static final String delHospitalParameter = "delHospitalParameter";
    }
    /**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/dict/HospitalParameterEndpoint.java

@@ -0,0 +1,60 @@
package com.yihu.jw.hospital.endpoint.dict;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.dict.service.HospitalParameterService;
import com.yihu.jw.entity.hospital.dict.BaseHospitalParameterDO;
import com.yihu.jw.entity.hospital.prescription.BaseNationalDrugDictDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.PatientNoLogin.PREFIX)
@Api(value = "系统参数配置", description = "系统参数配置", tags = {"系统参数配置"})
public class HospitalParameterEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private HospitalParameterService hospitalParameterService;
    @Autowired
    private ObjectMapper objectMapper;
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.createOrUpdateParameter)
    @ApiOperation(value = "保存编辑系统参数")
    public ObjEnvelop createOrUpdateParameter(@ApiParam(name = "jsonData", value = "系统参数json串")
                                       @RequestParam(name = "jsonData", required = true) String jsonData) throws Exception {
        BaseHospitalParameterDO hospitalParameterDO = objectMapper.readValue(jsonData, BaseHospitalParameterDO.class);
        return success(hospitalParameterService.createOrUpdateParameter(hospitalParameterDO));
    }
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.getHospitalParameterList)
    @ApiOperation(value = "获取系统参数列表")
    public MixEnvelop getHospitalParameterList(@ApiParam(name = "name", value = "参数名称或编码")
                                          @RequestParam(name = "name", required = false) String name,
//                                          @ApiParam(name = "number", value = "药品编码")
//                                          @RequestParam(name = "number", required = false) String number,
                                          @ApiParam(name = "hospital", value = "所属机构")
                                          @RequestParam(name = "hospital", required = false) String hospital,
                                          @ApiParam(name = "del", value = "状态")
                                          @RequestParam(name = "del", required = false) Integer del,
                                          @ApiParam(name = "page", value = "当前页")
                                          @RequestParam(name = "page", required = false) Integer page,
                                          @ApiParam(name = "pageSize", value = "页面大小")
                                          @RequestParam(name = "pageSize", required = false) Integer pageSize) throws Exception {
        return hospitalParameterService.getHospitalParameterList(name, hospital, del, page, pageSize);
    }
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.delHospitalParameter)
    @ApiOperation(value = "删除系统参数")
    public Envelop delHospitalParameter(@ApiParam(name = "id", value = "药品id")
                                            @RequestParam(name = "id", required = true) Integer id){
        hospitalParameterService.delHospitalParameter(id);
        return success();
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/NationalDrugDictEndpoint.java

@@ -3,7 +3,6 @@ package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.entity.hospital.prescription.BaseNationalDrugDictDO;
import com.yihu.jw.hospital.prescription.service.NationalDrugDictService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -11,17 +10,14 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.Prescription.PREFIX)
@Api(value = "药品字段维护", description = "药品字段维护", tags = {"药品字段维护"})
@Api(value = "药品字典维护", description = "药品字典维护", tags = {"药品字典维护"})
public class NationalDrugDictEndpoint extends EnvelopRestEndpoint {
    private static final Logger logger = LoggerFactory.getLogger(NationalDrugDictEndpoint.class);
    @Autowired
    private NationalDrugDictService nationalDrugDictService;
@@ -54,8 +50,8 @@ public class NationalDrugDictEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "更新药品字典状态")
    public Envelop updateNationalDrugStatus(@ApiParam(name = "id", value = "药品id")
                                       @RequestParam(name = "id", required = true) Integer id,
                                            @ApiParam(name = "status", value = "状态")
                                               @RequestParam(name = "status", required = false) Integer status){
                                            @ApiParam(name = "status", value = "状态", required = true)
                                               @RequestParam(name = "status") Integer status){
        nationalDrugDictService.updateNationalDrugStatus(id,status);
        return success();
    }