修改建档记录实体对象

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/vo/PatientArchivesDto.java

@@ -18,8 +18,8 @@ public class PatientArchivesDto {
    private String blood; // 血型
    private String marry; //结婚
    private String adress;  //地址
    private String orgGo;//户口所在地code
    private String orgGoStr;//户口所在地
    private String origo;//户口所在地code
    private String origoStr;//户口所在地
    private String education; //教育水平
    private String occupation; //职业
@@ -108,12 +108,12 @@ public class PatientArchivesDto {
        this.adress = adress;
    }
    public String getOrgGo() {
        return orgGo;
    public String getOrigo() {
        return origo;
    }
    public void setOrgGo(String orgGo) {
        this.orgGo = orgGo;
    public void setOrigo(String origo) {
        this.origo = origo;
    }
    public String getEducation() {
@@ -284,11 +284,11 @@ public class PatientArchivesDto {
        this.sex = sex;
    }
    public String getOrgGoStr() {
        return orgGoStr;
    public String getOrigoStr() {
        return origoStr;
    }
    public void setOrgGoStr(String orgGoStr) {
        this.orgGoStr = orgGoStr;
    public void setOrigoStr(String origoStr) {
        this.origoStr = origoStr;
    }
}

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

@@ -489,10 +489,10 @@ public class PatientInfoService extends BaseService {
        json.put("RESIDENCE","1");//户籍【1.户籍 2.非户籍】
        json.put("NATIONAL",archive.getNation());//民族【NATION_DICT】
        //json.put("ORIGO","350200");//户口所在地【ZONE_DICT】
        if (StringUtils.isEmpty(archive.getOrgGo())){
        if (StringUtils.isEmpty(archive.getOrigo())){
            json.put("ORIGO","350200");//户口所在地【ZONE_DICT】
        }else{
            json.put("ORIGO",archive.getOrgGo());//户口所在地【ZONE_DICT】
            json.put("ORIGO",archive.getOrigo());//户口所在地【ZONE_DICT】
        }
        json.put("BLOOD",archive.getBlood());//血型【1.A型 2.3.O型4.AB型 5.不详】
        json.put("BLOOD_RH","1");//RH阴性【1.否 2.是 3.不详】
@@ -517,10 +517,10 @@ public class PatientInfoService extends BaseService {
        archiveDateBase.setOrgId("0");
        archiveDateBase.setResidence(1);
        archiveDateBase.setNational(archive.getNation());
        if (StringUtils.isEmpty(archive.getOrgGoStr())){
        if (StringUtils.isEmpty(archive.getOrigoStr())){
            archiveDateBase.setOrigo("福建省厦门市");
        }else{
            archiveDateBase.setOrigo(archive.getOrgGoStr());
            archiveDateBase.setOrigo(archive.getOrigoStr());
        }
        archiveDateBase.setBlood(Integer.valueOf(archive.getBlood()));
        archiveDateBase.setBloodRh(1);
@@ -982,10 +982,10 @@ public class PatientInfoService extends BaseService {
        json.put("ORG_ID","0");//新增默认传0
        json.put("RESIDENCE","1");//户籍【1.户籍 2.非户籍】
        json.put("NATIONAL",archive.getNation());//民族【NATION_DICT】
        if (StringUtils.isEmpty(archive.getOrgGo())){
        if (StringUtils.isEmpty(archive.getOrigo())){
            json.put("ORIGO","350200");//户口所在地【ZONE_DICT】
        }else{
            json.put("ORIGO",archive.getOrgGo());//户口所在地【ZONE_DICT】
            json.put("ORIGO",archive.getOrigo());//户口所在地【ZONE_DICT】
        }
        json.put("BLOOD",archive.getBlood());//血型【1.A型 2.3.O型4.AB型 5.不详】
        json.put("BLOOD_RH","1");//RH阴性【1.否 2.是 3.不详】
@@ -1010,10 +1010,10 @@ public class PatientInfoService extends BaseService {
        archiveDataBase.setOrgId("0");
        archiveDataBase.setResidence(1);
        archiveDataBase.setNational(archive.getNation());
        if (StringUtils.isEmpty(archive.getOrgGoStr())){
        if (StringUtils.isEmpty(archive.getOrigoStr())){
            archiveDataBase.setOrigo("福建省厦门市");
        }else {
            archiveDataBase.setOrigo(archive.getOrgGoStr());
            archiveDataBase.setOrigo(archive.getOrigoStr());
        }
        archiveDataBase.setBlood(Integer.valueOf(archive.getBlood()));
        archiveDataBase.setBloodRh(1);

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

@@ -190,7 +190,7 @@ public class DataHandlingController extends BaseController {
    public String deleteEsOldArticlePatient() {
        Map<String, Object> flag = null;
        try {
            flag = eduArticleService.deleteEsOldArticlePatient();
            //flag = eduArticleService.deleteEsOldArticlePatient();
        } catch (Exception e) {
            e.printStackTrace();
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/service/EduArticleService.java

@@ -982,10 +982,6 @@ public class EduArticleService {
        }
        final String firstId = firstIdStr;
        //查询所有患者list
        String patientSql = "SELECT code,name FROM wlyy_patient WHERE status=1";
        List<Map<String,Object>> patientList = jdbcTemplate.queryForList(patientSql);
        //4.获取医生的推送记录
        //String sql = "select * from wlyy_health_edu_article_patient_copy where admin_team_code IS NOT NULL AND batch_no IS NOT NULL AND doctor='" + doctorCode + "'";
        String sql = "select ap.*,p.name AS patientName from wlyy_health_edu_article_patient_copy ap LEFT JOIN wlyy_patient p ON ap.patient = p.code where ap.admin_team_code IS NOT NULL AND ap.batch_no IS NOT NULL AND ap.doctor='"+doctorCode+"'";