diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/ConnTools.java index cfeeabc..979b80b 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/ConnTools.java @@ -11,9 +11,12 @@ import java.sql.SQLException; */ public class ConnTools { private static String hisDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; - private static String hisUrl = "jdbc:sqlserver://192.168.25.10; DatabaseName=his08"; - private static String hisUser = "ms"; - private static String hisPassword = "llfyhis123."; + // private static String hisUrl = "jdbc:sqlserver://192.168.25.10; DatabaseName=xlhhis"; + // private static String hisUser = "ms"; + // private static String hisPassword = "llfyhis123."; + private static String hisUrl = "jdbc:sqlserver://192.168.5.133; DatabaseName=xlhhis"; + private static String hisUser = "sa"; + private static String hisPassword = "123.com"; public static Connection makeHisConnection() { Connection conn = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index b9f74ac..c2cc339 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -19,6 +19,7 @@ import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -399,13 +400,14 @@ public class PatientMarkHospServiceFacade { public List setPatientIds(PatientMarkRequest patientMarkRequest, PatientsQuery patientsQuery, String hospitalId) { //根据查询号、当前孕周进行查询 - if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { + if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()|| StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { if (null != patientMarkRequest.getcDueWeekStart()) { patientsQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientMarkRequest.getcDueWeekStart() * 7))); } if (null != patientMarkRequest.getcDueWeekEnd()) { patientsQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientMarkRequest.getcDueWeekEnd() * 7) - 6)); } + patientsQuery.setQueryNo(StringUtils.isEmpty(patientMarkRequest.getQueryNo()) ? null : patientMarkRequest.getQueryNo()); patientsQuery.setHospitalId(hospitalId); return patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); } else { @@ -676,8 +678,8 @@ public class PatientMarkHospServiceFacade { parentIds.add(pa.getId()); } patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()])); - } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()||StringUtils.isNotEmpty(patientMarkRequest.getQueryNo())) { + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(new ArrayList()); } if (patientMarkRequest.getType() == 2) {//2-回院提醒 @@ -729,7 +731,7 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setSort("hospit_date"); patientMarkHospQuery.setNeed("y"); patientMarkHospQuery.setOffset(offset); - patientMarkHospQuery.setLimit(100); + patientMarkHospQuery.setLimit(2); patientMarkHospQuery.setPage(page); List patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery); @@ -739,8 +741,8 @@ public class PatientMarkHospServiceFacade { } synUpdateHisData(ps); } - if (patientMarkHospQuery.getCount() > page * 100) { - synLlHisData((page + 1) * 100, page + 1); + if (patientMarkHospQuery.getCount() > page * 2) { + synLlHisData((page + 1) * 2, page + 1); } } @@ -758,11 +760,9 @@ public class PatientMarkHospServiceFacade { String inHospDiagn = map.get("inHospDiagn"); int hospType = getHospitType(inHospDiagn); ps.setHospitStatus(2); - if (ps.getHospitStatus() == null) { - ps.setHospitType(hospType); - } else if (hospType == 1) {//当住院方式为分娩方式时 - ps.setHospitType(hospType); - } + ps.setHospitType(hospType); + String inHospDate = map.get("inHospDate"); + ps.setHospitDate(DateUtil.parseYMDHMS(inHospDate)); } patientMarkHospitalService.updatePatientMarkHospital(ps); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java index ee6037e..cce910a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientMarkRequest.java @@ -41,6 +41,18 @@ public class PatientMarkRequest extends BasePageQueryRequest { * 预约记录创建结束时间 */ private Date makeEndDate; + /** + * 查询号 + */ + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public Integer getType() { return type; diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index afb1b52..b03d894 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -180,6 +180,14 @@ + + + + + + + + @@ -191,7 +199,8 @@ - + +