Merge branch 'dev' of zd_123/patient-co-management into dev

common/common-entity/pom.xml

@@ -63,11 +63,11 @@
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
        </dependency>
        <dependency>
 <!--       <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
            <version>1.3.5.RELEASE</version>
        </dependency>
        </dependency>-->
    </dependencies>
</project>

common/common-entity/src/main/java/com/yihu/es/entity/MapDataDTO.java

@@ -1,3 +1,4 @@
/*
package com.yihu.es.entity;
import com.alibaba.fastjson.annotation.JSONField;
@@ -8,9 +9,11 @@ import org.springframework.data.elasticsearch.core.geo.GeoPoint;
import java.util.Date;
*/
/**
 * Created by chenweida on 2018/2/12.
 */
 *//*
public class MapDataDTO {
    @JestId
    private String id;
@@ -95,3 +98,4 @@ public class MapDataDTO {
        this.location = geoPoint;
    }
}
*/

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -38,6 +38,7 @@ import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
@@ -462,7 +463,7 @@ public class PrescriptionService extends BaseService {
                " p.create_time," +
                " GROUP_CONCAT(d.health_problem) AS health_problem," +
                " GROUP_CONCAT(d.health_problem_name) AS health_problem_name," +
                " FORMAT(a.total_amount/100,1) AS total_amount" +
                " REPLACE(FORMAT(a.total_amount / 100, 1),',','')  AS total_amount" +
                " FROM" +
                " wlyy_prescription p" +
                " LEFT JOIN wlyy_prescription_diagnosis d ON p. CODE = d.prescription_code" +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java

@@ -1,7 +1,7 @@
package com.yihu.wlyy.web.data;
import com.yihu.es.entity.HealthEduArticleES;
import com.yihu.es.entity.MapDataDTO;
//import com.yihu.es.entity.MapDataDTO;
import com.yihu.wlyy.config.es.ElastricSearchSave;
import com.yihu.wlyy.entity.device.PatientDevice;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
@@ -134,7 +134,7 @@ public class DataHandingService {
    private Logger logger = LoggerFactory.getLogger(DataHandingService.class);
    public net.sf.json.JSONObject deviceData2Es() {
    /*public net.sf.json.JSONObject deviceData2Es() {
        net.sf.json.JSONObject jo = new net.sf.json.JSONObject();
        try {
            //得到已经已经绑定的体征设备
@@ -170,7 +170,7 @@ public class DataHandingService {
            e.printStackTrace();
            return jo;
        }
    }
    }*/
    public JSONArray getAllDeviceData() {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -248,13 +248,13 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/deviceData2Es", method = RequestMethod.GET)
    /*@RequestMapping(value = "/deviceData2Es", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("把地图数据生成到ES中")
    public String deviceData2Es() {
        JSONObject jsonObject = dataHandingService.deviceData2Es();
        return write(200, jsonObject.toString());
    }
    }*/
    @RequestMapping(value = "/getAllDeviceData", method = RequestMethod.GET)
    @ResponseBody