jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1c25322b6b97e97afb78bb6fd65c063e26d99cb6

Authored by wtt
2 parents 270c3fa9de 8deb15d813
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1c25322
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.hospitalapi.zcfy.ZcPrenatalService;
5 5 import com.lyms.platform.beans.MsgRequest;
6 6 import com.lyms.platform.biz.SequenceConstant;
  7 +import com.lyms.platform.biz.dal.ISieveDao;
7 8 import com.lyms.platform.biz.service.*;
8 9 import com.lyms.platform.common.constants.ErrorCodeConstants;
9 10 import com.lyms.platform.common.dao.operator.MongoQuery;
... ... @@ -147,6 +148,9 @@
147 148 @Autowired
148 149 private AreaCountFacade areaCountFacade;
149 150  
  151 + @Autowired
  152 + private ISieveDao sieveDao;
  153 +
150 154 /**
151 155 * 处理区域隐藏建档
152 156 *
... ... @@ -306,6 +310,7 @@
306 310 patientsService.validata(p);
307 311 }
308 312  
  313 +
309 314 if (StringUtils.isNotEmpty(antExAddRequest.getId())) {
310 315 model.setHospitalId(hospitalId);
311 316 model.setOperator(userId);
... ... @@ -334,6 +339,20 @@
334 339 Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
335 340 model.setPid(patients.getPid());
336 341  
  342 + /**
  343 + * 承德区域 产筛状态修改
  344 + * */
  345 + if (null != antExAddRequest.getScreeningState() && StringUtils.isNotEmpty(antExAddRequest.getParentId())) {
  346 + SieveQuery sieveQuery = new SieveQuery();
  347 + sieveQuery.setYn(YnEnums.YES.getId());
  348 + sieveQuery.setParentId(antExAddRequest.getParentId());
  349 + List<SieveModel> sieveModels = sieveDao.queryList(sieveQuery.convertToQuery());
  350 + for (SieveModel sieveModel : sieveModels) {
  351 + sieveModel.setStatus(antExAddRequest.getScreeningState());
  352 + sieveDao.updateChanQianSieve(sieveModel);
  353 + }
  354 + }
  355 +
337 356 antenatalExaminationService.addOneBabyAnt(model);
338 357  
339 358 /** 验证产检券是否可用 可用就改为已使用状态 */
... ... @@ -680,6 +699,21 @@
680 699 applyOrderService.updateByParentId(referralApplyOrderQuery2, model);
681 700 }
682 701 }
  702 + /**
  703 + * 承德区域 产筛状态修改
  704 + * */
  705 + if (null != excAddRequest.getScreeningState() && StringUtils.isNotEmpty(excAddRequest.getParentId())) {
  706 + SieveQuery sieveQuery = new SieveQuery();
  707 + sieveQuery.setYn(YnEnums.YES.getId());
  708 + sieveQuery.setParentId(excAddRequest.getParentId());
  709 + List<SieveModel> sieveModels = sieveDao.queryList(sieveQuery.convertToQuery());
  710 + for (SieveModel sieveModel : sieveModels) {
  711 + sieveModel.setStatus(excAddRequest.getScreeningState());
  712 + sieveDao.updateChanQianSieve(sieveModel);
  713 + }
  714 + }
  715 +
  716 +
683 717 //初诊是添加追访记录
684 718 addTrackDownInfo(userId, patients);
685 719 } else {
... ... @@ -2917,8 +2951,8 @@
2917 2951 // 添加增值服务mane list显示至前端
2918 2952 List<PatientService> patientServiceList = patientServiceService.getServiceListByParentId(patients.getId(), 1);
2919 2953 ArrayList<String> serTypeNameList = new ArrayList<>();
2920   - if (CollectionUtils.isNotEmpty(patientServiceList)){
2921   - for (PatientService patientService: patientServiceList){
  2954 + if (CollectionUtils.isNotEmpty(patientServiceList)) {
  2955 + for (PatientService patientService : patientServiceList) {
2922 2956 Integer serType = patientService.getSerType();
2923 2957 String serTypeName = areaCountFacade.getSerTypeName(serType.toString());
2924 2958 serTypeNameList.add(serTypeName);
... ... @@ -3105,7 +3139,6 @@
3105 3139 antenatalExaminationResult.setTireData(examinationModel.getTireData());
3106 3140  
3107 3141  
3108   -
3109 3142 object = antenatalExaminationResult;
3110 3143 } else {
3111 3144 //查询初诊数据
... ... @@ -3236,7 +3269,6 @@
3236 3269 antexChuResult.setNdbSelect(antExChuModel.getNdbSelect());
3237 3270 antexChuResult.setNdbSelectOtherVal(antExChuModel.getNdbSelectOtherVal());
3238 3271 antexChuResult.setPlacentas(antExChuModel.getPlacentas());
3239   -
3240 3272  
3241 3273  
3242 3274 object = antexChuResult;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 1c25322
... ... @@ -288,7 +288,7 @@
288 288 private String edemaSelect;
289 289 /**
290 290 * 胎数 1-未测 2-拒测
291   - */
  291 + */
292 292 private String tireNumberSelect;
293 293 /**
294 294 * 胎动选项 1-未测 2-拒测
... ... @@ -315,6 +315,20 @@
315 315 */
316 316 private String ndbSelectOtherVal;
317 317  
  318 + /**
  319 + * 承德环境 产筛字段添加
  320 + */
  321 +
  322 + private Integer screeningState;
  323 +
  324 + public Integer getScreeningState() {
  325 + return screeningState;
  326 + }
  327 +
  328 + public void setScreeningState(Integer screeningState) {
  329 + this.screeningState = screeningState;
  330 + }
  331 +
318 332 public String getFuweiSelect() {
319 333 return fuweiSelect;
320 334 }
321 335  
322 336  
323 337  
324 338  
325 339  
326 340  
327 341  
... ... @@ -1213,28 +1227,28 @@
1213 1227 examinationModel.setTgAb(df.format(tgAb));
1214 1228 }
1215 1229  
1216   - if (StringUtils.isNotEmpty(fuweiSelect)){
  1230 + if (StringUtils.isNotEmpty(fuweiSelect)) {
1217 1231 examinationModel.setFuweiSelect(fuweiSelect);
1218 1232 }
1219   - if (StringUtils.isNotEmpty(edemaSelect)){
  1233 + if (StringUtils.isNotEmpty(edemaSelect)) {
1220 1234 examinationModel.setEdemaSelect(edemaSelect);
1221 1235 }
1222   - if (StringUtils.isNotEmpty(tireNumberSelect)){
  1236 + if (StringUtils.isNotEmpty(tireNumberSelect)) {
1223 1237 examinationModel.setTireNumberSelect(tireNumberSelect);
1224 1238 }
1225   - if (StringUtils.isNotEmpty(quickenSelect)){
  1239 + if (StringUtils.isNotEmpty(quickenSelect)) {
1226 1240 examinationModel.setQuickenSelect(quickenSelect);
1227 1241 }
1228   - if (StringUtils.isNotEmpty(xhdbSelect)){
  1242 + if (StringUtils.isNotEmpty(xhdbSelect)) {
1229 1243 examinationModel.setXhdbSelect(xhdbSelect);
1230 1244 }
1231   - if (StringUtils.isNotEmpty(xhdbSelectOtherVal)){
  1245 + if (StringUtils.isNotEmpty(xhdbSelectOtherVal)) {
1232 1246 examinationModel.setXhdbSelectOtherVal(xhdbSelectOtherVal);
1233 1247 }
1234   - if (StringUtils.isNotEmpty(ndbSelect)){
  1248 + if (StringUtils.isNotEmpty(ndbSelect)) {
1235 1249 examinationModel.setNdbSelect(ndbSelect);
1236 1250 }
1237   - if (StringUtils.isNotEmpty(ndbSelectOtherVal)){
  1251 + if (StringUtils.isNotEmpty(ndbSelectOtherVal)) {
1238 1252 examinationModel.setNdbSelectOtherVal(ndbSelectOtherVal);
1239 1253 }
1240 1254  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 1c25322
... ... @@ -250,7 +250,6 @@
250 250 private String yghxkt;
251 251  
252 252  
253   -
254 253 // 乙肝表面抗原
255 254 private String ygbmkyValue;
256 255 //乙肝表面抗体
... ... @@ -427,6 +426,19 @@
427 426 */
428 427 private String ndbSelectOtherVal;
429 428  
  429 + /**
  430 + * 承德环境 添加字段
  431 + */
  432 + private Integer screeningState;
  433 +
  434 + public Integer getScreeningState() {
  435 + return screeningState;
  436 + }
  437 +
  438 + public void setScreeningState(Integer screeningState) {
  439 + this.screeningState = screeningState;
  440 + }
  441 +
430 442 public String getQuickenSelect() {
431 443 return quickenSelect;
432 444 }
... ... @@ -1984,6 +1996,7 @@
1984 1996 antExChuModel.setHivktSelect(hivktSelect);
1985 1997 antExChuModel.setSyjgSelect(syjgSelect);
1986 1998 antExChuModel.setInfectDiseases(JsonUtil.obj2JsonString(infectDiseases));
  1999 +
1987 2000 // //早孕期病毒检测
1988 2001 // private String zyqbd;
1989 2002 // //nt检查
1990 2003  
1991 2004  
1992 2005  
1993 2006  
1994 2007  
1995 2008  
1996 2009  
... ... @@ -2150,28 +2163,28 @@
2150 2163 antExChuModel.setMonthCompliance(monthCompliance);
2151 2164 antExChuModel.setPregnancyExcpetion(pregnancyExcpetion);
2152 2165  
2153   - if (StringUtils.isNotEmpty(fuweiSelect)){
  2166 + if (StringUtils.isNotEmpty(fuweiSelect)) {
2154 2167 antExChuModel.setFuweiSelect(fuweiSelect);
2155 2168 }
2156   - if (StringUtils.isNotEmpty(edemaSelect)){
  2169 + if (StringUtils.isNotEmpty(edemaSelect)) {
2157 2170 antExChuModel.setEdemaSelect(edemaSelect);
2158 2171 }
2159   - if (StringUtils.isNotEmpty(tireNumberSelect)){
  2172 + if (StringUtils.isNotEmpty(tireNumberSelect)) {
2160 2173 antExChuModel.setTireNumberSelect(tireNumberSelect);
2161 2174 }
2162   - if (StringUtils.isNotEmpty(quickenSelect)){
  2175 + if (StringUtils.isNotEmpty(quickenSelect)) {
2163 2176 antExChuModel.setQuickenSelect(quickenSelect);
2164 2177 }
2165   - if (StringUtils.isNotEmpty(xhdbSelect)){
  2178 + if (StringUtils.isNotEmpty(xhdbSelect)) {
2166 2179 antExChuModel.setXhdbSelect(xhdbSelect);
2167 2180 }
2168   - if (StringUtils.isNotEmpty(xhdbSelectOtherVal)){
  2181 + if (StringUtils.isNotEmpty(xhdbSelectOtherVal)) {
2169 2182 antExChuModel.setXhdbSelectOtherVal(xhdbSelectOtherVal);
2170 2183 }
2171   - if (StringUtils.isNotEmpty(ndbSelect)){
  2184 + if (StringUtils.isNotEmpty(ndbSelect)) {
2172 2185 antExChuModel.setNdbSelect(ndbSelect);
2173 2186 }
2174   - if (StringUtils.isNotEmpty(ndbSelectOtherVal)){
  2187 + if (StringUtils.isNotEmpty(ndbSelectOtherVal)) {
2175 2188 antExChuModel.setNdbSelectOtherVal(ndbSelectOtherVal);
2176 2189 }
2177 2190 return antExChuModel;