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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/DeviceHealthIndexController.java

@@ -1,8 +1,6 @@
package com.yihu.wlyy.controller.manager.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.DeviceHealthIndex;
import com.yihu.wlyy.device.entity.DeviceHealthIndexExportVO;
import com.yihu.wlyy.device.entity.DeviceHealthIndexVO;
import com.yihu.wlyy.service.manager.device.DeviceHealthIndexService;
@@ -11,15 +9,16 @@ import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2016/12/5.
@@ -112,7 +111,7 @@ public class DeviceHealthIndexController extends BaseController{
    
    public void addHeader(WritableSheet ws) throws WriteException {
        
        String[] header = {"居民姓名","手机号","身份证","设备码","设备名称","签约医生", "地址", "更新日期", "总记录数"};
        String[] header = {"居民姓名","手机号","身份证","设备码","设备名称","签约医生", "地址", "记录时间", "上传次数"};
        int i = 0;
        for (String h : header) {
            addCell(ws, 0, i, h);//表名，行，列，header

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/SignFamilyDao.java

@@ -430,4 +430,7 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    @Query("select count(1) from SignFamily a where a.idcard=?1 and a.status>0 and a.type=2")
    int hasSignCount(String idcard);
    //根据patient查找有效签约的hospital
    @Query("select a.hospital from SignFamily a where a.patient = ?1 and (a.status = 1 or a.status = 2)")
    String getHospital(String patient);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/healthBank/PatientHealthBankService.java

@@ -1,6 +1,8 @@
package com.yihu.wlyy.service.app.healthBank;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -10,15 +12,18 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional(rollbackFor = Exception.class)
public class PatientHealthBankService extends BaseService {
    @Autowired
    private PatientDao patientDao;
    private SignFamilyDao signFamilyDao;
    @Autowired
    private HospitalDao hospitalDao;
    /**
     * 根据patient判断居民是否为海沧区
     * @param patient
     * @return
     */
    public boolean distinguish(String patient){
        String address = patientDao.getAddress(patient);
        return address.contains("海沧");
    public Hospital distinguish(String patient){
        String hospital = signFamilyDao.getHospital(patient);
        Hospital h = hospitalDao.findByCode(hospital);
        return h;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/healthBank/PatientHealthBankController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.patient.healthBank;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.service.app.healthBank.PatientHealthBankService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
@@ -27,8 +28,8 @@ public class PatientHealthBankController extends BaseController {
    @ApiOperation("区分门户显示(判断是否为海沧区居民)")
    public String distinguish(@RequestParam(value = "patient") String patient){
        try {
            Boolean d = patientHealthBankService.distinguish(patient);
            return write(200, "查询成功！","data", d);
            Hospital h = patientHealthBankService.distinguish(patient);
            return write(200, "查询成功！","data", h);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");