代码修改

business/base-service/pom.xml

@@ -29,9 +29,9 @@
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>${version.yihu-common}</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <!--   poi xml导入导出工具 start-->

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

@@ -27,7 +27,7 @@ import java.util.Map;
public interface DictHospitalDeptDao extends JpaRepository<DictHospitalDeptDO, Integer>, JpaSpecificationExecutor<DictHospitalDeptDO>  {
    @Query("select code as code,name as name from DictHospitalDeptDO where orgCode in ?1")
    List<Map<String,Object>> findByOrgCodeIn(String orgCode, Pageable pageable);
    List<Map<String,Object>> findByOrgCodeIn(List orgCode, Pageable pageable);
    @Query("select code as code,name as name from DictHospitalDeptDO")
    List<Map<String,Object>> findCodeAndName(Pageable pageable);
@@ -36,12 +36,12 @@ public interface DictHospitalDeptDao extends JpaRepository<DictHospitalDeptDO, I
    List<DictHospitalDeptDO> findByOrgCodeAndConsultDeptFlag(String orgCode,String consultDeptFlag);
    List<DictHospitalDeptDO> findByOrgCodeIn(String orgCode);
    List<DictHospitalDeptDO> findByOrgCodeIn(List orgCode);
    List<DictHospitalDeptDO> findByOrgCodeAndCode(String orgCode,String code);
    @Query("from DictHospitalDeptDO t where t.orgCode = ?1 and t.code = ?2")
    DictHospitalDeptDO findByOrgCodedeptCode(String orgCode,String code);
    Long countByCodeIn(String orgCode);
    Long countByCodeIn(List orgCode);
    boolean existsByCodeAndOrgCode(String code, String orgCode);

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

@@ -1597,7 +1597,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if (StringUtils.isNotBlank(consultDeptFlag) && "1".equals(consultDeptFlag)) {
            list = dictHospitalDeptDao.findByOrgCodeAndConsultDeptFlag(orgCode, consultDeptFlag);
        } else {
            list = dictHospitalDeptDao.findByOrgCodeIn(orgCode);
            list = dictHospitalDeptDao.findByOrgCodeIn(Arrays.asList(orgCode.split(",")));
        }
        List<DictHospitalDeptVO> rs = new ArrayList<>();
        convertToModels(list, rs, DictHospitalDeptVO.class);

business/es-service/pom.xml

@@ -16,9 +16,9 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>${version.yihu-common}</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

business/im-service/pom.xml

@@ -16,10 +16,9 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>${version.yihu-common}</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

business/sms-service/pom.xml

@@ -16,9 +16,9 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>${version.yihu-common}</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

server/svr-authentication/pom.xml

@@ -129,9 +129,9 @@
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-base/pom.xml

@@ -106,18 +106,18 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <!-- Jzkl Starter -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>swagger-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>
@@ -193,7 +193,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
@@ -205,7 +205,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.4.0</version>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <!--   poi xml导入导出工具 end -->
@@ -213,7 +213,7 @@
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
            <version>${version.oracle}</version>
        </dependency>
    </dependencies>

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

@@ -73,8 +73,8 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
            count = dictHospitalDeptDao.count();
        }else{
            List orgCodeList = baseOrgService.findOrgCodeListBySaasId(saasId);
            list = dictHospitalDeptDao.findByOrgCodeIn(objectMapper.writeValueAsString(orgCodeList),pageable);
            count = dictHospitalDeptDao.countByCodeIn(saasId);
            list = dictHospitalDeptDao.findByOrgCodeIn(orgCodeList,pageable);
            count = dictHospitalDeptDao.countByCodeIn(orgCodeList);
        }
        jsonObject.put("count",count);
        jsonObject.put(SystemDictEnum.HospitalDeptDict.toString(),list);
@@ -94,8 +94,8 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
        }
        List orgCodeList = baseOrgService.findOrgCodeListBySaasId(saasId);
        try {
            list = dictHospitalDeptDao.findByOrgCodeIn(objectMapper.writeValueAsString(orgCodeList));
        } catch (JsonProcessingException e) {
            list = dictHospitalDeptDao.findByOrgCodeIn(orgCodeList);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return list;

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

@@ -76,23 +76,23 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll(saasId, createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = this.queryAll(saasId, createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;
@@ -123,23 +123,23 @@ 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, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(userId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll("", createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll("", creatPage(page, size, sorts));
            jsonObject = this.queryAll("", createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;

svr/svr-cloud-care/pom.xml

@@ -115,9 +115,9 @@
        </dependency>
        <!-- Jzkl Starter -->
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-cloud-device/pom.xml

@@ -86,9 +86,9 @@
            <version>2.4.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-cloud-job/pom.xml

@@ -75,9 +75,9 @@
            <version>2.4.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-cloud-medicine/pom.xml

@@ -118,9 +118,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-door-service/pom.xml

@@ -116,9 +116,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-healthy-house/pom.xml

@@ -81,7 +81,7 @@
			</exclusions>
		</dependency>
		<dependency>
			<groupId>com.yihu</groupId>
			<groupId>com.yihu.jw</groupId>
			<artifactId>mysql-starter</artifactId>
		</dependency>
		<dependency>

svr/svr-internet-hospital-entrance/pom.xml

@@ -115,9 +115,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>

svr/svr-internet-hospital-job/pom.xml

@@ -92,9 +92,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-internet-hospital/pom.xml

@@ -118,9 +118,9 @@
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>${version.yihu-common}</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-iot-job/pom.xml

@@ -90,9 +90,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>

svr/svr-iot-sn/pom.xml

@@ -95,9 +95,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>

svr/svr-iot/pom.xml

@@ -112,9 +112,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>

svr/svr-patient/pom.xml

@@ -114,9 +114,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>

svr/svr-rehabilitation/pom.xml

@@ -94,9 +94,9 @@
			<version>2.0.0</version>
		</dependency>
		<dependency>
			<groupId>com.yihu</groupId>
			<groupId>com.yihu.jw</groupId>
			<artifactId>mysql-starter</artifactId>
			<version>2.0.0</version>
			<version>${version.wlyy-common}</version>
		</dependency>
		<dependency>
			<groupId>com.yihu.jw</groupId>

svr/svr-statistics/pom.xml

@@ -390,9 +390,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>

svr/svr-wlyy-health-bank/pom.xml

@@ -99,9 +99,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.hibernate</groupId>

svr/svr-wlyy-specialist/pom.xml

@@ -84,9 +84,9 @@
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>

svr/svr-wlyy/pom.xml

@@ -107,9 +107,9 @@
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <groupId>com.yihu.jw</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
    </dependencies>
</project>

wlyy-parent-pom/pom.xml

@@ -230,9 +230,9 @@
                <version>${version.yihu-common}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu</groupId>
                <groupId>com.yihu.jw</groupId>
                <artifactId>mysql-starter</artifactId>
                <version>${version.yihu-common}</version>
                <version>${version.wlyy-common}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu</groupId>

wlyy-starter/pom.xml

@@ -21,6 +21,7 @@
    <modules>
        <!--<module>../starter/hbase-starter</module>-->
       <module>../starter/swagger-starter</module>
        <module>../starter/mysql-starter</module>
    </modules>
    <!-- 项目发布到这个服务器 -->