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

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/archive/Archive.java

@@ -19,7 +19,7 @@ public class Archive extends IdEntity {
    private String doctorCode;// 医生code
    private int archiveStatus;//档案状态【1.未管理 2.死亡 3.正常 4.高危】【必填】
    private String archiveTime;//建档时间
    private int signStatus;// 签约状态【0未签约，1已签约】
    //private int signStatus;// 签约状态【0未签约，1已签约】
    private String birthday;// 生日
    private int sickSex;//性别【1.男 2.女 9 未知】
    private String jwZoneCode;//所属社区
@@ -92,14 +92,6 @@ public class Archive extends IdEntity {
        this.archiveTime = archiveTime;
    }
    public int getSignStatus() {
        return signStatus;
    }
    public void setSignStatus(int signStatus) {
        this.signStatus = signStatus;
    }
    public String getBirthday() {
        return birthday;
    }

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java

@@ -51,7 +51,6 @@ public class Data2Save {
        //没维度
        for (AdminTeam adminTeam : teams) {
            SaveModel saveModel = new SaveModel();
            saveModel.setCity("350200");
            saveModel.setCityName("厦门市");
@@ -68,16 +67,25 @@ public class Data2Save {
            saveModel.setQuotaDate(quotaDate);
            saveModel.setResult1(0.0);
            saveModel.setResult2(0.0);
            //设置没有维度的数据
            if (dimensionQuotas==null || dimensionQuotas.size()==0){
                DataModel dataModel = dataModelMap.get(adminTeam.getId().toString());
                if (dataModel!=null){
                    saveModel.setResult1(dataModel.getResult1());
                    saveModel.setResult2(dataModel.getResult1());
                }
            }
            savelist.add(saveModel);
        }
        //如果有维度就设置维度的数据
        for (int i = 0; i < dimensionQuotas.size(); i++) {
            String dictSql = dimensionQuotas.get(i).getDictSql();
            List<DictModel> dictModels = jdbcTemplate.query(dictSql, new BeanPropertyRowMapper(DictModel.class));
            int savleKeyNum = i + 1;
            savelist = setSlaveKey(savleKeyNum, savelist, dictModels,dataModelMap,dimensionQuotas.size());
        if (dimensionQuotas!=null && dimensionQuotas.size()>0){
            //如果有维度就设置维度的数据
            for (int i = 0; i < dimensionQuotas.size(); i++) {
                String dictSql = dimensionQuotas.get(i).getDictSql();
                List<DictModel> dictModels = jdbcTemplate.query(dictSql, new BeanPropertyRowMapper(DictModel.class));
                int savleKeyNum = i + 1;
                savelist = setSlaveKey(savleKeyNum, savelist, dictModels,dataModelMap,dimensionQuotas.size());
            }
        }
        return savelist;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -433,12 +433,6 @@ public class PatientInfoService extends BaseService {
            archive.setArchiveOperatorName(doctorObj.getName());
        }
        archive.setArchiveTime(DateUtil.getStringDateShort());
        int isSign = signFamilyDao.hasSingStatus(p.getIdcard());
        if (isSign>0){
            archive.setSignStatus(1);
        }else{
            archive.setSignStatus(0);
        }
        archive.setArchiveStatus(3);
        archive.setSickSex(p.getSex());
        archive.setBirthday(brithday);
@@ -512,12 +506,6 @@ public class PatientInfoService extends BaseService {
            archiveDateBase.setArchiveOperatorName(doctorObj.getName());
        }
        archiveDateBase.setArchiveTime(DateUtil.getStringDateShort());
        int isSign = signFamilyDao.hasSingStatus(p.getIdcard());
        if (isSign>0){
            archiveDateBase.setSignStatus(1);
        }else{
            archiveDateBase.setSignStatus(0);
        }
        archiveDateBase.setArchiveStatus(3);
        archiveDateBase.setSickSex(p.getSex());
        archiveDateBase.setBirthday(archive.getBrithday());
@@ -991,12 +979,6 @@ public class PatientInfoService extends BaseService {
            archiveDataBase.setArchiveOperatorName(doctorObj.getName());
        }
        archiveDataBase.setArchiveTime(DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
        int isSign = signFamilyDao.hasSingStatus(p.getIdcard());
        if (isSign>0){
            archiveDataBase.setSignStatus(1);
        }else{
            archiveDataBase.setSignStatus(0);
        }
        archiveDataBase.setArchiveStatus(3);
        archiveDataBase.setSickSex(p.getSex());
        archiveDataBase.setBirthday(archive.getBrithday());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/archives/PatientArchiveInfoService.java

@@ -9,6 +9,7 @@ import com.yihu.wlyy.repository.address.CityDao;
import com.yihu.wlyy.repository.address.CountryDao;
import com.yihu.wlyy.repository.archive.PatientArchiveDao;
import com.yihu.wlyy.repository.dict.SystemDictDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,8 @@ public class PatientArchiveInfoService {
    private CountryDao countryDao;
    @Autowired
    private CityDao cityDao;
    @Autowired
    private SignFamilyDao signFamilyDao;
    /**
@@ -56,7 +59,6 @@ public class PatientArchiveInfoService {
                " a.sick_name AS sickName, " +
                " a.identity_card_no AS identityCardNo, " +
                " a.archive_time archiveTime, " +
                " a.sign_status AS signStatus, " +
                " c.name AS zoneName, " +
                " c.code AS zoneCode, " +
                " c.jw_code AS jwZoneCode " +
@@ -83,6 +85,13 @@ public class PatientArchiveInfoService {
        int start = (pageNo-1)*pageSize;
        sql += " ORDER BY a.archive_time DESC limit ?,?";
        archiveInfoList = jdbcTemplate.queryForList(sql,new Object[]{start,pageSize});
        for (Map<String,Object> map : archiveInfoList){
            if (signFamilyDao.hasSingStatus(String.valueOf(map.get("identityCardNo")))>0){
                map.put("signStatus",1);
            }else{
                map.put("signStatus",0);
            }
        }
        return  archiveInfoList;
    }
@@ -159,6 +168,14 @@ public class PatientArchiveInfoService {
                }
            }
        }
        //查看是否已经签约
        int signCount = signFamilyDao.hasSingStatus(archiveInfoDto.getIdentityCardNo());
        if (signCount>0){
            archiveInfoDto.setSignStatus(1);
        }else{
            archiveInfoDto.setSignStatus(0);
        }
        return archiveInfoDto;
    }
}