Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -0,0 +1,37 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.entity.hospital.manage.BaseDeptHomepageBannerDO;
import com.yihu.jw.entity.hospital.manage.BaseDeptHomepageBannerDO;
import com.yihu.jw.hospital.dict.BaseDeptHomepageBannerDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class DeptHomepageBannerService extends BaseJpaService<BaseDeptHomepageBannerDO, BaseDeptHomepageBannerDao> {
    @Autowired
    private BaseDeptHomepageBannerDao deptHomepageBannerDao;
    public BaseDeptHomepageBannerDO updateDeptHomepageBanner(BaseDeptHomepageBannerDO deptHomepageBannerDO) {
        //判断新增或编辑
        if (deptHomepageBannerDO.getId() == null) {
            deptHomepageBannerDO.setCreateTime(new Date());
            deptHomepageBannerDO.setDel(1);
            return deptHomepageBannerDao.save(deptHomepageBannerDO);
        } else {
            BaseDeptHomepageBannerDO oldDeptHomepageBanner = deptHomepageBannerDao.findOne(deptHomepageBannerDO.getId());
            BeanUtils.copyProperties(deptHomepageBannerDO, oldDeptHomepageBanner, getNullPropertyNames(deptHomepageBannerDO));
            return deptHomepageBannerDao.save(oldDeptHomepageBanner);
        }
    }
    public void delDeptHomepageBanner(Integer id) {
        deptHomepageBannerDao.delete(id);
    }
}

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

@@ -0,0 +1,63 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.entity.hospital.manage.BaseDiseaseHomepageBannerDO;
import com.yihu.jw.hospital.dict.BaseDiseaseHomepageBannerDao;
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 DiseaseHomepageBannerService extends BaseJpaService<BaseDiseaseHomepageBannerDO, BaseDiseaseHomepageBannerDao> {
    @Autowired
    private BaseDiseaseHomepageBannerDao diseaseHomepageBannerDao;
    public BaseDiseaseHomepageBannerDO updateDiseaseHomepageBanner(BaseDiseaseHomepageBannerDO diseaseHomepageBannerDO) {
        //判断新增或编辑
        if (diseaseHomepageBannerDO.getId() == null) {
            diseaseHomepageBannerDO.setCreateTime(new Date());
            diseaseHomepageBannerDO.setDel(1);
            return diseaseHomepageBannerDao.save(diseaseHomepageBannerDO);
        } else {
            BaseDiseaseHomepageBannerDO oldDiseaseHomepageBanner = diseaseHomepageBannerDao.findOne(diseaseHomepageBannerDO.getId());
            BeanUtils.copyProperties(diseaseHomepageBannerDO, oldDiseaseHomepageBanner, getNullPropertyNames(diseaseHomepageBannerDO));
            return diseaseHomepageBannerDao.save(oldDiseaseHomepageBanner);
        }
    }
    public void delDiseaseHomepageBanner(Integer id) {
        diseaseHomepageBannerDao.delete(id);
    }
    public MixEnvelop findDiseaseHomepageBanner(Integer id, String name, Integer page, Integer pageSize) throws Exception {
        MixEnvelop mixEnvelop = new MixEnvelop();
        String filters = "";
        if (id != null) {
            filters += "id=" + id + ";";
        }else {
            if (StringUtils.isNotBlank(name)) {
                filters += "name?" + name + ";";
            }
        }
        Integer count = this.search(null, filters, null).size();
        List<BaseDiseaseHomepageBannerDO> list;
        if(page!= null && pageSize!=null) {
            list = this.search(null, filters, null, page, pageSize);
        }else {
            list = this.search(null, filters, null);
        }
        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/dict/service/HospitalParameterService.java

@@ -1,65 +0,0 @@
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/BaseDeptHomepageBannerDao.java

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

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

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

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

@@ -1,8 +0,0 @@
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> {
}

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

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

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/NationalDrugDictService.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@@ -60,7 +61,8 @@ public class NationalDrugDictService extends BaseJpaService<BaseNationalDrugDict
     */
    public MixEnvelop getNationalDrugList(String name, String number, String hospital, Integer status, Integer page, Integer pageSize) throws ParseException {
        MixEnvelop mixEnvelop = new MixEnvelop();
        String sql = "SELECT id,number,name,subject_class,subject_class_name,drug_code,drug_name,hospital,hospital_name,relation_code,`status` " +
        String sql = "SELECT id,number,name,py_name as pyName,common_name as commonName,py_common_name as pyCommonName,subject_class as subjectClass,subject_class_name as subjectClassName," +
                "drug_code as drugCode,drug_name as drugName,hospital,hospital_name as hospitalName,relation_code as relationCode,`status` " +
                "FROM `base_national_drug_dict` WHERE 1=1 ";
        if (StringUtils.isNotBlank(name)) {
            sql += "and name like '%" + name + "%' ";
@@ -80,7 +82,7 @@ public class NationalDrugDictService extends BaseJpaService<BaseNationalDrugDict
        if (page != null && pageSize != null) {
            sql += "order by create_time desc limit " + (page - 1) * pageSize + "," + pageSize;
        }
        List<BaseNationalDrugDictDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(BaseNationalDrugDictDO.class));
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        mixEnvelop.setMessage("获取成功！");
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    /*@GeneratedValue(generator = "generator")
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)*/
    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

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

@@ -1,87 +0,0 @@
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.SequenceGenerator;
import javax.persistence.Table;
@Table(name = "base_hospital_parameter")
@Entity
@SequenceGenerator(name="id_generated", sequenceName="BASE_HOSPITAL_PARAMETER_SEQ")
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-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDeptHomepageBannerDO.java

@@ -0,0 +1,68 @@
package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_dept_homepage_banner")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DEPT_HOMEPAGE_BANNER_SEQ")
public class BaseDeptHomepageBannerDO  extends IntegerIdentityEntity {
    private String deptCode;//科室code
    private String deptName;//科室名称
    private String image;//图标
    private Integer sort;//排序
    private Integer del;//是否删除（1是 0否）
    private Date createTime;//创建时间
    public String getDeptCode() {
        return deptCode;
    }
    public void setDeptCode(String deptCode) {
        this.deptCode = deptCode;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getImage() {
        return image;
    }
    public void setImage(String image) {
        this.image = image;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDiseaseHomepageBannerDO.java

@@ -0,0 +1,68 @@
package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_disease_homepage_banner")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DISEASE_HOMEPAGE_BANNER_SEQ")
public class BaseDiseaseHomepageBannerDO  extends IntegerIdentityEntity {
    private String diseaseCode;//
    private String diseaseName;//
    private String image;//图标
    private Integer sort;//排序
    private Integer del;//是否删除（1是 0否）
    private Date createTime;//创建时间
    public String getDiseaseCode() {
        return diseaseCode;
    }
    public void setDiseaseCode(String diseaseCode) {
        this.diseaseCode = diseaseCode;
    }
    public String getDiseaseName() {
        return diseaseName;
    }
    public void setDiseaseName(String diseaseName) {
        this.diseaseName = diseaseName;
    }
    public String getImage() {
        return image;
    }
    public void setImage(String image) {
        this.image = image;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseDoctorSortDO.java

@@ -0,0 +1,59 @@
package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_doctor_sort")
@SequenceGenerator(name="id_generated", sequenceName="BASE_DOCTOR_SORT_SEQ")
public class BaseDoctorSortDO extends IntegerIdentityEntity {
    private String doctorCode;//医生code
    private String doctorName;//医生名称
    private Integer sort;//排序
    private Integer del;//是否删除（1是 0否）
    private Date createTime;//创建时间
    public String getDoctorCode() {
        return doctorCode;
    }
    public void setDoctorCode(String doctorCode) {
        this.doctorCode = doctorCode;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/manage/BaseTopBannerDO.java

@@ -0,0 +1,86 @@
package com.yihu.jw.entity.hospital.manage;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_top_banner")
@SequenceGenerator(name="id_generated", sequenceName="BASE_NATIONAL_DRUG_DICT_SEQ")
public class BaseTopBannerDO extends IntegerIdentityEntity {
    private String saasId;//激励id
    private String name;//名称
    private String image;//图片
    private String url;//url地址
    private Integer sort;//排序
    private Integer status;//上线状态（1上线 2下线）
    private Integer del;//是否有效（1是 0否）
    private Date createTime;//创建时间
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getImage() {
        return image;
    }
    public void setImage(String image) {
        this.image = image;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/BaseNationalDrugDictDO.java

@@ -22,6 +22,8 @@ public class BaseNationalDrugDictDO extends IntegerIdentityEntity {
    private String hospital;//机构id
    private String hospitalName;//机构名称
    private String relationCode;//国家药品编码saasId（机构药品时该字段才有值）
    private String relationName;//关联的国家药品通用名
    private String relationPyName;//关联的国家药品通用名拼音码
    private String gyzz;//国药准字
    private String unit;//包装单位
    private String packingSpecifications;//包装规格
@@ -38,7 +40,7 @@ public class BaseNationalDrugDictDO extends IntegerIdentityEntity {
    private String medicareSpecifications;//医保规格
    private String medicareUnit;//医保单位
    private String toxicology;//毒理分类
    private String toxicology_name;//毒理分类名称
    private String toxicologyName;//毒理分类名称
    private String prescription;//处方用药
    private String gmp;//gmp药品
    private String antimicrobial;//抗菌药分类id
@@ -267,12 +269,12 @@ public class BaseNationalDrugDictDO extends IntegerIdentityEntity {
        this.toxicology = toxicology;
    }
    public String getToxicology_name() {
        return toxicology_name;
    public String getToxicologyName() {
        return toxicologyName;
    }
    public void setToxicology_name(String toxicology_name) {
        this.toxicology_name = toxicology_name;
    public void setToxicologyName(String toxicologyName) {
        this.toxicologyName = toxicologyName;
    }
    public String getPrescription() {
@@ -426,4 +428,20 @@ public class BaseNationalDrugDictDO extends IntegerIdentityEntity {
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getRelationName() {
        return relationName;
    }
    public void setRelationName(String relationName) {
        this.relationName = relationName;
    }
    public String getRelationPyName() {
        return relationPyName;
    }
    public void setRelationPyName(String relationPyName) {
        this.relationPyName = relationPyName;
    }
}

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

@@ -1465,10 +1465,14 @@ public class BaseHospitalRequestMapping {
        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";
        //疾病首页标签配置
        public static final String findDiseaseHomepageBanner = "/findDiseaseHomepageBanner";
        public static final String updateDiseaseHomepageBanner = "/updateDiseaseHomepageBanner";
        public static final String delDiseaseHomepageBanner = "/delDiseaseHomepageBanner";
        //科室首页标签配置
        public static final String findDeptHomepageBanner = "/findDeptHomepageBanner";
        public static final String updateDeptHomepageBanner = "/updateDeptHomepageBanner";
        public static final String delDeptHomepageBanner = "/delDeptHomepageBanner";
    }
    /**

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

@@ -0,0 +1,37 @@
package com.yihu.jw.hospital.endpoint.dict;
import com.yihu.jw.dict.service.DeptHomepageBannerService;
import com.yihu.jw.entity.hospital.manage.BaseDeptHomepageBannerDO;
import com.yihu.jw.restmodel.web.Envelop;
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 = "科室首页图标管理",tags = "科室首页图标")
public class DeptHomepageBannerEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DeptHomepageBannerService deptHomepageBannerService;
    @ApiOperation("删除疾病首页图标")
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.delDeptHomepageBanner)
    public Envelop delDeptHomepageBanner(@ApiParam(name = "id", value = "id", required = true)
                                            @RequestParam(value = "id", required = true) Integer id) {
        deptHomepageBannerService.delDeptHomepageBanner(id);
        return success();
    }
    @ApiOperation("新增/修改疾病首页图标")
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.updateDeptHomepageBanner)
    public Envelop updateDeptHomepageBanner(@ApiParam(name = "json", value = "json", required = true)
                                               @RequestParam(value = "json", required = true) String json) throws Exception {
        BaseDeptHomepageBannerDO deptHomepageBannerDO = objectMapper.readValue(json, BaseDeptHomepageBannerDO.class);
        return success(deptHomepageBannerService.updateDeptHomepageBanner(deptHomepageBannerDO));
    }
}

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

@@ -0,0 +1,52 @@
package com.yihu.jw.hospital.endpoint.dict;
import com.yihu.jw.dict.service.DiseaseHomepageBannerService;
import com.yihu.jw.entity.hospital.manage.BaseDiseaseHomepageBannerDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
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 = "疾病首页图标管理",tags = "疾病首页图标管理")
public class DiseaseHomepageBannerEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private DiseaseHomepageBannerService diseaseHomepageBannerService;
    @ApiOperation("查询疾病首页图标")
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.findDiseaseHomepageBanner)
    public MixEnvelop findDiseaseHomepageBanner(@ApiParam(name = "id", value = "id", required = false)
                                                 @RequestParam(value = "id", required = false) Integer id,
                                                @ApiParam(name = "name", value = "name", required = false)
                                                 @RequestParam(value = "name", required = false) String name,
                                                @ApiParam(name = "page", value = "page", required = false)
                                                 @RequestParam(value = "page", required = false) Integer page,
                                                @ApiParam(name = "pageSize", value = "pageSize", required = false)
                                                 @RequestParam(value = "pageSize", required = false) Integer pageSize) throws Exception {
        return diseaseHomepageBannerService.findDiseaseHomepageBanner(id, name, page, pageSize);
    }
    @ApiOperation("删除疾病首页图标")
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.delDiseaseHomepageBanner)
    public Envelop delDiseaseHomepageBanner(@ApiParam(name = "id", value = "id", required = true)
                           @RequestParam(value = "id", required = true) Integer id) {
        diseaseHomepageBannerService.delDiseaseHomepageBanner(id);
        return success();
    }
    @ApiOperation("新增/修改疾病首页图标")
    @PostMapping(value = BaseHospitalRequestMapping.PatientNoLogin.updateDiseaseHomepageBanner)
    public Envelop updateDiseaseHomepageBanner(@ApiParam(name = "json", value = "json", required = true)
                                      @RequestParam(value = "json", required = true) String json) throws Exception {
        BaseDiseaseHomepageBannerDO diseaseHomepageBannerDO = objectMapper.readValue(json, BaseDiseaseHomepageBannerDO.class);
        return success(diseaseHomepageBannerService.updateDiseaseHomepageBanner(diseaseHomepageBannerDO));
    }
}

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

@@ -1,60 +0,0 @@
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-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -89,48 +89,43 @@ public class RehabilitationManageService {
     */
    public MixEnvelop<Map<String,Object>, Map<String,Object>> findRehabilitationPlan(Integer doctorType,String doctorCode, String diseaseCode, Integer planType,Integer todaybacklog, String patientCondition,Integer page, Integer pageSize) throws Exception{
        String leftSql = "";
        String sql = " select p.*  from wlyy_specialist.wlyy_patient_rehabilitation_plan p  " ;
        String sql = " select DISTINCT p.* " +
                " from wlyy_specialist.wlyy_rehabilitation_plan_detail a INNER JOIN wlyy_specialist.wlyy_patient_rehabilitation_plan p " +
                " on a.plan_id = p.id  " ;
        if(doctorType==2){//家医是根据签约关系过滤
            leftSql =" join "+basedb+".wlyy_sign_family f on f.patient=p.patient and f.expenses_status='1' and f.status=1 ";
            leftSql+=" and (f.doctor='"+doctorCode+"' or f.doctor_health='"+doctorCode+"') ";
            sql.replace("from", ",f.idcard,f.hospital_name from");
            sql += leftSql;
            sql+=" INNER JOIN wlyy.wlyy_sign_family f ON f.patient = p.patient \n" +
                    "\tand f.expenses_status=1\n" +
                    "\tAND f.STATUS >= 1 \n" +
                    "\tAND ( f.doctor = '"+doctorCode+"' OR f.doctor_health = '"+doctorCode+"' )  ";
        }
        sql += " where 1=1 ";
        if(todaybacklog!=null&&todaybacklog==1){
            String todayStart = DateUtil.getStringDateShort()+" "+"00:00:00";
            String todayEnd = DateUtil.getStringDateShort()+" "+"23:59:59";
            sql += " and a.execute_time>='"+todayStart+"' and a.execute_time<='"+todayEnd+"'";
        }
        if(planType!=null){
            sql += " and p.plan_type="+planType;
        }
        if(StringUtils.isNotEmpty(diseaseCode)){
            sql+=" and p.disease='"+diseaseCode+"'";
        }
        if(StringUtils.isNotEmpty(patientCondition)){
            sql += " and " + AesEncryptUtils.decryptMysqlNo("p.name") + " like '%"+patientCondition+"%' ";
        if(StringUtils.isNotEmpty(patientCondition)){//姓名idcard模糊查询
            sql +=" AND EXISTS (select code from wlyy.wlyy_patient where  `code` = p.patient and ( `name` LIKE '%"+patientCondition+"%' or idcard like '%"+patientCondition+"%') )";
        }
        if (doctorType==1){
            sql +=" AND (p.create_user = '"+doctorCode+"' \n" +
                    "\tOR a.doctor = '"+doctorCode+"' ) ";
        }
        sql = TransforSqlUtl.wlyy_patient_rehabilitation_planAll2(sql);
        String finalSql = "";
        String todayStart = DateUtil.getStringDateShort()+" "+"00:00:00";
        String todayEnd = DateUtil.getStringDateShort()+" "+"23:59:59";
        String condition ="";
        if(todaybacklog!=null&&todaybacklog==1){
            condition += " and execute_time>='"+todayStart+"' and execute_time<='"+todayEnd+"'";
        }
        finalSql =" select DISTINCT b.* from (select  plan_id,doctor from wlyy_specialist.wlyy_rehabilitation_plan_detail where  1=1 "+condition+") a " +
                " JOIN ("+sql+") b on a.plan_id=b.id ";
        if(doctorType==1){//专科医生是根据计划的创建者字段过滤
            finalSql += " where  b.create_user = '"+doctorCode+"' or a.doctor ='"+doctorCode+"'";
        }
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(finalSql);
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql);
        int count = 0;
        if(rstotal!=null&&rstotal.size()>0&&rstotal.get(0).get("id")!=null){
            count = rstotal.size();
        }
        finalSql += " ORDER BY b.create_time DESC LIMIT "+(page-1)*pageSize+","+pageSize;
        List<Map<String,Object>> patientRehabilitationPlanDOList = jdbcTemplate.queryForList(finalSql);
        sql += " ORDER BY p.create_time DESC LIMIT "+(page-1)*pageSize+","+pageSize;
        List<Map<String,Object>> patientRehabilitationPlanDOList = jdbcTemplate.queryForList(sql);
        List<Map<String,Object>> resultList = new ArrayList<>();
        if(patientRehabilitationPlanDOList.size()>0&&patientRehabilitationPlanDOList.get(0).get("id")!=null){