Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/dict/HealthProblemDictdAO.java

@@ -1,16 +0,0 @@
package com.yihu.wlyy.repository.dict;
import com.yihu.wlyy.entity.dict.HealthProblemDict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by chenweida on 2017/8/9.
 */
public interface HealthProblemDictDao  extends
        PagingAndSortingRepository<HealthProblemDict, Long>,
        JpaSpecificationExecutor<HealthProblemDict> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/dict/HpIcd10RelationDao.java

@@ -1,13 +0,0 @@
package com.yihu.wlyy.repository.dict;
import com.yihu.wlyy.entity.dict.HpIcd10Relation;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/8/9.
 */
public interface HpIcd10RelationDao extends
        PagingAndSortingRepository<HpIcd10Relation, Long>,
        JpaSpecificationExecutor<HpIcd10Relation> {
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/dict/Icd10DictDao.java

@@ -1,19 +0,0 @@
package com.yihu.wlyy.repository.dict;
import com.yihu.wlyy.entity.dict.Icd10Dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by chenweida on 2017/8/9.
 */
public interface Icd10DictDao extends
        PagingAndSortingRepository<Icd10Dict, Long>,
        JpaSpecificationExecutor<Icd10Dict> {
    @Query("from Icd10Dict")
    List<Icd10Dict> findAlld10Dict();
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/system/Icd10DictServcie.java

@@ -1,10 +1,6 @@
package com.yihu.wlyy.service.system;
import com.yihu.wlyy.entity.dict.HealthProblemDict;
import com.yihu.wlyy.entity.dict.Icd10Dict;
import com.yihu.wlyy.repository.dict.HealthProblemDictDao;
import com.yihu.wlyy.repository.dict.HpIcd10RelationDao;
import com.yihu.wlyy.repository.dict.Icd10DictDao;
import com.yihu.wlyy.util.DateUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -28,7 +24,7 @@ public class Icd10DictServcie {
    private final String keyHealthProblem = "wlyy:dict:idc:HealthProblem:";
    private final String keyDict2healthProblem = "wlyy:dict:idc:Icd10ToHealthProblem:";
    private final String keyHealthProblem2Dict = "wlyy:dict:idc:HealthProblemToIcd10:";
    private final String ok = "wlyy:dict:idc:Icd10:init";
    private final String ok = "wlyy:dict:idc:init";
    @Autowired