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

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -174,14 +174,14 @@ public class PackageService {
                    "    POW( " +
                    "     SIN( " +
                    "      ( " +
                    "       "+longitude+" * PI() / 180 - o.latitude * PI() / 180 " +
                    "       "+latitude+" * PI() / 180 - o.latitude * PI() / 180 " +
                    "      ) / 2 " +
                    "     ), " +
                    "     2 " +
                    "    ) + COS("+longitude+" * PI() / 180) * COS(o.latitude * PI() / 180) * POW( " +
                    "    ) + COS("+latitude+" * PI() / 180) * COS(o.latitude * PI() / 180) * POW( " +
                    "     SIN( " +
                    "      ( " +
                    "       "+latitude+" * PI() / 180 - o.longitude * PI() / 180 " +
                    "       "+longitude+" * PI() / 180 - o.longitude * PI() / 180 " +
                    "      ) / 2 " +
                    "     ), " +
                    "     2 " +