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

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientMedicareCardService.java

@@ -213,16 +213,10 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
        JSONObject result = new JSONObject();
        String sql = "select  " +
                " city.code, " +
                " city.name, " +
                " getFirstHanZiCode(city.name) as FirstLetter " +
                " city.name " +
                " from  " +
                " base_city city  " +
                " GROUP BY city.name,FirstLetter;";
                " base_city city";
        List<Map<String, Object>> citylist = jdbcTemplate.queryForList(sql);
        for(Map<String, Object> city : citylist){
            Map<String,Map<String, Object>> oneLetterMap = new HashMap<>();
            oneLetterMap.put(city.get("FirstLetter").toString(),city);
        }
        result.put("unsorted", citylist);
        result.put("sorted", PinYinUtil.pingYinSortReturnJSON(citylist));
        return result;

svr/svr-patient/src/main/java/com/yihu/jw/patient/util/PinYinUtil.java

@@ -26,7 +26,7 @@ public class PinYinUtil {
        Resource resource = new ClassPathResource("multitone.properties");
        BufferedReader br = null;
        try {
            br = new BufferedReader(new InputStreamReader(resource.getInputStream(), "GBK"));
            br = new BufferedReader(new InputStreamReader(resource.getInputStream()));
            String line = null;
            // 读取的文件末尾如果没有内容，不要留空行，空行也会被读
            while (null != (line = br.readLine())) {

svr/svr-patient/src/main/resources/multitone.properties

@@ -1,47 +1,47 @@
###´ËÊôÐÔÎļþ£¬Ö»·ÅһЩҽԺÃû³Æ¿ÉÄÜ»áÓõ½µÄ¶àÒô×ֵĴÊ×飬ÆäËûµÄ²»´æ£¬ºóÆÚÈç¹ûÓÐеĶàÒô×Ö·¢ÏÖ£¬ÐèÊÖ¶¯Ìí¼Óµ½´ËÎļþ²¢Î¬»¤
###此属性文件，�放一些医院�称�能会用到的多音字的�组，其他的�存，�期如果有新的多音字�现，需手动添加到此文件并维护
######### A ##########
A=°¢/°¢¿Ë/°¢À­
A=阿/阿克/阿拉
######### B ##########
BANG=°ö²º
BAI=°Ù
BANG=蚌埠
BAI=百
######### C ##########
CHAO=³¯Ñô/³¤
CHONG=ÖØÇì
CHANG=³¤ÖÎ/³¤´º
CHAO=�阳/长
CHONG=�庆
CHANG=长治/长春
######### D ##########
DA=´ó/´óͬ
DA=大/大�
######### F ##########
F=·ð
F=ä½›
######### G ##########
GUANG=¹ã/¹ã¶«/¹ãÎ÷
GUANG=广/广东/广西
######### H ##########
HONG=ºìºÓ
HE=ºÏ·Ê
HONG=红河
HE=�肥
######### J ##########
J=¾°
J=景
######### K ##########
KA=¿¦Ê²
KA=喀什
######### L ##########
L=äð/Áù/ÀÖ
L=漯/六/�
######### M ##########
######### N ##########
NA=ÄÇ/ÄÇÇú
NAN=ÄÏ
NA=那/那曲
NAN=�
######### P ##########
######### Q ##########
QI=ÆëÆë
QI=��
######### R ##########
######### S ##########
SHENG=Ê¡/Ê¡ÈËÃñ/Ê¡Õþ¸®
SHI=ʯ/ʯ×ìɽ
SHEN=ÉòÑô
SU=ËÞ
SHENG=�/�人民/�政府
SHI=石/石嘴山
SHEN=沈阳
SU=宿
######### T ##########
T=Ëþ³Ç
T=塔城
######### W ##########
WU=ÎÞÎý
WU=无锡
######### X ##########
XIA=ÏÃÃÅ/Ïôó
X=ÐÅ
XIA=厦门/厦大
X=ä¿¡
######### Y ##########
Y=ÑÌ
Y=烟