Commit f59274a8a7b6ae6946c1f9c9cfec87e3de9e22bd
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
f59274a
| ... | ... | @@ -407,7 +407,8 @@ |
| 407 | 407 | public boolean isZyRange(String certNo) |
| 408 | 408 | { |
| 409 | 409 | Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeClConnection(); |
| 410 | - try { | |
| 410 | + try | |
| 411 | + { | |
| 411 | 412 | QueryRunner queryRunner = new QueryRunner(); |
| 412 | 413 | List<MeasurePatientInfo> list = queryRunner.query(conn, " select ZJH as certNo,XM as userName,NL as age,XB as sex, SJH as phone,INP_NO as zyNo,VISIT_ID as visitId,PATIENT_ID as patientId,DZ as address,RYSJ as inDate,CYSJ as outDate from lyms " + |
| 413 | 414 | " where ZJH='"+certNo+"' order by RYSJ desc ", new BeanListHandler<MeasurePatientInfo>(MeasurePatientInfo.class)); |
| ... | ... | @@ -421,7 +422,9 @@ |
| 421 | 422 | catch (Exception e) |
| 422 | 423 | { |
| 423 | 424 | ExceptionUtils.catchException(e,"查询基本信息出错"); |
| 424 | - }finally { | |
| 425 | + } | |
| 426 | + finally | |
| 427 | + { | |
| 425 | 428 | DbUtils.closeQuietly(conn); |
| 426 | 429 | } |
| 427 | 430 | return false; |
| ... | ... | @@ -473,7 +476,9 @@ |
| 473 | 476 | catch (Exception e) |
| 474 | 477 | { |
| 475 | 478 | ExceptionUtils.catchException(e,"查询基本信息出错"); |
| 476 | - }finally { | |
| 479 | + } | |
| 480 | + finally | |
| 481 | + { | |
| 477 | 482 | DbUtils.closeQuietly(conn); |
| 478 | 483 | } |
| 479 | 484 | return result; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
f59274a
| ... | ... | @@ -4025,6 +4025,8 @@ |
| 4025 | 4025 | map.put("husbandCardNo", data.getHcertificateNum()); |
| 4026 | 4026 | map.put("husbandPhone", data.getHusbandPhone()); |
| 4027 | 4027 | |
| 4028 | + map.put("hworkUnit",data.getHworkUnit()); | |
| 4029 | + | |
| 4028 | 4030 | br.setData(map); |
| 4029 | 4031 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 4030 | 4032 | br.setErrormsg("成功"); |