From 2f947cc4176b75593f52e0be50cf63349f89c618 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 27 Jul 2020 16:36:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/MaternalDeliverModel.java | 48 +++++ .../com/lyms/platform/query/MatDeliverQuery.java | 41 ++++ .../java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java | 206 +++++++++++++++++++++ .../hospitalapi/qhdfy/SyncQhdBaseInfoService.java | 105 +++++++++++ .../java/com/lyms/platform/operate/web/Test.java | 5 +- .../operate/web/controller/TestController.java | 23 +-- .../operate/web/facade/MatDeliverFacade.java | 44 ++++- .../web/request/MatdeliverFollowRequest.java | 41 ++++ 8 files changed, 492 insertions(+), 21 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 587ae71..e276ce5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -190,8 +190,56 @@ public class MaternalDeliverModel extends BaseModel { private String streetZJId; private String addressZJ; + /** + * 产后休养地 + */ + private String addressPostRest; + private String provincePostRestId; + private String cityPostRestId; + private String areaPostRestId; + private String streetRegisterId; private String inHospitalNo; + public String getAddressPostRest() { + return addressPostRest; + } + + public void setAddressPostRest(String addressPostRest) { + this.addressPostRest = addressPostRest; + } + + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + + public String getCityPostRestId() { + return cityPostRestId; + } + + public void setCityPostRestId(String cityPostRestId) { + this.cityPostRestId = cityPostRestId; + } + + public String getAreaPostRestId() { + return areaPostRestId; + } + + public void setAreaPostRestId(String areaPostRestId) { + this.areaPostRestId = areaPostRestId; + } + + public String getProvincePostRestId() { + return provincePostRestId; + } + + public void setProvincePostRestId(String provincePostRestId) { + this.provincePostRestId = provincePostRestId; + } + public String getInHospitalNo() { return inHospitalNo; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 72d76e9..12e33c7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -184,6 +184,38 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String areaZJId; private String streetZJId; + + /** + * 产后休养地 + */ + private String provincePostRestId; + private String cityPostRestId; + private String areaPostRestId; + + public String getProvincePostRestId() { + return provincePostRestId; + } + + public void setProvincePostRestId(String provincePostRestId) { + this.provincePostRestId = provincePostRestId; + } + + public String getCityPostRestId() { + return cityPostRestId; + } + + public void setCityPostRestId(String cityPostRestId) { + this.cityPostRestId = cityPostRestId; + } + + public String getAreaPostRestId() { + return areaPostRestId; + } + + public void setAreaPostRestId(String areaPostRestId) { + this.areaPostRestId = areaPostRestId; + } + public Boolean getIsQueryFsHospitalId() { return isQueryFsHospitalId; } @@ -383,6 +415,15 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } } + if (null != provincePostRestId) { + condition = condition.and("provincePostRestId", provincePostRestId, MongoOper.IS); + if (null != cityPostRestId) { + condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS); + if (null != areaPostRestId) { + condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS); + } + } + } if (null != contactResult) { condition = condition.and("contactResult", contactResult, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java new file mode 100644 index 0000000..7978445 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/JDBCUtil.java @@ -0,0 +1,206 @@ +package com.lyms.hospitalapi.qhdfy; + + + +import java.sql.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2016/10/13. + */ +public class JDBCUtil { + + static String oracle_url = "jdbc:oracle:thin:@168.254.0.159:1521:prmi"; + static String oracle_name = "LYMS_QHD_ORG"; + static String oracle_pwd = "LYMS_QHD_ORG"; +// static String oracle_url = "jdbc:oracle:thin:@119.90.57.26:1522:orcl"; +// static String oracle_name = "LYMS_ODS"; +// static String oracle_pwd = "Welcome1"; + + static String mysql_url = "jdbc:mysql://168.254.0.109:3306/platform_cert?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8"; + static String mysql_name = "root"; + static String mysql_pwd = "Lyms@2020"; + + public static Connection getOracleConnection() { + Connection con = null; + try { + Class.forName("oracle.jdbc.driver.OracleDriver"); + String url = oracle_url; + String userName = oracle_name; + String pwd = oracle_pwd; + con = DriverManager.getConnection(url, userName, pwd); + } catch (Exception e) { + e.printStackTrace(); + } + return con; + } + + public static Connection getMysqlConnection() { + Connection con = null; + try { + Class.forName("com.mysql.jdbc.Driver"); + String url = mysql_url; + String userName = mysql_name; + String pwd = mysql_pwd; + con = DriverManager.getConnection(url, userName, pwd); + } catch (Exception e) { + e.printStackTrace(); + } + return con; + } + + public static void closeConnection(Connection connection, Statement ps, ResultSet rs) { + try { + if (rs != null) { + rs.close(); + } + if (ps != null) { + ps.close(); + } + if (null != connection) { + connection.close(); + } + } catch (SQLException e) { + } + } + + /** + * @param sql + * @return + */ + public static List> getOracleListDataBySql(String sql) { + Connection conn = getOracleConnection(); + PreparedStatement pst = null; + ResultSet rs = null; + List> list = new ArrayList<>(); + try { + pst = conn.prepareStatement(sql); + rs = pst.executeQuery(); + int count = rs.getMetaData().getColumnCount(); + while (rs.next()) { + Map maps = new HashMap<>(); + for (int i = 1; i <= count; i++) { + ResultSetMetaData resultSetMetaData = rs.getMetaData(); + String columnName = resultSetMetaData.getColumnName(i); + Integer typeId = resultSetMetaData.getColumnType(i); + Object obj = (typeId != null && Types.DATE == typeId) ? rs.getTimestamp(columnName) : rs.getObject(columnName); + if (obj != null) { + maps.put(columnName, obj); + } else { + maps.put(columnName, null); + } + } + list.add(maps); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeConnection(conn, pst, rs); + } + return list; + } + +// public static void main(String[] args) { +// List> list = getOracleListDataBySql("select last_login_time from USERS t where t.id=1"); +// System.out.println(DateUtil.gety_m_dhm(HsDataUtil.getDate(list.get(0).get("LAST_LOGIN_TIME")))); +// } + + + public static List> getMysqlListDataBySql(String sql) { + Connection conn = getMysqlConnection(); + PreparedStatement pst = null; + ResultSet rs = null; + List> list = new ArrayList<>(); + try { + pst = conn.prepareStatement(sql); + rs = pst.executeQuery(); + int count = rs.getMetaData().getColumnCount(); + while (rs.next()) { + Map maps = new HashMap<>(); + for (int i = 1; i <= count; i++) { + String columnName = rs.getMetaData().getColumnName(i); + Object obj = rs.getObject(columnName); + if (obj != null) { + maps.put(columnName, obj); + } else { + maps.put(columnName, null); + } + } + list.add(maps); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeConnection(conn, pst, rs); + } + return list; + } + + + + + public static int mysqlUpdate(String sql) { + Connection conn = getMysqlConnection(); + Statement pst = null; + ResultSet rs = null; + List> list = new ArrayList<>(); + try { + pst = conn.createStatement(); + return pst.executeUpdate(sql); + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeConnection(conn, pst, rs); + } + return 0; + } + + public static Object getOralceSingleObjBySql(String sql) { + Connection conn = getOracleConnection(); + PreparedStatement pst = null; + ResultSet rs = null; + try { + pst = conn.prepareStatement(sql); + rs = pst.executeQuery(); + int count = rs.getMetaData().getColumnCount(); + for (int i = 1; i <= count; i++) { + String columnName = rs.getMetaData().getColumnName(i); + while (rs.next()) { + return rs.getObject(columnName); + } + + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeConnection(conn, pst, rs); + } + return null; + } + + + public static Object getMysqlSingleObjBySql(String sql) { + Connection conn = getMysqlConnection(); + PreparedStatement pst = null; + ResultSet rs = null; + try { + pst = conn.prepareStatement(sql); + rs = pst.executeQuery(); + int count = rs.getMetaData().getColumnCount(); + for (int i = 1; i <= count; i++) { + String columnName = rs.getMetaData().getColumnName(i); + while (rs.next()) { + return rs.getObject(columnName); + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + closeConnection(conn, pst, rs); + } + return null; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java new file mode 100644 index 0000000..f881a57 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/SyncQhdBaseInfoService.java @@ -0,0 +1,105 @@ +package com.lyms.hospitalapi.qhdfy; + +import com.lyms.hospitalapi.hs.HsDataUtil; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; + +/** + * Created by Administrator on 2020-04-10. + */ +@Service("syncQhdBaseInfoService") +public class SyncQhdBaseInfoService { + + @Autowired + OrganizationService organizationService; + @Autowired + @Qualifier("commonThreadPool") + private ThreadPoolTaskExecutor commonThreadPool; + + + + public static String getString(Object obj) { + return obj == null ? null : String.valueOf(obj); + } + + private static final int BATCH_SIZE = 20; + public void doHandleBirth(String ckNo1,String ckPrefix1) + { + int page = 0; + + //查询孕妇档案 + do { + String sql1 = "SELECT ck_no,ck_prefix from cert_birthnocheck ORDER BY ck_opertime desc limit "+(page * 100)+",100"; + System.out.println(sql1); + List> list = JDBCUtil.getMysqlListDataBySql(sql1); + if (CollectionUtils.isEmpty(list)) + { + System.out.println("查询数据完成"); + break; + } + int batchSize = BATCH_SIZE; + int end = 0; + + //线程数 + int threadCount = list.size() % BATCH_SIZE == 0 ? list.size() / BATCH_SIZE : list.size() / BATCH_SIZE + 1; + + final CountDownLatch countDownLatch = new CountDownLatch(threadCount); + + for (int i = 0; i < list.size(); i += batchSize) { + end = (end + batchSize); + if (end > list.size()) { + end = list.size(); + } + System.out.println("start:" + i + ",end:" + end); + final List> tempList = list.subList(i, end); + commonThreadPool.execute(new Runnable() { + @Override + public void run() { + if (CollectionUtils.isNotEmpty(tempList)) + { + for(Map data : tempList) + { + String ckNo = getString(data.get("ck_no")); + String ckPrefix = getString(data.get("ck_prefix")); + + String sql = "SELECT M.CK_NO,M.CK_PREGDAY,M.CK_BABBYBIRTHDAY,M.CK_PREFIX FROM MOMMY_BIRTHNOCHECK M WHERE M.CK_NO='"+ckNo+"' AND M.CK_PREFIX='"+ckPrefix+"'"; + + List> list1 = JDBCUtil.getOracleListDataBySql(sql); + if (CollectionUtils.isNotEmpty(list1)) + { + Map obj = list1.get(0); + Date birth = HsDataUtil.getDate(obj.get("CK_BABBYBIRTHDAY")); + String day = HsDataUtil.getString(obj.get("CK_PREGDAY")); + System.out.println(DateUtil.getyyyy_MM_dd_hms(birth)); + int count = JDBCUtil.mysqlUpdate(" update cert_birthnocheck set ck_pregday=" + day + ",ck_babbybirthday='" + DateUtil.getyyyy_MM_dd_hms(birth) + "' where ck_no='" + ckNo + "' and ck_prefix='" + ckPrefix + "'"); + System.out.println("update count "+count); + + } + } + } + countDownLatch.countDown(); + } + }); + } + page++; + try { + countDownLatch.await(); + Thread.sleep(5000); + } catch (InterruptedException e) { + } + }while (true); + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 7bfbb53..85c2090 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,6 +1,5 @@ //package com.lyms.platform.operate.web; // -//import org.apache.commons.lang.StringUtils; //import org.apache.http.HttpEntity; //import org.apache.http.client.ClientProtocolException; //import org.apache.http.client.config.RequestConfig; @@ -30,7 +29,7 @@ // File[] files = dir.listFiles(); // for (File file : files) // { -// upload("https://cert-chengde-api.healthbaby.com.cn:12356/cp/common/importSignature", file, file.getName()); +// upload("https://cert-qhd-api.healthbaby.com.cn:18020/cp/common/importSignature", file, file.getName()); // Thread.sleep(TIME); // } // } @@ -46,7 +45,7 @@ // StringBody comment = new StringBody(filename, ContentType.TEXT_PLAIN); // HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", bin).addPart("filename", comment).build(); // httppost.setEntity(reqEntity); -// httppost.setHeader("Authorization","b625adb730344cb5967f88e5e9ea8ad3"); +// httppost.setHeader("Authorization","18674e5b23b200f86a6210ea2f1006a8"); // CloseableHttpResponse response = httpclient.execute(httppost); // try { // System.out.println(response.getStatusLine()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 7402429..de8babe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSON; import com.lyms.hospitalapi.Cdfy.CdGwInterface; import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyFmService; -import com.lyms.hospitalapi.lcdcf.LcdcfFmService; -import com.lyms.hospitalapi.llfy.LlfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; +import com.lyms.hospitalapi.qhdfy.SyncQhdBaseInfoService; import com.lyms.hospitalapi.rcfy.RcGlxtService; import com.lyms.hospitalapi.zcfy.ZcPrenatalService; import com.lyms.platform.biz.JdbcUtil; @@ -27,10 +26,7 @@ import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.SyncDataTaskService; -import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.operate.web.utils.QhdvcCardNoUtils; import com.lyms.platform.operate.web.worker.*; -import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; @@ -39,7 +35,6 @@ import com.mongodb.Mongo; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.authentication.UserCredentials; @@ -57,12 +52,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.File; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; import java.util.*; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; /** * Created by Zhang.Rui on 2016/4/8. @@ -125,6 +115,8 @@ public class TestController extends BaseController { @Autowired private QhdfyFmService qhdfyFmService; + @Autowired + private SyncQhdBaseInfoService syncQhdBaseInfoService; @Autowired private DzfyFmService dzfyFmService; @@ -1527,6 +1519,15 @@ public class TestController extends BaseController { return "syncFmData finish"; } + + + @RequestMapping(value = "/setQhdbabyBirth", method = RequestMethod.GET) + @ResponseBody + public String setQhdbabyBirth(@RequestParam(required = true) String start, @RequestParam(required = true) String end) { + syncQhdBaseInfoService.doHandleBirth(start, end); + return "setQhdbabyBirth finish"; + } + @RequestMapping(value = "/syncFmBySyxh", method = RequestMethod.GET) @ResponseBody public String syncFmBySyxh(@RequestParam(required = true) String start, @RequestParam(required = true) String end, @RequestParam(required = false) String syxh) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index e467836..8359175 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -325,11 +325,21 @@ public class MatDeliverFacade { maternalDeliverModel.setFsHospital(postHosptial); } }*/ + + //访视机构 String townOrgId = patients2.getTownOrgId(); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(townOrgId)) { maternalDeliverModel.setFsHospital(townOrgId); } + //设置产后访视的地址 + maternalDeliverModel.setProvincePostRestId(patients2.getProvincePostRestId() != null ? patients2.getProvincePostRestId() : patients2.getProvinceRegisterId()); + maternalDeliverModel.setCityPostRestId(patients2.getCityPostRestId() != null ? patients2.getCityPostRestId() : patients2.getCityRegisterId()); + maternalDeliverModel.setAreaPostRestId(patients2.getAreaPostRestId() != null ? patients2.getAreaPostRestId() : patients2.getAreaRegisterId()); + maternalDeliverModel.setStreetRegisterId(patients2.getStreetPostRestId() != null ? patients2.getStreetPostRestId() : patients2.getStreetRegisterId()); + maternalDeliverModel.setAddressPostRest(patients2.getAddressPostRest() != null ? patients2.getAddressPostRest() : patients2.getAddressRegister()); + + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate()); matDeliverQuery.setParentId(null); matDeliverQuery.setPid(patients2.getPid()); @@ -1939,15 +1949,25 @@ public class MatDeliverFacade { // 访视列表无需加上分娩医院，因此注释 //matDeliverQuery.setFmHospitalList(hospitalList); - matDeliverQuery.setFsHospitalId(hospitalId); - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) { - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { - matDeliverQuery.setIsQueryFsHospitalId(true); - matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); + + + if (matdeliverFollowRequest.getFlag() != null) + { + matDeliverQuery.setProvincePostRestId(matdeliverFollowRequest.getProvincePostRestId()); + matDeliverQuery.setCityPostRestId(matdeliverFollowRequest.getCityPostRestId()); + matDeliverQuery.setAreaPostRestId(matdeliverFollowRequest.getAreaPostRestId()); + } + else + { + matDeliverQuery.setFsHospitalId(hospitalId); + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) { + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { + matDeliverQuery.setIsQueryFsHospitalId(true); + matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); + } } } - matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); if (matdeliverFollowRequest.getContactReason() != null) { matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId()); @@ -2052,7 +2072,17 @@ public class MatDeliverFacade { matdeliverFollowListResult.setPostViewDay(DateUtil.daysBetween(patients.getFmDate(), new Date()) + "天"); // 居住地 - matdeliverFollowListResult.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + if (matdeliverFollowRequest.getFlag() == null) + { + matdeliverFollowListResult.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + } + else + { + //产后休养地 + matdeliverFollowListResult.setPostpartumAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService)); + } + + // 电话转换 matdeliverFollowListResult.setPhone(patients.getPhone()); //姓名 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index 26dd267..92b9991 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -138,6 +138,47 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ private String areaZJId; private String streetZJId; + + //产后休养地址 + private String provincePostRestId; + private String cityPostRestId; + private String areaPostRestId; + + //空表示查询的是原来的追访模式，即根据建档选择的访视机构来访视，1，市， 2 区 + private Integer flag; + + public String getProvincePostRestId() { + return provincePostRestId; + } + + public void setProvincePostRestId(String provincePostRestId) { + this.provincePostRestId = provincePostRestId; + } + + public String getCityPostRestId() { + return cityPostRestId; + } + + public void setCityPostRestId(String cityPostRestId) { + this.cityPostRestId = cityPostRestId; + } + + public Integer getFlag() { + return flag; + } + + public void setFlag(Integer flag) { + this.flag = flag; + } + + public String getAreaPostRestId() { + return areaPostRestId; + } + + public void setAreaPostRestId(String areaPostRestId) { + this.areaPostRestId = areaPostRestId; + } + public String getProvinceZJId() { return provinceZJId; } -- 1.8.3.1