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

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

@@ -268,7 +268,7 @@ public class XzzxCotroller extends EnvelopRestEndpoint {
        Map<String,Object> map = xzzxEntranceService.updatePreStatusLocal(admNo,realOrder,status);
        if (status.equalsIgnoreCase("1")){
            List<WlyyPrescriptionDO> prescriptionDOList =  prescriptionDao.findByAdmNoAndRealOrderList(admNo,realOrder);
            if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                    if (prescriptionDOList!=null&&prescriptionDOList.size()!=0){
                WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDOList.get(0);
                JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                System.out.println("wlyyPrescriptionDO参数入参"+object.toJSONString());

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -300,7 +300,7 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://192.168.103.150:3000/
  im_list_get: http://192.168.118.240:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://192.168.103.159:8888/

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -558,7 +558,7 @@ hospital:
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://192.168.103.150:3000/
  im_list_get: http://192.168.118.240:3000/
  data_base_name: im
# 上传文件临时路径配置