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

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/survey/SurveyScreenResult.java

@@ -16,6 +16,8 @@ import java.util.Date;
@Table(name = "wlyy_survey_screen_result")
public class SurveyScreenResult extends IdEntity implements Serializable{
    //唯一标识
    private String code;
    //模板编码
    private String templateCode;
    //模板标题
@@ -58,6 +60,37 @@ public class SurveyScreenResult extends IdEntity implements Serializable{
    public SurveyScreenResult() {
    }
    public SurveyScreenResult(String code, String templateCode, String templateTitle, int disease, String doctor, String patientCode, String openId, String patientName, int screenResultScore, String screenResult, int order, int following, int over, String reservationCode, Date czrq, int isAgain, String parentCode, String originCode, String adviceCode, String otherAdvice) {
        this.code = code;
        this.templateCode = templateCode;
        this.templateTitle = templateTitle;
        this.disease = disease;
        this.doctor = doctor;
        this.patientCode = patientCode;
        this.openId = openId;
        this.patientName = patientName;
        this.screenResultScore = screenResultScore;
        this.screenResult = screenResult;
        this.order = order;
        this.following = following;
        this.over = over;
        this.reservationCode = reservationCode;
        this.czrq = czrq;
        this.isAgain = isAgain;
        this.parentCode = parentCode;
        this.originCode = originCode;
        this.adviceCode = adviceCode;
        this.otherAdvice = otherAdvice;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "template_code")
    public String getTemplateCode() {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/DeviceDetailService.java

@@ -77,7 +77,7 @@ public class DeviceDetailService extends BaseService {
		}
		//设备表没有数据则插入一条数据
		if (deviceDetail==null){
			insertDevice(patientDevice,String.valueOf(adminTeam),hospitalName,hospital,"");
			insertDevice(patientDevice,String.valueOf(adminTeam),hospitalName,hospital,"",1);
			deviceDetail = deviceDetailDao.findBySn(patientDevice.getDeviceSn());
		}
@@ -114,9 +114,11 @@ public class DeviceDetailService extends BaseService {
	 * @param adminTeam
	 * @param orgName
	 * @param orgCode
	 * @param bindCount
	 * @param isBind 0未绑定  1已绑定
	 * @throws Exception
	 */
	public void insertDevice(PatientDevice patientDevice, String adminTeam, String orgName, String orgCode,String bindCount)throws Exception{
	public void insertDevice(PatientDevice patientDevice, String adminTeam, String orgName, String orgCode,String bindCount,int isBind)throws Exception{
		//获取原始数据
		DeviceDetail deviceDetail = new DeviceDetail();
		Patient patient = patientDao.findByCode(patientDevice.getUser());
@@ -126,13 +128,18 @@ public class DeviceDetailService extends BaseService {
		deviceDetail.setDeviceCode(patientDevice.getDeviceSn());
		deviceDetail.setDeviceName(patientDevice.getDeviceName());
		deviceDetail.setSim(patientDevice.getSim());
		deviceDetail.setIsGrant(1);
		deviceDetail.setGrantAdminTeam(adminTeam);
		deviceDetail.setGrantOrgCode(orgCode);
		deviceDetail.setIsBinding(1);
		deviceDetail.setGrantTime(patientDevice.getCzrq());
		deviceDetail.setApplyDate(DateUtil.getStringDate("yyyy-MM-dd HH:mm:ss"));
		deviceDetail.setOrgName(orgName);
		if (isBind>0){
			deviceDetail.setIsGrant(1);
			deviceDetail.setIsBinding(1);
		}else {
			deviceDetail.setIsGrant(0);
			deviceDetail.setIsBinding(0);
		}
		if (device!=null){
			deviceDetail.setDeviceModel(device.getModel());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.service.app.device;
import com.yihu.device.entity.DeviceDetail;
import com.yihu.wlyy.entity.device.*;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabelInfo;
@@ -13,6 +14,7 @@ import com.yihu.wlyy.repository.deviece.DeviceDao;
import com.yihu.wlyy.repository.deviece.PatientBloodSuggerDao;
import com.yihu.wlyy.repository.deviece.PatientHealthTimeDao;
import com.yihu.wlyy.repository.dict.Icd10DictDao;
import com.yihu.wlyy.repository.dict.SystemDictDao;
import com.yihu.wlyy.repository.doctor.DoctorAdminTeamMemberDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.SignPatientLabelInfoDao;
@@ -110,6 +112,10 @@ public class PatientDeviceService extends BaseService {
    private Icd10DictDao icd10DictDao;
    @Autowired
    private PatientDeviceLogDao patientDeviceLogDao;
    @Autowired
    private DeviceDetailService deviceDetailService;
    @Autowired
    private SystemDictDao systemDictDao;
    //健康问题 高血压
    private static final String gxy = "HP0093";
    //健康问题 糖尿病
@@ -1202,6 +1208,24 @@ public class PatientDeviceService extends BaseService {
            keyType = "2";
        }
        DeviceDetail deviceDetail = deviceDetailDao.findBySn(deviceSn);
        if(deviceDetail==null){
            SignFamily signFamily = signFamilyDao.findByPatient(patientDevice.getUser());
            Long adminTeam=0L;
            String orgCode ="";
            String orgName="";
            String bingCount="";
            if (Integer.valueOf(userType)>0){
                bingCount="{\"1\":\"0\",\"2\":\"0\"}";
            }else {
                bingCount="{\"1\":\"0\"}";
            }
            if (signFamily!=null){
                adminTeam = signFamily.getAdminTeamId();
                orgCode = signFamily.getHospital();
                orgName=signFamily.getHospitalName();
            }
            deviceDetailService.insertDevice(patientDevice,String.valueOf(adminTeam),orgName,orgCode,bingCount,0);
        }
        if (deviceDetail!=null && StringUtils.isNotEmpty(deviceDetail.getBindingCount())){
            JSONObject jsonObject =new JSONObject(String.valueOf(deviceDetail.getBindingCount()));
            if (jsonObject.getInt(keyType)>0){
@@ -1209,10 +1233,6 @@ public class PatientDeviceService extends BaseService {
                msg="设备不是首次绑定";
                code = -20000;
            }
        }else {
            flag=false;
            msg="数据有问题！";
            code= -30000;
        }
        resultMap.put("flag",flag);
        resultMap.put("msg",msg);
@@ -1228,7 +1248,7 @@ public class PatientDeviceService extends BaseService {
     */
    public Map<String,Object> checkBindingDeviceSn(String deviceSn) throws Exception{
        Boolean flag = false;
        String message = "";
        String message = "设备不存在！";
        Integer resultCode = 200;
        Map<String, String> params = new HashMap<>();
        params.put("deviceSn", deviceSn);
@@ -1244,13 +1264,17 @@ public class PatientDeviceService extends BaseService {
            if ("10000".equals(code) || "10001".equals(code)) {
                flag = true;
            }else {
                String sql ="select count(*) num from device.wlyy_devices where device_code = '"+deviceSn+"'";
                Map<String,Object> map  = jdbcTemplate.queryForMap(sql);
                if (Integer.valueOf(String.valueOf(map.get("num")))>0){
                    flag = true ;
                }else {
                    resultCode = -10001;
                    message="没有该设备！";
                String systemValue = systemDictDao.findByDictNameAndCode("ACTIVITY_RANGE","2");
                if (StringUtils.isNotEmpty(systemValue) && "350205".equals(systemValue)){
                    //活动范围在海沧区
                    String sql ="select count(*) num from device.wlyy_devices where device_code = '"+deviceSn+"'";
                    Map<String,Object> map  = jdbcTemplate.queryForMap(sql);
                    if (Integer.valueOf(String.valueOf(map.get("num")))>0){
                        flag = true ;
                    }else {
                        resultCode = -10001;
                        message="没有该设备！";
                    }
                }
            }
        }else {
@@ -1259,14 +1283,14 @@ public class PatientDeviceService extends BaseService {
            flag = false;
        }
        String sql ="select count(*) num from device.wlyy_devices where device_code = '"+deviceSn+"'";
        /*String sql ="select count(*) num from device.wlyy_devices where device_code = '"+deviceSn+"'";
        Map<String,Object> map  = jdbcTemplate.queryForMap(sql);
        if (Integer.valueOf(String.valueOf(map.get("num")))>0){
            flag = true ;
        }else {
            resultCode = -10001;
            message="没有该设备！";
        }
        }*/
        Map<String,Object> map1 = new HashedMap();
        map1.put("code",resultCode);

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

@@ -409,7 +409,7 @@ public class DataHandingService {
                }else if (Integer.valueOf(patientDevice.getUserType())<0){
                    bindCount = "{\"1\":\"1\"}";
                }
                deviceDetailService.insertDevice(patientDevice,String.valueOf(patientDeviceMap.get("admin_team_code")),String.valueOf(patientDeviceMap.get("hospital_name")),String.valueOf(patientDeviceMap.get("hospital")),bindCount);
                deviceDetailService.insertDevice(patientDevice,String.valueOf(patientDeviceMap.get("admin_team_code")),String.valueOf(patientDeviceMap.get("hospital_name")),String.valueOf(patientDeviceMap.get("hospital")),bindCount,1);
            }
        }
        String[] sqlStr = new String[sqlList.size()];