Merge branch 'dev' of trick9191/wlyy2.0 into dev

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

@@ -23,7 +23,6 @@ import java.util.Map;
 * </pre>
 * @since 1.
 */
//@Transactional
public interface DictHospitalDeptDao extends PagingAndSortingRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
    @Query("select code as code,name as name from DictHospitalDeptDO where orgCode in ?1")

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

@@ -12,7 +12,7 @@ import java.util.List;
@Service
public class DictHospitalDeptService extends BaseJpaService<BaseCityDO, BaseCityDao> {
public class HospitalDeptService extends BaseJpaService<BaseCityDO, BaseCityDao> {
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;

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

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDao> {
public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoctorDao> {
    @Autowired
    private BaseDoctorDao baseDoctorDao;

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

@@ -551,7 +551,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        waitingRoom.setConsultType(Integer.parseInt(outpatientDO.getType()));
        if(StringUtils.isNotBlank(outpatientDO.getDoctor())){
            waitingRoom.setDoctor(outpatientDO.getDoctor());
            waitingRoom.setDoctor(outpatientDO.getDoctorName());
            waitingRoom.setDoctorName(outpatientDO.getDoctorName());
        }
        waitingRoom.setOutpatientId(outpatientDO.getId());
        waitingRoom.setCreateTime(new Date());

business/base-service/src/main/java/com/yihu/jw/org/service/BaseOrgService.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class BaseOrgService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
public class BaseOrgInfoService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
    @Autowired
    private BaseOrgDao baseOrgDao;

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -75,26 +75,26 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
    public JSONArray getDistListBySaasId(String type, String saasId, String name, String sorts, int page, int size) throws Exception {
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
//        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictIcd10Service.queryAll(saasId, createPage(page, size, sorts));
//        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictHospitalDeptService.queryAll(saasId, createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictJobTitleService.queryAll(saasId, createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictHealthProblemService.queryAll(saasId, createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictMedicineService.queryAll(saasId, createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictDiseaseService.queryAll(saasId, createPage(page, size, sorts));
//        } else {
//            jsonObject = this.queryAll(saasId, createPage(page, size, sorts));
//        }
//        jsonArray.add(jsonObject);
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(saasId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll(saasId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll(saasId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll(saasId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll(saasId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll(saasId, creatPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll(saasId, creatPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;
    }
@@ -122,26 +122,26 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
//        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictIcd10Service.queryAll(userId, createPage(page, size, sorts));
//        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictHospitalDeptService.queryAll("", createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictJobTitleService.queryAll("", createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictHealthProblemService.queryAll("", createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictMedicineService.queryAll("", createPage(page, size, sorts));
//
//        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
//            jsonObject = dictDiseaseService.queryAll("", createPage(page, size, sorts));
//        } else {
//            jsonObject = this.queryAll("", createPage(page, size, sorts));
//        }
//        jsonArray.add(jsonObject);
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(userId, creatPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll("", creatPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll("", creatPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll("", creatPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll("", creatPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll("", creatPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll("", creatPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;
    }

svr/svr-base/src/main/resources/application.yml

@@ -103,6 +103,14 @@ fastDFS:
# 短信发送地址
jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
---
spring:
  profiles: jwtest
@@ -130,7 +138,14 @@ spring:
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
---
spring:
  profiles: prod
@@ -154,4 +169,12 @@ spring:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.19.103.54:80/
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/base/BaseInfoEndpoint.java

@@ -2,15 +2,15 @@ package com.yihu.jw.hospital.endpoint.base;
import com.yihu.jw.area.service.BaseCityService;
import com.yihu.jw.dict.service.BaseDictJobTitleService;
import com.yihu.jw.dict.service.DictHospitalDeptService;
import com.yihu.jw.dict.service.HospitalDeptService;
import com.yihu.jw.doctor.service.BaseDoctorHosService;
import com.yihu.jw.doctor.service.BaseDoctorService;
import com.yihu.jw.doctor.service.BaseDoctorInfoService;
import com.yihu.jw.entity.base.area.BaseCityDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.dict.DictJobTitleDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.org.service.BaseOrgService;
import com.yihu.jw.org.service.BaseOrgInfoService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
@@ -36,7 +36,7 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
    private BaseCityService cityService;
    @Autowired
    private DictHospitalDeptService dictHospitalDeptService;
    private HospitalDeptService hospitalDeptService;
    @Autowired
    private BaseDictJobTitleService baseDictJobTitleService;
@@ -45,10 +45,10 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
    private BaseDoctorHosService baseDoctorHosService;
    @Autowired
    private BaseDoctorService baseDoctorService;
    private BaseDoctorInfoService baseDoctorInfoService;
    @Autowired
    private BaseOrgService baseOrgService;
    private BaseOrgInfoService baseOrgInfoService;
    /**
     * 获取市列表信息
@@ -74,7 +74,7 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
    public Envelop getOrgByCity(
            @ApiParam(name = "cityCode", value = "市编码")
            @RequestParam(value = "cityCode", required = false) String cityCode) {
        List<BaseOrgDO> res =  baseOrgService.getOrgByCity(cityCode);
        List<BaseOrgDO> res =  baseOrgInfoService.getOrgByCity(cityCode);
        if(res != null && res.size() > 0 ){
            return  success(res);
        }else{
@@ -92,7 +92,7 @@ public class BaseInfoEndpoint extends EnvelopRestEndpoint {
    public Envelop getDeptByOrgCode(
            @ApiParam(name = "orgCode", value = "机构编码")
            @RequestParam(value = "orgCode", required = false) String orgCode)  {
        List<DictHospitalDeptDO> res =  dictHospitalDeptService.getHosDeptByCode(orgCode);
        List<DictHospitalDeptDO> res =  hospitalDeptService.getHosDeptByCode(orgCode);
        if(res != null && res.size() > 0 ){
            return  success(res);
        }else{