Commit fdf6cf6f3b03615216b53d560934930c83558e3e
1 parent
e1b0e7e79e
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 11 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
fdf6cf6
| ... | ... | @@ -1883,10 +1883,8 @@ |
| 1883 | 1883 | //matDeliverQuery.setFmHospitalList(hospitalList); |
| 1884 | 1884 | |
| 1885 | 1885 | matDeliverQuery.setFsHospitalId(hospitalId); |
| 1886 | - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) | |
| 1887 | - { | |
| 1888 | - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) | |
| 1889 | - { | |
| 1886 | + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) { | |
| 1887 | + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { | |
| 1890 | 1888 | matDeliverQuery.setIsQueryFsHospitalId(true); |
| 1891 | 1889 | matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); |
| 1892 | 1890 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MatDeliverWorker.java
View file @
fdf6cf6
| ... | ... | @@ -15,22 +15,22 @@ |
| 15 | 15 | import java.util.concurrent.atomic.AtomicInteger; |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | + * | |
| 18 | 19 | * @Author dongqin |
| 19 | 20 | * @Description 分娩导出 |
| 20 | 21 | * @Date 8:42 2019/5/24 |
| 21 | 22 | */ |
| 22 | 23 | |
| 23 | -public class MatDeliverWorker implements Runnable { | |
| 24 | +public class MatDeliverWorker implements Runnable{ | |
| 24 | 25 | private PatientsService patientsService; |
| 25 | 26 | private ChildbirthManagerQueryModel queryModel; |
| 26 | 27 | private BasicConfigService basicConfigService; |
| 27 | 28 | private AntenatalExaminationFacade antenatalExaminationFacade; |
| 28 | 29 | private List<Map<String, Object>> list; |
| 29 | 30 | private AtomicInteger atomicInteger; |
| 30 | - | |
| 31 | 31 | public MatDeliverWorker(PatientsService patientsService, ChildbirthManagerQueryModel queryModel, |
| 32 | 32 | BasicConfigService basicConfigService, AntenatalExaminationFacade antenatalExaminationFacade, |
| 33 | - List<Map<String, Object>> list, AtomicInteger atomicInteger) { | |
| 33 | + List<Map<String, Object>> list, AtomicInteger atomicInteger){ | |
| 34 | 34 | this.patientsService = patientsService; |
| 35 | 35 | this.queryModel = queryModel; |
| 36 | 36 | this.basicConfigService = basicConfigService; |
| ... | ... | @@ -44,7 +44,7 @@ |
| 44 | 44 | public void run() { |
| 45 | 45 | try { |
| 46 | 46 | setExcelDate(); |
| 47 | - } catch (Exception t) { | |
| 47 | + }catch (Exception t){ | |
| 48 | 48 | t.fillInStackTrace(); |
| 49 | 49 | } |
| 50 | 50 | |
| ... | ... | @@ -68,8 +68,7 @@ |
| 68 | 68 | //居住地 |
| 69 | 69 | String liveAddress = CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), |
| 70 | 70 | patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService); |
| 71 | - | |
| 72 | - map.put("regAddress", liveAddress); | |
| 71 | + map.put("liveAddress", liveAddress); | |
| 73 | 72 | String regAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), |
| 74 | 73 | patients.getCityRegisterId(), |
| 75 | 74 | patients.getAreaRegisterId(), |
| ... | ... | @@ -77,7 +76,7 @@ |
| 77 | 76 | patients.getAddressRegister(), |
| 78 | 77 | basicConfigService); |
| 79 | 78 | |
| 80 | - map.put("liveAddress", regAddress); | |
| 79 | + map.put("regAddress", regAddress); | |
| 81 | 80 | map.put("phone", queryModel.getPhone()); |
| 82 | 81 | |
| 83 | 82 | if (null == queryModel.getGravidity()) { |
| 84 | 83 | |
| 85 | 84 | |
| ... | ... | @@ -259,17 +258,16 @@ |
| 259 | 258 | |
| 260 | 259 | /** |
| 261 | 260 | * 获取 + 阳性/ - 阴性 |
| 262 | - * | |
| 263 | 261 | * @param amy |
| 264 | 262 | * @param key |
| 265 | 263 | * @return |
| 266 | 264 | */ |
| 267 | 265 | private String getMyzdVal(Map<String, Object> amy, String key) { |
| 268 | 266 | String str = ""; |
| 269 | - if (amy != null && amy.size() > 0) { | |
| 267 | + if (amy != null && amy.size() > 0){ | |
| 270 | 268 | Object object = amy.get(key); |
| 271 | - if (object != null) { | |
| 272 | - if (object instanceof String) { | |
| 269 | + if (object != null){ | |
| 270 | + if (object instanceof String){ | |
| 273 | 271 | str = object.toString(); |
| 274 | 272 | } |
| 275 | 273 | } |
platform-operate-api/src/main/resources/fm_record.xls
View file @
fdf6cf6