jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 12b17904b6f03266c459bfa556975269410cf503

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

在区域妇幼管理---全部孕妇管理---全部产妇管理添加一栏列表“领券社区”,把现有在首次建档医院里的领劵社区和建档医院区分开

Showing 4 changed files with 65 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ 12b1790
... ... @@ -117,6 +117,31 @@
117 117 //分娩时间
118 118 private String dueWeek2;
119 119  
  120 + /**
  121 + * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏,领劵社区
  122 + */
  123 + //初诊时间
  124 + private Date firstCheckTime;
  125 +
  126 + //领劵社区
  127 + private String couponCommunity;
  128 +
  129 + public String getCouponCommunity() {
  130 + return couponCommunity;
  131 + }
  132 +
  133 + public void setCouponCommunity(String couponCommunity) {
  134 + this.couponCommunity = couponCommunity;
  135 + }
  136 +
  137 + public Date getFirstCheckTime() {
  138 + return firstCheckTime;
  139 + }
  140 +
  141 + public void setFirstCheckTime(Date firstCheckTime) {
  142 + this.firstCheckTime = firstCheckTime;
  143 + }
  144 +
120 145 public String getDueWeek2() {
121 146 return dueWeek2;
122 147 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ 12b1790
... ... @@ -6,7 +6,6 @@
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.common.utils.StringUtils;
8 8 import com.lyms.platform.pojo.Patients;
9   -import org.codehaus.jackson.annotate.JsonIgnore;
10 9  
11 10 import java.util.Date;
12 11 import java.util.List;
... ... @@ -112,6 +111,17 @@
112 111 */
113 112 //空或者1为正常 2为补录
114 113 private String normal;
  114 +
  115 + //领劵社区
  116 + private String couponCommunity;
  117 +
  118 + public String getCouponCommunity() {
  119 + return couponCommunity;
  120 + }
  121 +
  122 + public void setCouponCommunity(String couponCommunity) {
  123 + this.couponCommunity = couponCommunity;
  124 + }
115 125  
116 126 public String getNormal() {
117 127 return normal;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java View file @ 12b1790
... ... @@ -12,7 +12,6 @@
12 12 import com.lyms.platform.operate.web.result.HighScoreResult;
13 13 import com.lyms.platform.operate.web.result.QuanChanResult;
14 14 import com.lyms.platform.operate.web.utils.CommonsHelper;
15   -import com.lyms.platform.permission.model.Organization;
16 15 import com.lyms.platform.permission.model.Users;
17 16 import com.lyms.platform.permission.service.OrganizationService;
18 17 import com.lyms.platform.permission.service.UsersService;
... ... @@ -89,6 +88,14 @@
89 88 for (Patients patients : patientses) {
90 89 StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId());
91 90 QuanChanResult chanResult = new QuanChanResult();
  91 + /*********************************************************/
  92 + /**
  93 + * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表
  94 + */
  95 + if (patients.getFirstCheckTime() != null){
  96 + chanResult.setFirstCheckTime(patients.getFirstCheckTime());
  97 + }
  98 + /*********************************************************/
92 99 chanResult.setVcCardNo(patients.getVcCardNo());
93 100 chanResult.setCardNo(patients.getCardNo());
94 101 chanResult.setRemark(patients.getMremark());
95 102  
... ... @@ -230,8 +237,14 @@
230 237 } else {
231 238 chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
232 239 }
  240 + String hname = chanResult.getFirstBH();
  241 + if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  242 + chanResult.setFirstBH("");
  243 + chanResult.setCouponCommunity(hname);
  244 + }
233 245 } catch (Exception e) {
234 246 chanResult.setFirstBH("");
  247 + chanResult.setCouponCommunity("");
235 248 }
236 249 //乡镇/街道
237 250 chanResult.setStreet(CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 12b1790
... ... @@ -75,6 +75,14 @@
75 75 try {
76 76 StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId());
77 77 QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
  78 + /*********************************************************/
  79 + /**
  80 + * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表
  81 + */
  82 + if (patients.getFirstCheckTime() != null){
  83 + quanPatientsResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime()));
  84 + }
  85 + /*********************************************************/
78 86 quanPatientsResult.setVcCardNo(patients.getVcCardNo());
79 87 quanPatientsResult.setCardNo(patients.getCardNo());
80 88 quanPatientsResult.setRemark(patients.getMremark());
81 89  
... ... @@ -252,9 +260,15 @@
252 260 quanPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
253 261 quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
254 262 try {
255   - quanPatientsResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName());
  263 + String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
  264 + if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {
  265 + quanPatientsResult.setFirstBH(hname);
  266 + } else {
  267 + quanPatientsResult.setCouponCommunity(hname);
  268 + }
256 269 } catch (Exception e) {
257 270 quanPatientsResult.setFirstBH("");
  271 + quanPatientsResult.setCouponCommunity("");
258 272 }
259 273  
260 274 quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));