jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 40fe2e3b4c19ce9398bc3b72774afcd1d9319253

Authored by liquanyu
1 parent 93a20c8f73
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 18 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 40fe2e3
... ... @@ -1577,12 +1577,12 @@
1577 1577  
1578 1578 public static void main(String[] args) {
1579 1579  
1580   - Date last = parseDate("2020-02-29");
  1580 + Date bir = parseYMD("1992-03-29");
  1581 + Date bir1 = parseYMD("2020-03-29");
1581 1582  
  1583 + Integer i = getAge(bir, bir1);
  1584 + System.out.println(i);
1582 1585  
1583   - Date st = DateUtil.addDay(last, 280);
1584   -
1585   - System.out.println(getyyyy_MM_dd(st));
1586 1586 }
1587 1587  
1588 1588 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ 40fe2e3
... ... @@ -1016,7 +1016,7 @@
1016 1016 public String queryPatientCardNoByBlNo(String blNo) {
1017 1017  
1018 1018 Connection conn = null;
1019   - String sql = "select blh,syxh,hzxm,birth,birthtime,sex from VW_LYMS_XSE_BRSYK where ";
  1019 + String sql = "select sfzh as cardNo from VW_LYMS_XSE_BRSYK where blh='"+blNo+"'";
1020 1020 try {
1021 1021  
1022 1022 conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 40fe2e3
... ... @@ -205,13 +205,16 @@
205 205 patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
206 206 }
207 207  
208   - List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  208 + //List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  209 +
  210 + List<Patients> patientsList = patientsService.queryPatient1(patientsQuery, "created");
  211 +
209 212 if (patientsList == null || patientsList.size() == 0) {
210 213 dischargeAbstractQueryResult.setStatus("0");
211 214 dischargeAbstractQueryResult.setErrormsg("没有孕妇或产妇档案");
212 215 return dischargeAbstractQueryResult;
213 216 }
214   - Patients patients = patientsList.get(patientsList.size() - 1);
  217 + Patients patients = patientsList.get(0);
215 218  
216 219 if (new Integer(1).equals(patients.getDueStatus())) {
217 220 // 终止妊娠不能进行出院小结
... ... @@ -242,11 +245,11 @@
242 245 }
243 246  
244 247  
245   - if (!hospitalId.equals(patients.getFmHospital())) {
246   - dischargeAbstractQueryResult.setStatus("6");
247   - dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
248   - return dischargeAbstractQueryResult;
249   - }
  248 +// if (!hospitalId.equals(patients.getFmHospital())) {
  249 +// dischargeAbstractQueryResult.setStatus("6");
  250 +// dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
  251 +// return dischargeAbstractQueryResult;
  252 +// }
250 253  
251 254 BeanUtils.copy(patients, dischargeAbstractQueryResult);
252 255 dischargeAbstractQueryResult.setPatientId(patients.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 40fe2e3
... ... @@ -6283,7 +6283,9 @@
6283 6283 List<Patients> list;
6284 6284 String patientId = getPatientId(idCard);
6285 6285 if (StringUtils.isNotEmpty(patientId)) {
6286   - list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
  6286 + //list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId).and("hospitalId").is(hospitalId)), Patients.class);
  6287 +
  6288 + list = mongoTemplate.find(Query.query(Criteria.where("id").is(patientId)), Patients.class);
6287 6289 } else {
6288 6290 list = patientsService.queryPatient1(patientsQuery, "created");
6289 6291 }