代码修改

business/base-service/src/main/java/com/yihu/jw/area/dao/BaseInpatientAreaDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.area.dao;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/12/2.
 */
public interface BaseInpatientAreaDao extends JpaRepository<BaseInpatientAreaDO, String>, JpaSpecificationExecutor<BaseInpatientAreaDO> {
}

business/base-service/src/main/java/com/yihu/jw/area/dao/BaseInpatientAreaDoctorDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.area.dao;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDoctorDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
/**
 * Created by yeshijie on 2022/12/2.
 */
public interface BaseInpatientAreaDoctorDao extends JpaRepository<BaseInpatientAreaDoctorDO, String>,
        JpaSpecificationExecutor<BaseInpatientAreaDoctorDO> {
    @Query("from BaseInpatientAreaDoctorDO where doctorCode = ?1 and inpatientAreaId = ?2")
    BaseInpatientAreaDoctorDO findByDoctorAndInpatientAreaId(String doctorCode,String inpatientAreaId);
    @Query("from BaseInpatientAreaDoctorDO where doctorCode = ?1 and del = ?2")
    List<BaseInpatientAreaDoctorDO> findListByDoctor(String doctorCode,Integer del);
}

business/base-service/src/main/java/com/yihu/jw/area/service/BaseInpatientAreaService.java

@@ -0,0 +1,84 @@
package com.yihu.jw.area.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.area.dao.BaseInpatientAreaDao;
import com.yihu.jw.area.dao.BaseInpatientAreaDoctorDao;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDO;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by yeshijie on 2022/12/2.
 */
@Service
public class BaseInpatientAreaService  extends BaseJpaService<BaseInpatientAreaDO, BaseInpatientAreaDao> {
    @Autowired
    private BaseInpatientAreaDao inpatientAreaDao;
    @Autowired
    private BaseDoctorRoleDao doctorRoleDao;
    @Autowired
    private BaseInpatientAreaDoctorDao inpatientAreaDoctorDao;
    @Transactional(rollbackFor = Exception.class)
    public void updDel(String id,Integer del){
        BaseInpatientAreaDoctorDO areaDoctorDO = inpatientAreaDoctorDao.findById(id).orElse(null);
        if(areaDoctorDO!=null){
            areaDoctorDO.setDel(del);
            inpatientAreaDoctorDao.save(areaDoctorDO);
            doctorRoleDao.updDel(areaDoctorDO.getDoctorCode(),CommonContant.DR_INPATIENTAREA,del);
        }
    }
    @Transactional(rollbackFor = Exception.class)
    public void delAreaDoctor(String id){
        BaseInpatientAreaDoctorDO areaDoctorDO = inpatientAreaDoctorDao.findById(id).orElse(null);
        if(areaDoctorDO!=null){
            String doctor = areaDoctorDO.getDoctorCode();
            List<BaseInpatientAreaDoctorDO> areaDoctorDOS = inpatientAreaDoctorDao.findListByDoctor(doctor,1);
            if(areaDoctorDOS.size()<=1){
                //删除角色
                doctorRoleDao.delRole(doctor, CommonContant.DR_INPATIENTAREA);
            }
            inpatientAreaDoctorDao.deleteById(id);
        }
    }
    @Transactional(rollbackFor = Exception.class)
    public BaseInpatientAreaDoctorDO addAreaDoctor(JSONObject json,String roleCode){
        String inpatientAreaId = json.getString("inpatientAreaId");
        String doctorCode = json.getString("doctorCode");
        BaseInpatientAreaDoctorDO areaDoctorDO = inpatientAreaDoctorDao.findByDoctorAndInpatientAreaId(doctorCode,inpatientAreaId);
        if(areaDoctorDO==null){
            areaDoctorDO = new BaseInpatientAreaDoctorDO();
            areaDoctorDO.setDoctorCode(doctorCode);
            areaDoctorDO.setInpatientAreaId(inpatientAreaId);
        }
        areaDoctorDO.setDel(1);
        inpatientAreaDoctorDao.save(areaDoctorDO);
        //添加角色
        BaseDoctorRoleDO roleDO = doctorRoleDao.findByDoctorCodeAndRoleCode(doctorCode,roleCode);
        if(roleDO==null){
            roleDO = new BaseDoctorRoleDO();
            roleDO.setDel(1);
            roleDO.setRoleCode(roleCode);
            roleDO.setDoctorCode(doctorCode);
        }else {
            roleDO.setDel(1);
        }
        doctorRoleDao.save(roleDO);
        return areaDoctorDO;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/contant/CommonContant.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.contant;
package com.yihu.jw.contant;
/**
 * 常量
@@ -16,4 +16,14 @@ public class CommonContant {
    public static final String DEFAULT_PARENTNAME = "无";
    //是否必选0-表示非必选，1-表示必选
    public static final String IS_MUST = "1";
    /**
     * DR 开头表示医生角色
     */
    /**
     * 住院病区审核员
     */
    public static final String DR_INPATIENTAREA = "inpatientArea";
}

business/base-service/src/main/java/com/yihu/jw/contant/DictContant.java

@@ -0,0 +1,18 @@
package com.yihu.jw.contant;
/**
 * Created by yeshijie on 2022/12/5.
 */
public class DictContant {
    /**
     * 住院登记状态
     */
    public static final String INPATIENTREGIST_STATUS = "inpatientRegist_status";
    /**
     * 住院性质
     */
    public static final String INPATIENT_NATURE = "inpatient_nature";
}

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorMenuDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.doctor.dao;
import com.yihu.jw.entity.base.doctor.BaseDoctorMenuDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/12/2.
 */
public interface BaseDoctorMenuDao extends JpaRepository<BaseDoctorMenuDO, String>, JpaSpecificationExecutor<BaseDoctorMenuDO> {
}

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorRoleDao.java

@@ -1,11 +1,10 @@
package com.yihu.jw.doctor.dao;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleInfoDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Set;
@@ -25,12 +24,26 @@ import java.util.Set;
 */
public interface BaseDoctorRoleDao extends JpaRepository<BaseDoctorRoleDO, Integer>, JpaSpecificationExecutor<BaseDoctorRoleDO>  {
    @Query("from BaseDoctorRoleDO where roleCode = ?1 and del=1")
    List<BaseDoctorRoleDO> findByRoleCode(String roleCode);
    @Query("select id from BaseDoctorRoleDO where doctorCode = ?1")
    @Query("select id from BaseDoctorRoleDO where doctorCode = ?1 and del=1")
    Set<Object> findIdListByDoctorCode(String doctorCode);
    @Query("from BaseDoctorRoleDO where doctorCode = ?1 and del=1")
    List<BaseDoctorRoleDO> findByDoctorCode(String doctorCode);
    @Query("from BaseDoctorRoleDO where doctorCode = ?1 and roleCode = ?2")
    BaseDoctorRoleDO findByDoctorCodeAndroleCode(String doctorCode,String roleCode);
    @Query("from BaseDoctorRoleDO where doctorCode = ?1 and roleCode = ?2 and del=1")
    BaseDoctorRoleDO findByDoctorCodeAndRoleCode(String doctorCode,String roleCode);
    @Query("from BaseDoctorRoleDO where doctorCode = ?1 and roleCode = ?2 and del=?3")
    BaseDoctorRoleDO findByDoctorCodeAndRoleCodeAndDel(String doctorCode,String roleCode,Integer del);
    @Modifying
    @Query("update BaseDoctorRoleDO set del=?3 where doctorCode = ?1 and roleCode = ?2")
    int updDel(String doctorCode,String roleCode,Integer del);
    @Modifying
    @Query("delete from BaseDoctorRoleDO where doctorCode = ?1 and roleCode = ?2")
    int delRole(String doctorCode,String roleCode);
}

business/base-service/src/main/java/com/yihu/jw/doctor/dao/BaseDoctorRoleMenuDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.doctor.dao;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleMenuDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/12/2.
 */
public interface BaseDoctorRoleMenuDao extends JpaRepository<BaseDoctorRoleMenuDO, String>, JpaSpecificationExecutor<BaseDoctorRoleMenuDO> {
}

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorRoleService.java

@@ -0,0 +1,91 @@
package com.yihu.jw.doctor.service;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.*;
/**
 * 
 * 医生与业务模块角色关联信息服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年10月25日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseDoctorRoleService extends BaseJpaService<BaseDoctorRoleDO, BaseDoctorRoleDao> {
    @Autowired
    private BaseDoctorRoleDao baseDoctorRoleDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public Envelop page (String roleCode,String name,String idcard,int page,int size) {
        String sql = "SELECT r.role_code roleCode,d.id doctorCode,d.name,d.idcard,d.mobile  " ;
        String countSql = " select count(d.id) ";
        String from = " from base_doctor_role r,base_doctor d";
        String filters = " where r.role_code = '"+roleCode+"' and r.doctor_code = d.id";
        String limit = " limit "+(page-1)+","+size;
        if("inpatientArea".equals(roleCode)){
            sql += ",aa.id,cast(aa.del as UNSIGNED) del,aa.name inpatientAreaName";
            from += ",(SELECT a.name,ad.* from base_inpatient_area a,base_inpatient_area_doctor ad " +
                    "WHERE a.id=ad.inpatient_area_id and a.del=1) aa";
            filters += " and r.doctor_code = aa.doctor_code";
        }else {
            sql += ",r.id,cast(r.del as UNSIGNED) del";
        }
        if(StringUtils.isNotBlank(idcard)){
            filters += " and d.idcard like '%"+idcard+"%'";
        }
        if(StringUtils.isNotBlank(name)){
            filters += " and d.name like '%"+name+"%'";
        }
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+from+filters+limit);
        Long count = jdbcTemplate.queryForObject(countSql+from+filters+limit,Long.class);
        return PageEnvelop.getSuccessListWithPage("获取成功",list, page, size, count);
    }
    /**
     * 根据医生标识获取医生相关联的角色Id列表
     *
     * @param doctorCode
     * @return
     */
    public Set<Object> findRoleIdList(String doctorCode) {
        Set<Object> result = new HashSet<>();
        if (StringUtils.isEmpty(doctorCode)) {
            return result;
        }
        return baseDoctorRoleDao.findIdListByDoctorCode(doctorCode);
    }
    /**
     * 根据医生标识获取医生相关联的角色Id列表
     *
     * @param doctorCode
     * @return
     */
    public List<BaseDoctorRoleDO> queryDoctorRoleList(String doctorCode) {
        List<BaseDoctorRoleDO> result = new ArrayList<>();
        if (StringUtils.isEmpty(doctorCode)) {
            return result;
        }
        return baseDoctorRoleDao.findByDoctorCode(doctorCode);
    }
}

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

@@ -12,7 +12,6 @@ import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
@@ -25,7 +24,6 @@ import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.order.BusinessOrderRefundDO;
import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
@@ -49,15 +47,10 @@ import com.yihu.jw.order.pay.ylz.YlzPayService;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.restmodel.hospital.archive.ArchiveVO;
import com.yihu.jw.restmodel.hospital.prescription.*;
import com.yihu.jw.sms.util.ykyy.util.HttpClient;
import com.yihu.jw.util.common.PwdUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.idcard.IdCardUtil;
import com.yihu.jw.utils.encode.*;
import com.ylzinfo.ehc.common.utils.DateUtils;
import com.ylzinfo.onepay.sdk.domain.ResponseParams;
import com.ylzinfo.onepay.sdk.domain.ext.RefundResult;
import net.sf.json.JSON;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
@@ -65,12 +58,7 @@ import net.sf.json.xml.XMLSerializer;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.bouncycastle.crypto.digests.SM3Digest;
import org.bouncycastle.crypto.macs.HMac;
import org.bouncycastle.crypto.params.KeyParameter;
import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -78,14 +66,11 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import sun.misc.BASE64Encoder;
import javax.transaction.Transactional;
import java.io.*;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Base64;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -3642,7 +3627,7 @@ public class EntranceService {
                                        baseDoctorHospitalDO.setDel("1");
                                        baseDoctorHospitalDao.save(baseDoctorHospitalDO);
                                    }
                                    BaseDoctorRoleDO roleList = baseDoctorRoleDao.findByDoctorCodeAndroleCode(baseDoctorDO.getId(), "specialist");
                                    BaseDoctorRoleDO roleList = baseDoctorRoleDao.findByDoctorCodeAndRoleCode(baseDoctorDO.getId(), "specialist");
                                    if (roleList == null) {
                                        roleList = new BaseDoctorRoleDO();
                                        roleList.setDoctorCode(baseDoctorDO.getId());

business/base-service/src/main/java/com/yihu/jw/inpatient/dao/BaseInpatientRegistrationDao.java

@@ -0,0 +1,14 @@
package com.yihu.jw.inpatient.dao;
import com.yihu.jw.entity.base.inpatient.BaseInpatientRegistrationDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
/**
 * Created by yeshijie on 2022/12/5.
 */
public interface BaseInpatientRegistrationDao extends JpaRepository<BaseInpatientRegistrationDO, String>,
        JpaSpecificationExecutor<BaseInpatientRegistrationDO> {
}

business/base-service/src/main/java/com/yihu/jw/inpatient/service/BaseInpatientRegistrationService.java

@@ -0,0 +1,125 @@
package com.yihu.jw.inpatient.service;
import com.yihu.jw.contant.DictContant;
import com.yihu.jw.entity.base.inpatient.BaseInpatientRegistrationDO;
import com.yihu.jw.hospital.dict.service.WlyyHospitalSysDictService;
import com.yihu.jw.inpatient.dao.BaseInpatientRegistrationDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.date.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
 * Created by yeshijie on 2022/12/5.
 */
@Service
public class BaseInpatientRegistrationService extends BaseJpaService {
    @Autowired
    private BaseInpatientRegistrationDao inpatientRegistrationDao;
    @Autowired
    private WlyyHospitalSysDictService hospitalSysDictService;
    /**
     * 获取住院登记list
     * @param patient
     * @return
     */
    public List<BaseInpatientRegistrationDO> list(String patient){
        String sql = "SELECT * from base_inpatient_registration" +
                " where patient='"+patient+"' and status=0 order by create_time desc ";
        List<BaseInpatientRegistrationDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(BaseInpatientRegistrationDO.class));
        for (BaseInpatientRegistrationDO registrationDO:list){
            registrationDO.setStatusName(hospitalSysDictService.getDictValue(DictContant.INPATIENTREGIST_STATUS,registrationDO.getStatus()));
        }
        return list;
    }
    /**
     * 入院登记
     * @return
     */
    public BaseInpatientRegistrationDO registration(String id,String inpatientTime,String bedNo,String attendingDoctor
            ,String attendingDoctorName,String inpatientAreaId,String inpatientAreaName){
        BaseInpatientRegistrationDO registrationDO = inpatientRegistrationDao.findById(id).orElse(null);
        if(registrationDO!=null&&("1".equals(registrationDO.getStatus())||"2".equals(registrationDO.getStatus()))){
            registrationDO.setInpatientTime(DateUtil.strToDate(inpatientTime));
            registrationDO.setBedNo(bedNo);
            registrationDO.setStatus("2");
            registrationDO.setAttendingDoctor(attendingDoctor);
            registrationDO.setAttendingDoctorName(attendingDoctorName);
            registrationDO.setInpatientAreaId(inpatientAreaId);
            registrationDO.setInpatientAreaName(inpatientAreaName);
            inpatientRegistrationDao.save(registrationDO);
        }
        return registrationDO;
    }
    /**
     * 提交住院登记
     * @param id
     * @return
     */
    public BaseInpatientRegistrationDO submitRegist(String id,String mobile,String address,String contacts,String contactsMobile){
        BaseInpatientRegistrationDO registrationDO = inpatientRegistrationDao.findById(id).orElse(null);
        if(registrationDO!=null&&"0".equals(registrationDO.getStatus())){
            registrationDO.setUpdateTime(new Date());
            registrationDO.setStatus("1");
            registrationDO.setMobile(mobile);
            registrationDO.setAddress(address);
            registrationDO.setContacts(contacts);
            registrationDO.setContactsMobile(contactsMobile);
            registrationDO = inpatientRegistrationDao.save(registrationDO);
        }
        return registrationDO;
    }
    public BaseInpatientRegistrationDO confirmAdmission(String id){
        BaseInpatientRegistrationDO registrationDO = inpatientRegistrationDao.findById(id).orElse(null);
        if(registrationDO!=null&&"2".equals(registrationDO.getStatus())){
            registrationDO.setStatus("3");
            registrationDO = inpatientRegistrationDao.save(registrationDO);
        }
        return registrationDO;
    }
    public BaseInpatientRegistrationDO findDetail(String id){
        BaseInpatientRegistrationDO registrationDO = inpatientRegistrationDao.findById(id).orElse(null);
        if(registrationDO!=null){
            registrationDO.setInpatientTypeName(hospitalSysDictService.getDictValue(DictContant.INPATIENT_NATURE,registrationDO.getInpatientType()));
            registrationDO.setStatusName(hospitalSysDictService.getDictValue(DictContant.INPATIENTREGIST_STATUS,registrationDO.getStatus()));
        }
        return registrationDO;
    }
    public PageEnvelop page(String patient,String name,Integer page,Integer size){
        String sql = "select * from base_inpatient_registration where 1=1";
        if(StringUtils.isNotBlank(patient)){
            sql += " and patient = '"+patient+"'";
        }else {
            sql += " and status>0";
        }
        if(StringUtils.isNotBlank(name)){
            sql += " and (name like '%"+name+"%' or idcard like '%"+name+"%')";
        }
        String countSql = sql.replace("select *","select count(*)");
        String limit = " order by create_time desc limit "+(page-1)*size+","+size;
        List<BaseInpatientRegistrationDO> list = jdbcTemplate.query(sql+limit,new BeanPropertyRowMapper<>(BaseInpatientRegistrationDO.class));
        for (BaseInpatientRegistrationDO registrationDO:list){
            registrationDO.setStatusName(hospitalSysDictService.getDictValue(DictContant.INPATIENTREGIST_STATUS,registrationDO.getStatus()));
        }
        Long count = jdbcTemplate.queryForObject(countSql,Long.class);
        return PageEnvelop.getSuccessListWithPage("获取成功",list,page,size,count);
    };
}

business/base-service/src/main/java/com/yihu/jw/nurse/service/BaseNursingCardService.java

@@ -50,7 +50,7 @@ public class BaseNursingCardService extends BaseJpaService<BaseNursingCardDO, Ba
     * @param status
     * @param doctor
     */
    public void doctorCheck(String id,Integer status,String doctor){
    public void doctorCheck(String id,Integer status,String doctor,String checkReason){
        BaseNursingCardDO cardDO = nursingCardDao.getOne(id);
        cardDO.setStatus(status);
        if(status==1){
@@ -60,6 +60,7 @@ public class BaseNursingCardService extends BaseJpaService<BaseNursingCardDO, Ba
        cardDO.setDoctor(doctor);
        cardDO.setDoctorName(doctorDO.getName());
        cardDO.setCheckTime(new Date());
        cardDO.setCheckReason(checkReason);
        nursingCardDao.save(cardDO);
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseInpatientAreaDO.java

@@ -0,0 +1,107 @@
package com.yihu.jw.entity.base.area;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 住院病区
 * Created by yeshijie on 2022/12/2.
 */
@Entity
@Table(name = "base_inpatient_area")
public class BaseInpatientAreaDO extends UuidIdentityEntityWithCreateTime {
    private String name;//住院病区名称
    private Integer olderNum;//单患者同时允许陪护数（75岁以上）
    private Integer yangNum;//单患者同时允许陪护数（75岁以下）
    private Integer dayMaxNum;//每日允许最大陪护数
    private String termOfValidity;//陪护证有效期
    private String afternoonTime;//每日可陪护时长-下午（12点-20点
    private String morningTime;//每日可陪护时长-早上（0点-12点）
    private String nightTime;//每日可陪护时长-晚上（20点-24点）
    private Integer del;//生效标志 1生效0失效
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "older_num")
    public Integer getOlderNum() {
        return olderNum;
    }
    public void setOlderNum(Integer olderNum) {
        this.olderNum = olderNum;
    }
    @Column(name = "yang_num")
    public Integer getYangNum() {
        return yangNum;
    }
    public void setYangNum(Integer yangNum) {
        this.yangNum = yangNum;
    }
    @Column(name = "day_max_num")
    public Integer getDayMaxNum() {
        return dayMaxNum;
    }
    public void setDayMaxNum(Integer dayMaxNum) {
        this.dayMaxNum = dayMaxNum;
    }
    @Column(name = "term_of_validity")
    public String getTermOfValidity() {
        return termOfValidity;
    }
    public void setTermOfValidity(String termOfValidity) {
        this.termOfValidity = termOfValidity;
    }
    @Column(name = "afternoon_time")
    public String getAfternoonTime() {
        return afternoonTime;
    }
    public void setAfternoonTime(String afternoonTime) {
        this.afternoonTime = afternoonTime;
    }
    @Column(name = "morning_time")
    public String getMorningTime() {
        return morningTime;
    }
    public void setMorningTime(String morningTime) {
        this.morningTime = morningTime;
    }
    @Column(name = "night_time")
    public String getNightTime() {
        return nightTime;
    }
    public void setNightTime(String nightTime) {
        this.nightTime = nightTime;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseInpatientAreaDoctorDO.java

@@ -0,0 +1,47 @@
package com.yihu.jw.entity.base.area;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 住院病区审核医生表
 * Created by yeshijie on 2022/12/2.
 */
@Entity
@Table(name = "base_inpatient_area_doctor")
public class BaseInpatientAreaDoctorDO extends UuidIdentityEntity {
    private String doctorCode;//医生id
    private String inpatientAreaId;//住院病区id
    private Integer del;//1生效 0失效
    @Column(name = "doctor_code")
    public String getDoctorCode() {
        return doctorCode;
    }
    public void setDoctorCode(String doctorCode) {
        this.doctorCode = doctorCode;
    }
    @Column(name = "inpatient_area_id")
    public String getInpatientAreaId() {
        return inpatientAreaId;
    }
    public void setInpatientAreaId(String inpatientAreaId) {
        this.inpatientAreaId = inpatientAreaId;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorMenuDO.java

@@ -0,0 +1,67 @@
package com.yihu.jw.entity.base.doctor;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 医生app菜单表
 * Created by yeshijie on 2022/12/2.
 */
@Entity
@Table(name = "base_doctor_menu")
public class BaseDoctorMenuDO extends UuidIdentityEntity {
    private String pid;//父菜单id
    private String name;//菜单名称
    private String code;//菜单编码
    private String sortNo;//排序
    private String img;//菜单图标
    @Column(name = "pid")
    public String getPid() {
        return pid;
    }
    public void setPid(String pid) {
        this.pid = pid;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "sort_no")
    public String getSortNo() {
        return sortNo;
    }
    public void setSortNo(String sortNo) {
        this.sortNo = sortNo;
    }
    @Column(name = "img")
    public String getImg() {
        return img;
    }
    public void setImg(String img) {
        this.img = img;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorRoleDO.java

@@ -28,6 +28,11 @@ public class BaseDoctorRoleDO extends IntegerIdentityEntity {
	 */
	private String roleCode;
    /**
     * 是否生效 1生效 0失效(默认1)
     */
    private Integer del;
	@Column(name = "doctor_code")
    public String getDoctorCode() {
@@ -45,6 +50,12 @@ public class BaseDoctorRoleDO extends IntegerIdentityEntity {
        this.roleCode = roleCode;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorRoleMenuDO.java

@@ -0,0 +1,37 @@
package com.yihu.jw.entity.base.doctor;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 医生角色菜单表
 * Created by yeshijie on 2022/12/2.
 */
@Entity
@Table(name = "base_doctor_role_menu")
public class BaseDoctorRoleMenuDO extends UuidIdentityEntity {
    private String roleCode;//角色编码',
    private String menuId;//菜单id',
    @Column(name = "role_code")
    public String getRoleCode() {
        return roleCode;
    }
    public void setRoleCode(String roleCode) {
        this.roleCode = roleCode;
    }
    @Column(name = "menu_id")
    public String getMenuId() {
        return menuId;
    }
    public void setMenuId(String menuId) {
        this.menuId = menuId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/inpatient/BaseInpatientRegistrationDO.java

@@ -0,0 +1,256 @@
package com.yihu.jw.entity.base.inpatient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * 住院登记
 * Created by yeshijie on 2022/12/5.
 */
@Entity
@Table(name = "base_inpatient_registration")
public class BaseInpatientRegistrationDO extends UuidIdentityEntityWithCreateTime {
    private String patient;
    private String name;//居民姓名/就诊人
    private String billingDate;//开单日期
    private String outpatientNo;//门诊号码
    private String inpatientType;//住院性质（1医保） 字典编码inpatient_nature
    private String inpatientTypeName;
    private String idcard;//身份证
    private String sex;//性别
    private String mobile;//患者手机号
    private String address;//现居地址
    private String contacts;//联系人
    private String contactsMobile;//联系人电话
    private String doctor;
    private String doctorName;//开单医生
    private String status;//状态（0未提交/立即登记，1已提交，2已登记） 字典编码inpatientRegist_status
    private String statusName;//状态名称 inpatientRegist_status
    private Date inpatientTime;//入院时间
    private String bedNo;//床位号
    private String attendingDoctor;
    private String attendingDoctorName;//主治医师
    private String inpatientAreaId;//病区id
    private String inpatientAreaName;//病区名称
    private Date updateTime;//提交时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "billing_date")
    public String getBillingDate() {
        return billingDate;
    }
    public void setBillingDate(String billingDate) {
        this.billingDate = billingDate;
    }
    @Column(name = "outpatient_no")
    public String getOutpatientNo() {
        return outpatientNo;
    }
    public void setOutpatientNo(String outpatientNo) {
        this.outpatientNo = outpatientNo;
    }
    @Column(name = "inpatient_type")
    public String getInpatientType() {
        return inpatientType;
    }
    public void setInpatientType(String inpatientType) {
        this.inpatientType = inpatientType;
    }
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    @Column(name = "sex")
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "contacts")
    public String getContacts() {
        return contacts;
    }
    public void setContacts(String contacts) {
        this.contacts = contacts;
    }
    @Column(name = "contacts_mobile")
    public String getContactsMobile() {
        return contactsMobile;
    }
    public void setContactsMobile(String contactsMobile) {
        this.contactsMobile = contactsMobile;
    }
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(name = "inpatient_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getInpatientTime() {
        return inpatientTime;
    }
    public void setInpatientTime(Date inpatientTime) {
        this.inpatientTime = inpatientTime;
    }
    @Column(name = "bed_no")
    public String getBedNo() {
        return bedNo;
    }
    public void setBedNo(String bedNo) {
        this.bedNo = bedNo;
    }
    @Column(name = "attending_doctor")
    public String getAttendingDoctor() {
        return attendingDoctor;
    }
    public void setAttendingDoctor(String attendingDoctor) {
        this.attendingDoctor = attendingDoctor;
    }
    @Column(name = "attending_doctor_name")
    public String getAttendingDoctorName() {
        return attendingDoctorName;
    }
    public void setAttendingDoctorName(String attendingDoctorName) {
        this.attendingDoctorName = attendingDoctorName;
    }
    @Column(name = "inpatient_area_id")
    public String getInpatientAreaId() {
        return inpatientAreaId;
    }
    public void setInpatientAreaId(String inpatientAreaId) {
        this.inpatientAreaId = inpatientAreaId;
    }
    @Column(name = "inpatient_area_name")
    public String getInpatientAreaName() {
        return inpatientAreaName;
    }
    public void setInpatientAreaName(String inpatientAreaName) {
        this.inpatientAreaName = inpatientAreaName;
    }
    @Transient
    public String getInpatientTypeName() {
        return inpatientTypeName;
    }
    public void setInpatientTypeName(String inpatientTypeName) {
        this.inpatientTypeName = inpatientTypeName;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/nurse/BaseNursingCardDO.java

@@ -17,7 +17,7 @@ import java.util.Date;
@Table(name = "base_nursing_card")
public class BaseNursingCardDO extends UuidIdentityEntityWithCreateTime {
    private Integer type;//陪护类型 1门诊 2住院
    private Integer type;//陪护类型 2住院
    private Integer status;//状态 -2已失效 -1未通过 0审核中 1生效中
    private String statusName;//状态 -2已失效 -1未通过 0审核中 1生效中
    private Date endTime;//到期时间
@@ -31,11 +31,17 @@ public class BaseNursingCardDO extends UuidIdentityEntityWithCreateTime {
    private String nurseIdcard;//陪护人身份证
    private Integer nurseAge;//陪护人年龄
    private Integer nurseSex;//陪护人性别
    private Integer familyRelation;//家人关系 关系和原有系统的一致
    private String nurseReason;//陪护说明
    private String nucleicReport;//核酸报告
    private String doctor;//审核医生
    private String doctorName;
    private String checkReason;//审核说明/拒绝原因
    private Date checkTime;//审核时间
    private Integer nursingNum;//已存在陪护人数
    /**
     * 状态：
     */
@@ -245,4 +251,40 @@ public class BaseNursingCardDO extends UuidIdentityEntityWithCreateTime {
    public void setCheckTime(Date checkTime) {
        this.checkTime = checkTime;
    }
    @Column(name = "nurse_reason")
    public String getNurseReason() {
        return nurseReason;
    }
    public void setNurseReason(String nurseReason) {
        this.nurseReason = nurseReason;
    }
    @Column(name = "family_relation")
    public Integer getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(Integer familyRelation) {
        this.familyRelation = familyRelation;
    }
    @Column(name = "check_reason")
    public String getCheckReason() {
        return checkReason;
    }
    public void setCheckReason(String checkReason) {
        this.checkReason = checkReason;
    }
    @Transient
    public Integer getNursingNum() {
        return nursingNum;
    }
    public void setNursingNum(Integer nursingNum) {
        this.nursingNum = nursingNum;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/doctor/BaseDoctorRoleVO.java

@@ -32,6 +32,10 @@ public class BaseDoctorRoleVO extends IntegerIdentityVO{
	@ApiModelProperty(value = "医生角色id", example = "模块1")
    private String roleCode;
    /**
     * 是否生效 1生效 0失效(默认1)
     */
    private Integer del;
    public String getDoctorCode() {
        return doctorCode;
@@ -47,5 +51,11 @@ public class BaseDoctorRoleVO extends IntegerIdentityVO{
        this.roleCode = roleCode;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCityEndpoint.java

@@ -38,7 +38,7 @@ public class BaseCityEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseCityService baseCityService;
@PostMapping(value = BaseRequestMapping.BaseCity.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseCity.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseCityVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseCityVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseCity.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseCity.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseCityVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseCommitteeEndpoint.java

@@ -38,7 +38,7 @@ public class BaseCommitteeEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseCommitteeService baseCommitteeService;
@PostMapping(value = BaseRequestMapping.BaseCommittee.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseCommittee.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseCommitteeVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseCommitteeVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseCommittee.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseCommittee.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseCommitteeVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseProvinceEndpoint.java

@@ -38,7 +38,7 @@ public class BaseProvinceEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseProvinceService baseProvinceService;
@PostMapping(value = BaseRequestMapping.BaseProvince.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseProvince.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseProvinceVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseProvinceVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseProvince.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseProvince.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseProvinceVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseStreetEndpoint.java

@@ -38,7 +38,7 @@ public class BaseStreetEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseStreetService baseStreetService;
@PostMapping(value = BaseRequestMapping.BaseStreet.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseStreet.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseStreetVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseStreetVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseStreet.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseStreet.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseStreetVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseTownEndpoint.java

@@ -38,7 +38,7 @@ public class BaseTownEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseTownService baseTownService;
@PostMapping(value = BaseRequestMapping.BaseTown.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseTown.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseTownVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseTownVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseTown.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseTown.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseTownVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/customize/UserHideModuleInterfaceEndpoint.java

@@ -30,7 +30,7 @@ public class UserHideModuleInterfaceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private UserHideModuleInterfaceService userHideModuleFunctionService;
    @PostMapping(value = BaseRequestMapping.UserHideModuleFunction.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.UserHideModuleFunction.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<UserHideModuleInterfaceVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class UserHideModuleInterfaceEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.UserHideModuleFunction.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.UserHideModuleFunction.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictDiseaseEndpoint.java

@@ -38,7 +38,7 @@ public class DictDiseaseEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictDiseaseService dictDiseaseService;
@PostMapping(value = BaseRequestMapping.DictDisease.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictDisease.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictDiseaseVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictDiseaseVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictDisease.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictDisease.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictDiseaseVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictDoctorDutyEndpoint.java

@@ -38,7 +38,7 @@ public class DictDoctorDutyEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictDoctorDutyService dictDoctorDutyService;
@PostMapping(value = BaseRequestMapping.DictDoctorDuty.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictDoctorDuty.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictDoctorDutyVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictDoctorDutyVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictDoctorDuty.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictDoctorDuty.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictDoctorDutyVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictHealthProblemEndpoint.java

@@ -38,7 +38,7 @@ public class DictHealthProblemEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictHealthProblemService dictHealthProblemService;
@PostMapping(value = BaseRequestMapping.DictHealthProblem.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictHealthProblem.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictHealthProblemVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictHealthProblemVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictHealthProblem.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictHealthProblem.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictHealthProblemVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictHospitalDeptEndpoint.java

@@ -38,7 +38,7 @@ public class DictHospitalDeptEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DictHospitalDeptService dictHospitalDeptService;
    @PostMapping(value = BaseRequestMapping.DictHospitalDept.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictHospitalDept.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<DictHospitalDeptVO> create(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public class DictHospitalDeptEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictHospitalDept.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictHospitalDept.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictHospitalDeptVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictJobTitleEndpoint.java

@@ -41,7 +41,7 @@ public class DictJobTitleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DictDoctorDutyService dictDoctorDutyService;
    @PostMapping(value = BaseRequestMapping.DictJobTitle.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictJobTitle.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<DictJobTitleVO> create(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -60,7 +60,7 @@ public class DictJobTitleEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictJobTitle.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictJobTitle.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictJobTitleVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineDistributeOrgEndpoint.java

@@ -38,7 +38,7 @@ public class DictMedicineDistributeOrgEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
@PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineDistributeOrgVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictMedicineDistributeOrgVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineDistributeOrgVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineDosageFormEndpoint.java

@@ -38,7 +38,7 @@ public class DictMedicineDosageFormEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineDosageFormService dictMedicineDosageFormService;
@PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineDosageFormVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictMedicineDosageFormVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictMedicineDosageForm.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineDosageFormVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineEndpoint.java

@@ -38,7 +38,7 @@ public class DictMedicineEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineService dictMedicineService;
@PostMapping(value = BaseRequestMapping.DictMedicine.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictMedicine.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictMedicineVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicine.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictMedicine.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineSubjectEndpoint.java

@@ -38,7 +38,7 @@ public class DictMedicineSubjectEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineSubjectService dictMedicineSubjectService;
@PostMapping(value = BaseRequestMapping.DictMedicineSubject.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.DictMedicineSubject.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineSubjectVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<DictMedicineSubjectVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineSubject.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.DictMedicineSubject.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineSubjectVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseDoctorHospitalEndpoint.java

@@ -37,7 +37,7 @@ public class BaseDoctorHospitalEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseDoctorHospitalService baseDoctorHospitalService;
    @PostMapping(value = BaseRequestMapping.BaseDoctorHospital.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseDoctorHospital.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<BaseDoctorHospitalVO> create(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -56,7 +56,7 @@ public class BaseDoctorHospitalEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorHospital.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseDoctorHospital.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseDoctorHospitalVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseDoctorRoleEndpoint.java

@@ -1,21 +1,22 @@
package com.yihu.jw.base.endpoint.doctor;
import com.yihu.jw.base.service.doctor.BaseDoctorRoleService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.area.service.BaseInpatientAreaService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.doctor.service.BaseDoctorRoleService;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorRoleVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
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.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
@@ -34,70 +35,120 @@ import java.util.List;
@Api(value = "医生与业务模块角色关联信息管理", description = "医生与业务模块角色关联信息管理服务接口", tags = {"wlyy基础服务 - 医生与业务模块角色关联信息管理服务接口"})
public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseDoctorRoleService baseDoctorRoleService;
    @Autowired
    private BaseDoctorRoleService baseDoctorRoleService;
    @Autowired
    private BaseDoctorRoleDao doctorRoleDao;
    @Autowired
    private BaseInpatientAreaService inpatientAreaService;
@PostMapping(value = BaseRequestMapping.BaseDoctorRole.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseDoctorRoleVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
    baseDoctorRole = baseDoctorRoleService.save(baseDoctorRole);
    return success(baseDoctorRole, BaseDoctorRoleVO.class);
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestBody String jsonData){
        try {
            JSONObject json = JSON.parseObject(jsonData);
            String roleCode = json.getString("roleCode");
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                //住院病区审核员处理
                return ObjEnvelop.getSuccess("保存成功", inpatientAreaService.addAreaDoctor(json,roleCode));
            }else{
                BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
                baseDoctorRole.setDel(1);
                baseDoctorRole = baseDoctorRoleService.save(baseDoctorRole);
                return success(baseDoctorRole, BaseDoctorRoleVO.class);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @PostMapping(value = "updDel")
    @ApiOperation(value = "生效/失效")
    public Envelop updStatus(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "del", value = "1生效，0失效", required = true)
            @RequestParam(value = "del") Integer del,
            @ApiParam(name = "roleCode", value = "角色编码", required = true)
            @RequestParam(value = "roleCode") String roleCode) {
        try {
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                inpatientAreaService.updDel(id,del);
            }else {
                BaseDoctorRoleDO roleDO = doctorRoleDao.findById(Integer.parseInt(id)).orElse(null);
                if(roleDO!=null){
                    roleDO.setDel(del);
                    doctorRoleDao.save(roleDO);
                }
            }
            return Envelop.getSuccess("修改成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("修改失败");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    baseDoctorRoleService.delete(ids.split(","));
    return success("删除成功");
        @ApiParam(name = "id", value = "id", required = true)
        @RequestParam(value = "id") String id,
        @ApiParam(name = "roleCode", value = "角色编码", required = true)
        @RequestParam(value = "roleCode") String roleCode) {
        try {
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                inpatientAreaService.delAreaDoctor(id);
            }else {
                doctorRoleDao.deleteById(Integer.parseInt(id));
            }
            return success("删除成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("删除失败");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseDoctorRoleVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
        if (null == baseDoctorRole.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
    public Envelop update (
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestBody String jsonData) {
        try {
            //先删除在新增
            JSONObject json = JSON.parseObject(jsonData);
            String roleCode = json.getString("roleCode");
            String id = json.getString("id");
            delete(id,roleCode);
            return create(jsonData);
        }catch (Exception e){
            e.printStackTrace();
        }
        baseDoctorRole = baseDoctorRoleService.save(baseDoctorRole);
        return success(baseDoctorRole, BaseDoctorRoleVO.class);
        }
        @GetMapping(value = BaseRequestMapping.BaseDoctorRole.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<BaseDoctorRoleVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<BaseDoctorRoleDO> baseDoctorRoles = baseDoctorRoleService.search(fields, filters, sorts, page, size);
                int count = (int)baseDoctorRoleService.getCount(filters);
                return success(baseDoctorRoles, count, page, size, BaseDoctorRoleVO.class);
         }
        return Envelop.getError("保存失败");
    }
         @GetMapping(value = BaseRequestMapping.BaseDoctorRole.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<BaseDoctorRoleVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<BaseDoctorRoleDO> baseDoctorRoles = baseDoctorRoleService.search(fields, filters, sorts);
                  return success(baseDoctorRoles, BaseDoctorRoleVO.class);
         }
    @GetMapping(value = BaseRequestMapping.BaseDoctorRole.PAGE)
    @ApiOperation(value = "获取分页")
    public Envelop page (
        @ApiParam(name = "roleCode", value = "角色编码")
        @RequestParam(value = "roleCode", required = true) String roleCode,
        @ApiParam(name = "name", value = "医生姓名")
        @RequestParam(value = "name", required = false) String name,
        @ApiParam(name = "idcard", value = "医生身份证")
        @RequestParam(value = "idcard", required = false) String idcard,
        @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
        @RequestParam(value = "page") int page,
        @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
        @RequestParam(value = "size") int size) {
        try {
            return baseDoctorRoleService.page(roleCode, name, idcard, page, size);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseModuleRoleEndpoint.java

@@ -38,7 +38,7 @@ public class BaseModuleRoleEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseModuleRoleService baseModuleRoleService;
@PostMapping(value = BaseRequestMapping.BaseModuleRole.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseModuleRole.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseModuleRoleVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseModuleRoleVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseModuleRole.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseModuleRole.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseModuleRoleVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java

@@ -30,7 +30,7 @@
//    @Autowired
//    private FunctionService functionService;
//
//    @PostMapping(value = BaseRequestMapping.Function.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.Function.CREATE)
//    @ApiOperation(value = "创建")
//    public ObjEnvelop<FunctionVO> create (
//            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@
//        return success("success");
//    }
//
//    @PostMapping(value = BaseRequestMapping.Function.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.Function.UPDATE)
//    @ApiOperation(value = "更新")
//    public ObjEnvelop<FunctionVO> update (
//            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/login/LoginAppEndpoint.java

@@ -1,5 +1,7 @@
package com.yihu.jw.base.endpoint.login;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.entity.base.login.BaseLoginAppDO;
import com.yihu.jw.entity.base.login.BaseLoginComponentDO;
import com.yihu.jw.login.service.BaseLoginAppService;
@@ -14,6 +16,7 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
@@ -114,16 +117,23 @@ public class LoginAppEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "createLoginCompoent")
    @ApiOperation(value = "新增/修改登录终端")
    public ObjEnvelop createLoginCompoent (
    public Envelop createLoginCompoent (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData){
        try {
            BaseLoginComponentDO loginAppDO = toEntity(jsonData, BaseLoginComponentDO.class);
            return ObjEnvelop.getSuccess("保存成功",loginAppService.createLoginCompoent(loginAppDO));
            List<BaseLoginComponentDO> list = new ArrayList<>();
            JSONArray jsonArray = JSON.parseArray(jsonData);
            for (int i=0;i<jsonArray.size();i++){
                String json = jsonArray.getString(i);
                BaseLoginComponentDO loginAppDO = toEntity(json, BaseLoginComponentDO.class);
                loginAppDO = loginAppService.createLoginCompoent(loginAppDO);
                list.add(loginAppDO);
            }
            return ListEnvelop.getSuccess("保存成功",list);
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return Envelop.getError("保存失败");
    }
    @PostMapping(value = "loginComponentDelete")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/BaseMessageEndpoint.java

@@ -38,7 +38,7 @@ public class BaseMessageEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseMessageService baseMessageService;
@PostMapping(value = BaseRequestMapping.BaseMessage.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseMessage.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseMessageVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseMessageVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseMessage.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseMessage.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseMessageVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/BaseMessageTypeEndpoint.java

@@ -38,7 +38,7 @@ public class BaseMessageTypeEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseMessageTypeService baseMessageTypeService;
@PostMapping(value = BaseRequestMapping.BaseMessageType.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseMessageType.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseMessageTypeVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseMessageTypeVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseMessageType.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseMessageType.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseMessageTypeVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageEndpoint.java

@@ -30,7 +30,7 @@ public class MqMessageEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private MqMessageService mqMessageService;
    @PostMapping(value = BaseRequestMapping.Function.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Function.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<MqMessageVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class MqMessageEndpoint extends EnvelopRestEndpoint {
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.Function.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Function.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<MqMessageVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/MqMessageSubscriberEndpoint.java

@@ -30,7 +30,7 @@ public class MqMessageSubscriberEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private MqMessageSubscriberService mqMessageSubscriberService;
    @PostMapping(value = BaseRequestMapping.Function.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Function.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<MqMessageSubscriberVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class MqMessageSubscriberEndpoint extends EnvelopRestEndpoint {
        return success("success");
    }
    @PostMapping(value = BaseRequestMapping.Function.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Function.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<MqMessageSubscriberVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/message/TestEndpoint.java

@@ -42,7 +42,7 @@
//        return success("success");
//    }
//
//    /*@PostMapping(value = "/es", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    /*@PostMapping(value = "/es")
//    @ApiOperation(value = "创建")
//    public Envelop es (
//            @ApiParam(name = "index", value = "索引", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.module;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.service.module.ModuleService;
import com.yihu.jw.base.util.ErrorCodeUtil;
import com.yihu.jw.entity.base.module.ModuleDO;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/PatientFamilyMemberEndpoint.java

@@ -25,7 +25,7 @@
//    @Autowired
//    private PatientFamilyMemberService patientMemberService;
//
//    @PostMapping(value = BaseRequestMapping.PatientMember.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.PatientMember.CREATE)
//    @ApiOperation(value = "创建")
//    public Envelop createFamilyMember(@ApiParam(name = "patient", value = "用户id", required = true)
//                                      @RequestParam(value = "patient")String patient,
@@ -37,7 +37,7 @@
//        return success("success");
//    }
//
//    @PostMapping(value = BaseRequestMapping.PatientMember.DELETE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.PatientMember.DELETE)
//    @ApiOperation(value = "删除")
//    public Envelop delFamilyMember(@ApiParam(name = "patient", value = "用户id", required = true)
//                                      @RequestParam(value = "patient")String patient,

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/population/BaseYearEndpoint.java

@@ -32,7 +32,7 @@ public class BaseYearEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseYearService baseYearService;
    @PostMapping(value = BaseRequestMapping.BaseYear.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseYear.CREATE)
    @ApiOperation(value = "获取系统当前年份，创建时间列表至1990年")
    public ObjEnvelop<Boolean> create() throws Exception {
        int year = DateUtil.getNowYear();
@@ -49,7 +49,7 @@ public class BaseYearEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseYear.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseYear.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseYearDO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/BaseRoleMenuEndpoint.java

@@ -38,7 +38,7 @@ public class BaseRoleMenuEndpoint extends EnvelopRestEndpoint {
@Autowired
private BaseRoleMenuService baseRoleMenuService;
@PostMapping(value = BaseRequestMapping.BaseRoleMenu.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.BaseRoleMenu.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<BaseRoleMenuVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<BaseRoleMenuVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseRoleMenu.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseRoleMenu.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseRoleMenuVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/MenuEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.role;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.service.role.MenuService;
import com.yihu.jw.base.service.role.RoleMenuService;
import com.yihu.jw.base.util.ErrorCodeUtil;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleAuthorityEndpoint.java

@@ -31,7 +31,7 @@ public class RoleAuthorityEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private RoleAuthorityService roleAuthorityService;
    @PostMapping(value = BaseRequestMapping.RoleAuthority.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.RoleAuthority.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<RoleAuthorityVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -50,7 +50,7 @@ public class RoleAuthorityEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.RoleAuthority.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.RoleAuthority.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@@ -34,7 +34,7 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private RoleService roleService;
    @PostMapping(value = BaseRequestMapping.Module.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Module.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/BaseEmailTemplateConfigEndpoint.java

@@ -24,7 +24,7 @@ public class BaseEmailTemplateConfigEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseEmailTemplateConfigService baseEmailTemplateConfigService;
    @PostMapping(value = "/create", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = "/create")
    @ApiOperation(value = "创建")
    public ObjEnvelop<BaseEmailTemplateConfigVO> create(
            @ApiParam(name = "baseEmailTemplateConfigDO", value = "baseEmailTemplateConfigDO")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasBusinessCardEndpoint.java

@@ -32,7 +32,7 @@ public class SaasBusinessCardEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasBusinessCardService saasBusinessCardService;
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasBusinessCardVO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
@@ -51,7 +51,7 @@ public class SaasBusinessCardEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasDefaultModuleFunctionEndpoint.java

@@ -30,7 +30,7 @@
//    @Autowired
//    private SaasDefaultModuleFunctionService saasDefaultModuleService;
//
//    @PostMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.CREATE)
//    @ApiOperation(value = "创建")
//    public ObjEnvelop<SaasDefaultModuleFunctionVO> create (
//            @ApiParam(name = "json", value = "Json数据", required = true)
@@ -49,7 +49,7 @@
//        return success("删除成功");
//    }
//
//    @PostMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.SaasDefaultModuleFunction.UPDATE)
//    @ApiOperation(value = "更新")
//    public Envelop update (
//            @ApiParam(name = "json", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.service.module.SaasModuleService;
import com.yihu.jw.base.service.saas.BaseEmailTemplateConfigService;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleFunctionEndpoint.java

@@ -30,7 +30,7 @@
//    @Autowired
//    private SaasModuleFunctionService saasModuleFunctionService;
//
//    @PostMapping(value = BaseRequestMapping.SaasModuleFunction.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.SaasModuleFunction.CREATE)
//    @ApiOperation(value = "创建")
//    public ObjEnvelop<SaasModuleFunctionVO> create (
//            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@
//        return success("删除成功");
//    }
//
//    @PostMapping(value = BaseRequestMapping.SaasModuleFunction.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
//    @PostMapping(value = BaseRequestMapping.SaasModuleFunction.UPDATE)
//    @ApiOperation(value = "更新")
//    public Envelop update (
//            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasTypeDictEndpoint.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.service.module.ModuleService;
import com.yihu.jw.base.service.module.SaasTypeModuleService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/score/ScoreEndPoint.java

@@ -30,7 +30,7 @@ public class ScoreEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private ScoreService scoreService;
    @PostMapping(value = BaseRequestMapping.Score.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Score.CREATE)
    @ApiOperation(value = "创建")
    public Envelop addEvaluateScore(@ApiParam(name = "baseEvaluateScoreJson", value = "分数主表json", required = true)
                                    @RequestParam(value = "baseEvaluateScoreJson") String baseEvaluateScoreJson,

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsEndpoint.java

@@ -30,7 +30,7 @@ public class SmsEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SmsService smsService;
    @PostMapping(value = BaseRequestMapping.Sms.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Sms.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SmsVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class SmsEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.Sms.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Sms.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SmsVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsGatewayEndpoint.java

@@ -33,7 +33,7 @@ public class SmsGatewayEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SmsGatewayService smsGatewayService;
    @PostMapping(value = BaseRequestMapping.SmsGateway.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SmsGateway.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SmsGatewayVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -52,7 +52,7 @@ public class SmsGatewayEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SmsGateway.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SmsGateway.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SmsGatewayVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/sms/SmsTemplateEndpoint.java

@@ -30,7 +30,7 @@ public class SmsTemplateEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SmsTemplateService smsTemplateService;
    @PostMapping(value = BaseRequestMapping.SmsTemplate.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SmsTemplate.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SmsTemplateVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class SmsTemplateEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SmsTemplate.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.SmsTemplate.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SmsTemplateVO> update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/team/BaseTeamMemberEndpoint.java

@@ -37,7 +37,7 @@ public class BaseTeamMemberEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseTeamMemberService baseTeamMemberService;
    @PostMapping(value = BaseRequestMapping.BaseTeamMember.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseTeamMember.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<BaseTeamMemberVO> create(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -56,7 +56,7 @@ public class BaseTeamMemberEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.BaseTeamMember.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.BaseTeamMember.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<BaseTeamMemberVO> update(
            @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/theme/ThemeEndpoint.java

@@ -30,7 +30,7 @@ public class ThemeEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ThemeService themeService;
    @PostMapping(value = BaseRequestMapping.Theme.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Theme.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<ThemeVO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
@@ -49,7 +49,7 @@ public class ThemeEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.Theme.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.Theme.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/version/AppVersionEndpoint.java

@@ -38,7 +38,7 @@ public class AppVersionEndpoint extends EnvelopRestEndpoint {
@Autowired
private AppVersionService appVersionService;
@PostMapping(value = BaseRequestMapping.AppVersion.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = BaseRequestMapping.AppVersion.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<AppVersionVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
@@ -57,7 +57,7 @@ public ObjEnvelop<AppVersionVO> create (
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.AppVersion.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = BaseRequestMapping.AppVersion.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<AppVersionVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WeChatQrcodeController.java

@@ -28,7 +28,7 @@ public class WeChatQrcodeController extends EnvelopRestEndpoint {
    @Autowired
    private WeChatQrcodeService weChatQrcodeService;
    @PostMapping(value = WechatRequestMapping.WxQrcode.api_getQrcode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxQrcode.api_getQrcode)
    @ApiOperation(value = "生成微信二维码", notes = "生成微信二维码")
    public Envelop getQrcode(@ApiParam(name = "wxId", value = "微信id")
                             @RequestParam(value = "wxId", required = true)String wxId,

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WxMenuController.java

@@ -26,7 +26,7 @@ public class WxMenuController extends EnvelopRestEndpoint {
    @Autowired
    private WxMenuService wxMenuService;
    @PostMapping(value = WechatRequestMapping.WxMenu.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxMenu.api_create)
    @ApiOperation(value = "添加微信菜单", notes = "添加微信菜单")
    public MixEnvelop createWxMenu(@ApiParam(name = "wxId", value = "微信id")
                                    @RequestParam(value = "wxId", required = false)String wxId) throws Exception{

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WxTemplateController.java

@@ -23,13 +23,13 @@ public class WxTemplateController extends EnvelopRestEndpoint {
    @Autowired
    private WxTemplateService wxTemplateService;
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_test_template, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_test_template)
    @ApiOperation(value = "测试发送微信模板", notes = "测试发送微信模板")
    public String sendWeTempMesTest(String wechatId,String openid)throws Exception{
        return wxTemplateService.sendWeTempMesTest(wechatId,openid);
    }
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_getAllTemplate, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxTemplate.api_getAllTemplate)
    @ApiOperation(value = "获取所有微信模板", notes = "获取所有微信模板")
    public Envelop getAllTemp(String wechatId) {
        return wxTemplateService.getAllTemp(wechatId);

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleInfoService.java

@@ -3,17 +3,17 @@ package com.yihu.jw.base.service.doctor;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.base.dao.doctor.BaseDoctorRoleInfoDao;
import com.yihu.jw.base.service.module.SaasModuleService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleInfoDO;
import com.yihu.jw.entity.base.doctor.BaseModuleRoleDO;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.entity.base.module.SaasModuleDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.module.ModuleVO;
import com.yihu.jw.restmodel.base.module.SaasModuleVO;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleService.java

@@ -1,60 +0,0 @@
package com.yihu.jw.base.service.doctor;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
 * 
 * 医生与业务模块角色关联信息服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年10月25日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class BaseDoctorRoleService extends BaseJpaService<BaseDoctorRoleDO, BaseDoctorRoleDao> {
    @Autowired
    private BaseDoctorRoleDao baseDoctorRoleDao;
    /**
     * 根据医生标识获取医生相关联的角色Id列表
     *
     * @param doctorCode
     * @return
     */
    public Set<Object> findRoleIdList(String doctorCode) {
        Set<Object> result = new HashSet<>();
        if (StringUtils.isEmpty(doctorCode)) {
            return result;
        }
        return baseDoctorRoleDao.findIdListByDoctorCode(doctorCode);
    }
    /**
     * 根据医生标识获取医生相关联的角色Id列表
     *
     * @param doctorCode
     * @return
     */
    public List<BaseDoctorRoleDO> queryDoctorRoleList(String doctorCode) {
        List<BaseDoctorRoleDO> result = new ArrayList<>();
        if (StringUtils.isEmpty(doctorCode)) {
            return result;
        }
        return baseDoctorRoleDao.findByDoctorCode(doctorCode);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -19,6 +19,7 @@ import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.doctor.service.BaseDoctorRoleService;
import com.yihu.jw.entity.base.dict.BaseIncentiveDictDO;
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
@@ -557,7 +558,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            try {
                for (Object object : role) {
                    baseDoctorRoleDO = objectMapper.readValue(object.toString(), BaseDoctorRoleDO.class);
                    BaseDoctorRoleDO baseDoctorRoleDO1 = baseDoctorRoleDao.findByDoctorCodeAndroleCode(baseDoctorDO.getId(),baseDoctorRoleDO.getRoleCode());
                    BaseDoctorRoleDO baseDoctorRoleDO1 = baseDoctorRoleDao.findByDoctorCodeAndRoleCode(baseDoctorDO.getId(),baseDoctorRoleDO.getRoleCode());
                    if (null==baseDoctorRoleDO1){
                        baseDoctorRoleDO.setDoctorCode(baseDoctorDO.getId());
                        baseDoctorRoleDao.save(baseDoctorRoleDO);

svr/svr-base/src/main/java/com/yihu/jw/base/service/module/ModuleService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service.module;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.dao.module.ModuleDao;
import com.yihu.jw.base.dao.module.SaasModuleDao;
import com.yihu.jw.base.dao.module.SaasTypeModuleDao;

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/MenuService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service.role;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.base.dao.role.MenuDao;
import com.yihu.jw.entity.base.role.MenuDO;
import com.yihu.jw.utils.hibernate.HibenateUtils;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/inpatient/DoctorInpatientRegistrationEndpoint.java

@@ -0,0 +1,77 @@
package com.yihu.jw.hospital.endpoint.inpatient;
import com.yihu.jw.inpatient.service.BaseInpatientRegistrationService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.*;
/**
 * Created by yeshijie on 2022/12/5.
 */
@RestController
@RequestMapping(value ="/doctor/inpatientRegistration")
@Api(value = "医生端-住院登记",  tags = {"医生端-住院登记"})
public class DoctorInpatientRegistrationEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseInpatientRegistrationService inpatientRegistrationService;
    @GetMapping(value= "page")
    @ApiOperation("历史住院登记记录")
    public Envelop page(@ApiParam(name = "name", value = "姓名或者身份证", required = false)
                        @RequestParam(value = "name", required = false)String name,
                        @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                        @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                        @ApiParam(name = "size", value = "每页分页大小", required = true, defaultValue = "10")
                        @RequestParam(value = "size", required = true,defaultValue = "10")Integer size){
        try {
            return inpatientRegistrationService.page(null,name,page,size);
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @PostMapping(value= "registration")
    @ApiOperation("入院登记")
    public Envelop registration(@ApiParam(name = "id", value = "id", required = true)
                                @RequestParam(value = "id", required = true)String id,
                                @ApiParam(name = "inpatientTime", value = "入院时间", required = true)
                                @RequestParam(value = "inpatientTime", required = true) String inpatientTime,
                                @ApiParam(name = "bedNo", value = "床位号", required = true)
                                @RequestParam(value = "bedNo", required = true)String bedNo,
                                @ApiParam(name = "attendingDoctor", value = "主治医师id", required = true)
                                @RequestParam(value = "attendingDoctor", required = true)String attendingDoctor,
                                @ApiParam(name = "attendingDoctorName", value = "主治医师", required = true)
                                @RequestParam(value = "attendingDoctorName", required = true)String attendingDoctorName,
                                @ApiParam(name = "inpatientAreaId", value = "病区id", required = true)
                                @RequestParam(value = "inpatientAreaId", required = true)String inpatientAreaId,
                                @ApiParam(name = "inpatientAreaName", value = "病区名称", required = true)
                                @RequestParam(value = "inpatientAreaName", required = true)String inpatientAreaName){
        try {
            return ObjEnvelop.getSuccess("提交成功",inpatientRegistrationService.registration(id,inpatientTime,bedNo
                    ,attendingDoctor,attendingDoctorName,inpatientAreaId,inpatientAreaName));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @PostMapping(value= "confirmAdmission")
    @ApiOperation("确认入院")
    public Envelop confirmAdmission(@ApiParam(name = "id", value = "id", required = true)
                                @RequestParam(value = "id", required = true)String id){
        try {
            return ObjEnvelop.getSuccess("提交成功",inpatientRegistrationService.confirmAdmission(id));
        }catch (Exception e){
            return failedException2(e);
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/inpatient/PatientInpatientRegistrationEndpoint.java

@@ -0,0 +1,84 @@
package com.yihu.jw.hospital.endpoint.inpatient;
import com.yihu.jw.inpatient.service.BaseInpatientRegistrationService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.*;
/**
 * Created by yeshijie on 2022/12/5.
 */
@RestController
@RequestMapping(value ="/patient/inpatientRegistration")
@Api(value = "居民端-住院登记", tags = {"居民端-住院登记"})
public class PatientInpatientRegistrationEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseInpatientRegistrationService inpatientRegistrationService;
    @GetMapping(value= "list")
    @ApiOperation("住院登记记录-未提交记录")
    public Envelop list(@ApiParam(name = "patient", value = "patient", required = true)
                        @RequestParam(value = "patient", required = true)String patient){
        try {
            return ListEnvelop.getSuccess("获取成功",inpatientRegistrationService.list(patient));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value= "findDetail")
    @ApiOperation("住院登记记录")
    public Envelop findDetail(@ApiParam(name = "id", value = "id", required = true)
                        @RequestParam(value = "id", required = true)String id){
        try {
            return ObjEnvelop.getSuccess("获取成功",inpatientRegistrationService.findDetail(id));
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @GetMapping(value= "page")
    @ApiOperation("历史住院登记记录")
    public Envelop page(@ApiParam(name = "patient", value = "patient", required = true)
                        @RequestParam(value = "patient", required = true)String patient,
                        @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                        @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                        @ApiParam(name = "size", value = "每页分页大小", required = true, defaultValue = "10")
                        @RequestParam(value = "size", required = true,defaultValue = "10")Integer size){
        try {
            return inpatientRegistrationService.page(patient,null,page,size);
        }catch (Exception e){
            return failedException2(e);
        }
    }
    @PostMapping(value= "submitRegist")
    @ApiOperation("提交住院登记")
    public Envelop submitRegist(@ApiParam(name = "id", value = "id", required = true)
                        @RequestParam(value = "id", required = true)String id,
                        @ApiParam(name = "mobile", value = "患者手机", required = true)
                        @RequestParam(value = "mobile", required = true) String mobile,
                        @ApiParam(name = "address", value = "住院地址", required = true)
                        @RequestParam(value = "address", required = true)String address,
                        @ApiParam(name = "contacts", value = "联系人", required = true)
                        @RequestParam(value = "contacts", required = true)String contacts,
                        @ApiParam(name = "contactsMobile", value = "联系人手机", required = true)
                        @RequestParam(value = "contactsMobile", required = true)String contactsMobile){
        try {
            return ObjEnvelop.getSuccess("提交成功",inpatientRegistrationService.submitRegist(id,mobile,address,contacts,contactsMobile));
        }catch (Exception e){
            return failedException2(e);
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/nurse/NursingCardEndpoint.java

@@ -39,10 +39,12 @@ public class NursingCardEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "id") String id,
            @ApiParam(name = "doctor", value = "医生id", required = true)
            @RequestParam(value = "doctor") String doctor,
            @ApiParam(name = "status", value = "状态 -1拒绝 1通过")
            @RequestParam(value = "status", required = false) Integer status) {
            @ApiParam(name = "checkReason", value = "审核说明/拒绝原因")
            @RequestParam(value = "checkReason", required = false) String checkReason,
            @ApiParam(name = "status", value = "状态 -1拒绝 1通过", required = true)
            @RequestParam(value = "status") Integer status) {
        try {
            nursingCardService.doctorCheck(id, status, doctor);
            nursingCardService.doctorCheck(id, status, doctor, checkReason);
            return success("操作成功!");
        }catch (Exception e){
            return failedException(e);
@@ -80,7 +82,7 @@ public class NursingCardEndpoint extends EnvelopRestEndpoint {
    public PageEnvelop patientPage (
            @ApiParam(name = "patient", required = true, value = "居民id")
            @RequestParam(value = "patient") String patient,
            @ApiParam(name = "type", value = "陪护类型 1门诊 2住院")
            @ApiParam(name = "type", value = "陪护类型 2住院")
            @RequestParam(value = "type", required = false) Integer type,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") Integer page,

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/role/BaseDoctorRoleEndpoint.java

@@ -0,0 +1,154 @@
package com.yihu.jw.hospital.endpoint.role;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.area.service.BaseInpatientAreaService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.doctor.service.BaseDoctorRoleService;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.restmodel.base.doctor.BaseDoctorRoleVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
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.*;
/**
*
* 医生与业务模块角色关联信息控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年10月25日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.BaseDoctorRole.PREFIX)
@Api(value = "医生与业务模块角色关联信息管理", tags = {"医生与业务模块角色关联信息管理服务接口"})
public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseDoctorRoleService baseDoctorRoleService;
    @Autowired
    private BaseDoctorRoleDao doctorRoleDao;
    @Autowired
    private BaseInpatientAreaService inpatientAreaService;
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestParam String jsonData){
        try {
            JSONObject json = JSON.parseObject(jsonData);
            String roleCode = json.getString("roleCode");
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                //住院病区审核员处理
                return ObjEnvelop.getSuccess("保存成功", inpatientAreaService.addAreaDoctor(json,roleCode));
            }else{
                BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
                baseDoctorRole.setDel(1);
                baseDoctorRole = baseDoctorRoleService.save(baseDoctorRole);
                return success(baseDoctorRole, BaseDoctorRoleVO.class);
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @PostMapping(value = "updDel")
    @ApiOperation(value = "生效/失效")
    public Envelop updStatus(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "del", value = "1生效，0失效", required = true)
            @RequestParam(value = "del") Integer del,
            @ApiParam(name = "roleCode", value = "角色编码", required = true)
            @RequestParam(value = "roleCode") String roleCode) {
        try {
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                inpatientAreaService.updDel(id,del);
            }else {
                BaseDoctorRoleDO roleDO = doctorRoleDao.findById(Integer.parseInt(id)).orElse(null);
                if(roleDO!=null){
                    roleDO.setDel(del);
                    doctorRoleDao.save(roleDO);
                }
            }
            return Envelop.getSuccess("修改成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("修改失败");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
        @ApiParam(name = "id", value = "id", required = true)
        @RequestParam(value = "id") String id,
        @ApiParam(name = "roleCode", value = "角色编码", required = true)
        @RequestParam(value = "roleCode") String roleCode) {
        try {
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                inpatientAreaService.delAreaDoctor(id);
            }else {
                doctorRoleDao.deleteById(Integer.parseInt(id));
            }
            return success("删除成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("删除失败");
    }
    @PostMapping(value = BaseRequestMapping.BaseDoctorRole.UPDATE)
    @ApiOperation(value = "更新")
    public Envelop update (
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestParam String jsonData) {
        try {
            //先删除在新增
            JSONObject json = JSON.parseObject(jsonData);
            String roleCode = json.getString("roleCode");
            String id = json.getString("id");
            delete(id,roleCode);
            return create(jsonData);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @GetMapping(value = BaseRequestMapping.BaseDoctorRole.PAGE)
    @ApiOperation(value = "获取分页")
    public Envelop page (
        @ApiParam(name = "roleCode", value = "角色编码")
        @RequestParam(value = "roleCode", required = true) String roleCode,
        @ApiParam(name = "name", value = "医生姓名")
        @RequestParam(value = "name", required = false) String name,
        @ApiParam(name = "idcard", value = "医生身份证")
        @RequestParam(value = "idcard", required = false) String idcard,
        @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
        @RequestParam(value = "page") int page,
        @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
        @RequestParam(value = "size") int size) {
        try {
            return baseDoctorRoleService.page(roleCode, name, idcard, page, size);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
 }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/role/BaseInpatientAreaEndpoint.java

@@ -0,0 +1,184 @@
package com.yihu.jw.hospital.endpoint.role;
import com.yihu.jw.area.dao.BaseInpatientAreaDao;
import com.yihu.jw.area.service.BaseInpatientAreaService;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
 * Created by yeshijie on 2022/12/2.
 */
@RestController
@RequestMapping(value = "inpatientArea")
@Api(value = "住院病区管理",tags = {"住院病区管理"})
public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseInpatientAreaService inpatientAreaService;
    @Autowired
    private BaseInpatientAreaDao inpatientAreaDao;
    @PostMapping(value = "create")
    @ApiOperation(value = "新增或修改")
    public Envelop create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            BaseInpatientAreaDO areaDO = toEntity(jsonData, BaseInpatientAreaDO.class);
            if(StringUtils.isNotBlank(areaDO.getId())){
                //修改
                Optional<BaseInpatientAreaDO>  optional = inpatientAreaDao.findById(areaDO.getId());
                if(!optional.isPresent()){
                    return Envelop.getError("id不存在");
                }
                BaseInpatientAreaDO old = optional.get();
                old.setDel(areaDO.getDel());
                old.setName(areaDO.getName());
                inpatientAreaDao.save(old);
            }else {
                //新增
                areaDO.setCreateTime(new Date());
                inpatientAreaDao.save(areaDO);
            }
            return ObjEnvelop.getSuccess("保存成功", areaDO);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @PostMapping(value = "saveAreaRule")
    @ApiOperation(value = "保存陪护规则")
    public Envelop saveAreaRule (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            BaseInpatientAreaDO areaDO = toEntity(jsonData, BaseInpatientAreaDO.class);
            Optional<BaseInpatientAreaDO>  optional = inpatientAreaDao.findById(areaDO.getId());
            if(!optional.isPresent()){
                return Envelop.getError("id不存在");
            }
            BaseInpatientAreaDO old = optional.get();
            areaDO.setName(old.getName());
            areaDO.setDel(old.getDel());
            areaDO.setCreateTime(old.getCreateTime());
            inpatientAreaDao.save(areaDO);
            return ObjEnvelop.getSuccess("保存成功", areaDO);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
    }
    @PostMapping(value = "updDel")
    @ApiOperation(value = "生效/失效")
    public Envelop updStatus(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "del", value = "1生效，0失效", required = true)
            @RequestParam(value = "del") Integer del) {
        try {
            Optional<BaseInpatientAreaDO>  optional = inpatientAreaDao.findById(id);
            if(!optional.isPresent()){
                return Envelop.getError("id不存在");
            }
            BaseInpatientAreaDO old = optional.get();
            old.setDel(del);
            inpatientAreaDao.save(old);
            return ObjEnvelop.getSuccess("修改成功",old);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("修改失败");
    }
    @GetMapping(value = "findById")
    @ApiOperation(value = "获取详情")
    public Envelop findById(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            Optional<BaseInpatientAreaDO>  optional = inpatientAreaDao.findById(id);
            if(!optional.isPresent()){
                return Envelop.getError("id不存在");
            }
            return ObjEnvelop.getSuccess("获取成功",optional.get());
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
    @PostMapping(value = "delete")
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            Optional<BaseInpatientAreaDO>  optional = inpatientAreaDao.findById(id);
            if(!optional.isPresent()){
                return Envelop.getError("id不存在");
            }
            inpatientAreaDao.deleteById(id);
            return Envelop.getSuccess("删除成功");
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("删除失败");
    }
    @GetMapping(value = "page")
    @ApiOperation(value = "获取分页")
    public Envelop page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size){
        try {
            List<BaseInpatientAreaDO> list = inpatientAreaService.search(fields, filters, sorts, page, size);
            long count = inpatientAreaService.getCount(filters);
            return PageEnvelop.getSuccessListWithPage("获取成功",list,page,size,count);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
    @GetMapping(value = "list")
    @ApiOperation(value = "获取列表")
    public Envelop list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        try {
            List<BaseInpatientAreaDO> list = inpatientAreaService.search(fields, filters, sorts);
            return ListEnvelop.getSuccess("获取成功",list);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
    }
}