Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

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

@@ -1303,7 +1303,7 @@ public class DsyyEntranceService {
     */
    public JSONArray getDrugUse(String pydm) throws Exception {
        String sql ="SELECT\n" +
                "\tsupply_code as \"supply_code\",\n" +
                "\tsupply_name as \"supply_code\",\n" +
                "\tsupply_name as \"supply_name\",\n" +
                "\tsupply_occ as \"supply_occ\",\n" +
                "\tdel_flag as \"del_flag\",\n" +

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -904,7 +904,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("pt_no", info.get("patientName")== null? "0":info.get("patientName"));
                jb.put("pt_age", IdCardUtil.getAgeForIdcard(info.get("patIdCard").toString()));
                jb.put("cost_type", "");
                jb.put("pt_birthdate", info.get("birthday") == null? "":DateUtil.dateToStrShort((Date)info.get("birthday")));
                jb.put("pt_birthdate", IdCardUtil.getBirthdayForIdcardStr(info.get("patIdCard").toString()));
                jb.put("ge_code", info.get("sex")== null? "0":info.get("sex"));
                jb.put("pt_tel",info.get("mobile") == null ? "0":info.get("mobile"));
                jb.put("card_type", "1");