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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

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

@@ -1256,7 +1256,7 @@ public class XzzxEntranceService{
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("savePrescriptionToHospital params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info(" savePrescriptionToHospital json:"+json);
@@ -1316,7 +1316,7 @@ public class XzzxEntranceService{
        params.put("msgHeader",msgHeader);
        params.put("msgBody",msgBody);
        logger.info("saveInspectToHospital params:"+params.toString());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getSelectUrl());
        String xml = getXzzxWebServiceInfo("CallInterface",params,getOperateUrl());
        XMLSerializer xmlSerializer = new XMLSerializer();
        String json = xmlSerializer.read(xml).toString();
        logger.info(" saveInspectToHospital json:"+json);

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

@@ -800,7 +800,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                    "JOIN "+base+".muc_messages M ON M.session_id = T.session_id\n" +
                    "AND M.timestamp >= T.create_time\n" +
                    "AND M.timestamp <= T.end_time\n" +
                    "AND T.id='"+info.get("consult").toString()+"' "+
                    "AND T.id='"+info.get("m").toString()+"' "+
                    " ORDER BY\n" +
                    "\tM.timestamp ASC";
        /*    String sqlMessage = "SELECT m.sender_name AS \"sender_name\", m.`timestamp` AS \"timestamp\", m.content AS  \"content\", t.id AS \"id\"  FROM topics t " +
@@ -1054,8 +1054,8 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("visit_finish_time", dateStr+" 00:00:00");
                jb.put("old_diag_code", "");
                jb.put("old_diag_name", "");
                jb.put("old_diag_code", info.get("icd10"));
                jb.put("old_diag_name", info.get("icd10_name"));
                jb.put("diag_code",info.get("icd10"));
                jb.put("diag_name", info.get("icd10_name"));
                jb.put("diseases_type", info.get("origin_adm_no") == null ? "1":"2");
@@ -1068,7 +1068,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                JSONArray array = new JSONArray();
                array.add(object);
                jb.put("complaint_content",array);
                jb.put("proc_file", "");
                jb.put("proc_file", "无");
                jb.put("price","0");
                jb.put("fg_reply", "");
                jb.put("crt_time", DateUtil.dateToStrLong(DateUtil.getNow()));
@@ -1199,7 +1199,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("pres_dept_code", info.get("dept")== null?"0":info.get("dept"));
                jb.put("pres_dept_name",info.get("dept_name")== null?"0":info.get("dept_name"));
                jb.put("pres_time", info.get("create_time")== null?DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"):DateUtil.dateToStrLong((Date)info.get("create_time")));
                jb.put("trial_time",info.get("create_time")== null?DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"):DateUtil.dateToStrLong((Date)info.get("create_time")));
                jb.put("trial_time",info.get("create_time")== null?DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"):DateUtil.dateToStrLong(new Date(((Date)info.get("create_time")).getTime()+600000)));
                jb.put("pres_doc_code", visitDocCode);
                jb.put("pres_doc_name", info.get("doctor_name")== null?"0":info.get("doctor_name"));
                jb.put("pres_doc_id_no", info.get("docIdcard")== null?"0":info.get("docIdcard"));