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

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

@@ -215,6 +215,10 @@ public class YkyyEntranceService {
        if (jsonArray.size() == 0) {
            return null;
        }
//        String tmp = "{\"JZXH\":2395594,\"SFZH\":\"350203201411221635\",\"ZDMC\":\"结膜炎\",\"YSDM\":\"1785\",\"BRXZ\":\"医保\",\"JZKH\":\"DA6736810\",\"KDYS\":\"况坤\",\"KSDM\":112,\"BRID\":1175116,\"BRXM\":\"王竣皓\",\"SJHM\":null,\"KSSJ\":\"2020/04/28 20:56:34\",\"KSMC\":\"眼整形专科\"}";
//        JSONArray jsonArray = new JSONArray();
//        jsonArray.add(JSONObject.parse(tmp));
        List<WlyyOutpatientVO> wlyyOutpatientVOS = new ArrayList<>();
        WlyyOutpatientVO wlyyOutpatientVO;
        for (int i = 0; i < jsonArray.size(); i++) {
@@ -285,7 +289,7 @@ public class YkyyEntranceService {
     * @throws Exception
     */
    public JSONArray findV_ZKSG_HZCX_HIS(String brid,String conNo,String startTime,String endTime) throws Exception{
        String sql = "SELECT to_char(h.KSSJ ,'yyyy-MM-dd hh24:mi:ss' ) as KSSJ,h.BRID,h.BRXM,h.SJHM,h.JZKH,h.SFZH,h.BRXZ,h.YSDM,h.KDYS" +
        String sql = "SELECT to_char(h.KSSJ ,'yyyy/MM/dd hh24:mi:ss' ) as KSSJ,h.BRID,h.BRXM,h.SJHM,h.JZKH,h.SFZH,h.BRXZ,h.YSDM,h.KDYS" +
                ",h.KSDM,h.KSMC,h.ZDMC,h.JZXH from V_ZKSG_HZCX_HIS h WHERE h.BRID = "+brid+" ";
        if(!StringUtil.isBlank(conNo)){
            sql += " and h.JZXH = " + conNo;