jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9580efdb53dd6e768034d2e1d5e1dba7af2b2044

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

儿童疾病

Showing 14 changed files with 278 additions and 26 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/DepartmentsService.java View file @ 9580efd
1 1 package com.lyms.platform.permission.service;
2 2  
  3 +
3 4 import com.lyms.platform.permission.model.Departments;
4 5 import com.lyms.platform.permission.model.DepartmentsQuery;
5 6  
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 9580efd
... ... @@ -558,6 +558,25 @@
558 558  
559 559 //是否开通疾病发生推送 1或者空没有开通 2开通
560 560 private String openDisease;
  561 + private Date openDiseaseEndTime;
  562 +
  563 + private String openDiseaseType; //1一个月 12一年
  564 +
  565 + public String getOpenDiseaseType() {
  566 + return openDiseaseType;
  567 + }
  568 +
  569 + public void setOpenDiseaseType(String openDiseaseType) {
  570 + this.openDiseaseType = openDiseaseType;
  571 + }
  572 +
  573 + public Date getOpenDiseaseEndTime() {
  574 + return openDiseaseEndTime;
  575 + }
  576 +
  577 + public void setOpenDiseaseEndTime(Date openDiseaseEndTime) {
  578 + this.openDiseaseEndTime = openDiseaseEndTime;
  579 + }
561 580  
562 581 public String getOpenDisease() {
563 582 return openDisease;
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 9580efd
... ... @@ -1662,6 +1662,20 @@
1662 1662 }
1663 1663 }
1664 1664  
  1665 + if (null != openDiseaseEndTime ) {
  1666 + if (null != c) {
  1667 + c.and("openDiseaseEndTime").gte(openDiseaseEndTime);
  1668 + } else {
  1669 + c = Criteria.where("openDiseaseEndTime").gte(openDiseaseEndTime);
  1670 + }
  1671 + }
  1672 +
  1673 + if (null != openDiseaseType) {
  1674 + condition = condition.and("openDiseaseType", openDiseaseType, MongoOper.IS);
  1675 + }
  1676 +
  1677 +
  1678 +
1665 1679 /*if (null != endAge) {
1666 1680 if (null != c) {
1667 1681 c = c.gte(endAge);
platform-msg-generate/src/main/java/com/lyms/platform/msg/model/MessageContent.java View file @ 9580efd
... ... @@ -16,6 +16,15 @@
16 16 private String content;
17 17  
18 18 private String riskName;
  19 + private Integer disSort;
  20 +
  21 + public Integer getDisSort() {
  22 + return disSort;
  23 + }
  24 +
  25 + public void setDisSort(Integer disSort) {
  26 + this.disSort = disSort;
  27 + }
19 28  
20 29 public String getRiskName() {
21 30 return riskName;
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java View file @ 9580efd
... ... @@ -58,10 +58,11 @@
58 58  
59 59  
60 60  
61   - public static List<MessageContent> getBabyDiseaseMsg(String id,String disease) {
  61 + public static List<MessageContent> getBabyDiseaseMsg(String id,String disease,String openDisType) {
62 62 Map<String,String> param = new HashMap<>();
63 63 param.put("title", id);
64 64 param.put("disease", disease);
  65 + param.put("openDisType", openDisType);
65 66 String url = AMS_URL+"/v1/getBabyMessages";
66 67 String json = HttpClientUtil.doGet(url, param, "utf-8", "");
67 68 net.sf.json.JSONObject jsonObject = JsonUtil.getObj(json);
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java View file @ 9580efd
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.beans.MsgRequest;
5 5 import com.lyms.platform.biz.service.BabyBookbuildingService;
6 6 import com.lyms.platform.common.enums.*;
  7 +import com.lyms.platform.common.utils.DateUtil;
7 8 import com.lyms.platform.common.utils.JsonUtil;
8 9 import com.lyms.platform.common.utils.StringUtils;
9 10 import com.lyms.platform.msg.model.MessageContent;
... ... @@ -69,11 +70,6 @@
69 70 if (guideTimes == null || guideTimes.size() != 2) {
70 71 continue;
71 72 }
72   - //周几发送必须是配置页面配置的
73   - if (!guideTimes.contains(week))
74   - {
75   - continue;
76   - }
77 73  
78 74 //判断医院是否运行
79 75 if (!baseService.isRunning(hospitalId)) {
80 76  
... ... @@ -94,11 +90,8 @@
94 90 babyQuery.setYn(YnEnums.YES.getId());
95 91 babyQuery.setHospitalId(hospitalId);
96 92 babyQuery.setOpenDisease("2");
  93 + babyQuery.setOpenDiseaseEndTime(new Date());
97 94  
98   - //儿童年龄满六岁就不在提供短信服务
99   - Date birthdayMax = DateUtils.addYear(new Date(), -6);
100   - babyQuery.setBirthStart(birthdayMax);
101   -
102 95 //查询符合条件儿童
103 96 List<BabyModel> babies = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
104 97  
... ... @@ -111,6 +104,21 @@
111 104 if (baby == null || baby.getBirth() == null) {
112 105 continue;
113 106 }
  107 + Integer openDisDays = 0;// 开通天数
  108 + if ("12".equals(baby.getOpenDiseaseType())) //开通一年
  109 + {
  110 + //周几发送必须是配置页面配置的
  111 + if (!guideTimes.contains(week))
  112 + {
  113 + continue;
  114 + }
  115 + }
  116 + //开通一个月 一个月按照33天给服务
  117 + else if("1".equals(baby.getOpenDiseaseType()))
  118 + {
  119 + openDisDays = DateUtils.getBetweenMonths(DateUtil.addDay(baby.getOpenDiseaseEndTime(),-33),new Date());
  120 + }
  121 +
114 122 List<String> diseases = baby.getDiseases();
115 123 if (CollectionUtils.isNotEmpty(diseases))
116 124 {
... ... @@ -121,7 +129,7 @@
121 129 {
122 130 // 查询模板短信 从ams平台配置的短信通过医院IDa
123 131 List<MessageContent> amsSmses = AmsMessageService
124   - .getBabyDiseaseMsg(String.valueOf(weeks), BabyDiseaseEnums.getNameById(Integer.parseInt(did)));
  132 + .getBabyDiseaseMsg(String.valueOf(weeks), BabyDiseaseEnums.getNameById(Integer.parseInt(did)),baby.getOpenDiseaseType());
125 133 if (CollectionUtils.isNotEmpty(amsSmses))
126 134 {
127 135 for (MessageContent message : amsSmses)
... ... @@ -130,6 +138,15 @@
130 138 if (isExist) {
131 139 continue;
132 140 }
  141 + //开通一个月 按照ams短信配置的天数来发送
  142 + if ("1".equals(baby.getOpenDiseaseType()))
  143 + {
  144 + if(message.getDisSort().intValue() != openDisDays.intValue())
  145 + {
  146 + continue;
  147 + }
  148 + }
  149 +
133 150  
134 151 String weekDay = weeks + "周";
135 152 String messageContent = "【" + messagePrefix + "】" + message.getContent();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 9580efd
... ... @@ -853,5 +853,8 @@
853 853 HttpServletRequest httpServletRequest) {
854 854 return babyBookbuildingFacade.addAppBabyInfo(request);
855 855 }
  856 +
  857 +
  858 +
856 859 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 9580efd
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3  
  4 +import com.lyms.platform.biz.service.ModularFunctionConfigService;
4 5 import com.lyms.platform.common.annotation.TokenRequired;
5 6 import com.lyms.platform.common.base.BaseController;
6 7 import com.lyms.platform.common.base.LoginContext;
7 8  
... ... @@ -8,12 +9,17 @@
8 9 import com.lyms.platform.common.enums.OptActionEnums;
9 10 import com.lyms.platform.common.enums.UserTypeEnum;
10 11 import com.lyms.platform.common.enums.YnEnums;
  12 +import com.lyms.platform.common.result.BaseObjectResponse;
  13 +import com.lyms.platform.common.result.BaseResponse;
  14 +import com.lyms.platform.common.utils.ExceptionUtils;
11 15 import com.lyms.platform.common.utils.ResultUtils;
12 16 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
13 17 import com.lyms.platform.operate.web.facade.OperateLogFacade;
14 18 import com.lyms.platform.operate.web.result.FrontEndResult;
15 19 import com.lyms.platform.permission.model.*;
16 20 import com.lyms.platform.permission.service.*;
  21 +import com.lyms.platform.pojo.ModularFunctionConfigModel;
  22 +import com.lyms.platform.query.ModularFunctionConfigQuery;
17 23 import org.apache.commons.collections.CollectionUtils;
18 24 import org.apache.commons.lang.StringUtils;
19 25 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -22,9 +28,7 @@
22 28  
23 29 import javax.servlet.http.HttpServletRequest;
24 30 import javax.servlet.http.HttpServletResponse;
25   -import java.util.Collections;
26   -import java.util.Date;
27   -import java.util.List;
  31 +import java.util.*;
28 32  
29 33 /**
30 34 * Created by zhang.rui on 2015/9/28 0028.
31 35  
... ... @@ -35,13 +39,8 @@
35 39 private DepartmentsService departmentsService;
36 40 @Autowired
37 41 private UsersService usersService;
  42 +
38 43 @Autowired
39   - private TokenService tokenService;
40   - @Autowired
41   - private UserRoleMapsService userRoleMapsService;
42   - @Autowired
43   - private RolePermissionMapsService rolePermissionMapsService;
44   - @Autowired
45 44 private OrganizationService organizationService;
46 45 @Autowired
47 46 private AutoMatchFacade autoMatchFacade;
... ... @@ -49,6 +48,8 @@
49 48 @Autowired
50 49 private OperateLogFacade operateLogFacade;
51 50  
  51 + @Autowired
  52 + private ModularFunctionConfigService modularFunctionConfigServcie;
52 53  
53 54  
54 55  
... ... @@ -252,6 +253,71 @@
252 253 // ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
253 254 }
254 255  
  256 +
  257 + /**
  258 + * 查询医院的科室医生和是否开通疾病诊断
  259 + * @param hospitalId
  260 + * @return
  261 + */
  262 + @RequestMapping(value = "/getBabyDeptInfo", method = RequestMethod.GET)
  263 + @ResponseBody
  264 + public BaseResponse getBabyDeptInfo(@RequestParam(required = true) String hospitalId) {
  265 +
  266 + Map<String,Object> data = new HashMap<>();
  267 +
  268 + List<Map<String,String>> doctors = new ArrayList<>();
  269 +
  270 + DepartmentsQuery departmentsQuery = new DepartmentsQuery();
  271 + departmentsQuery.setKeyword("儿科");
  272 + departmentsQuery.setYn(YnEnums.YES.getId());
  273 + departmentsQuery.setOrgId(Integer.parseInt(hospitalId));
  274 + List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
  275 + if (CollectionUtils.isNotEmpty(departmentses))
  276 + {
  277 + Integer deptId = departmentses.get(0).getId();
  278 + UsersQuery usersQuery = new UsersQuery();
  279 + usersQuery.setYn(YnEnums.YES.getId());
  280 + usersQuery.setDeptId(deptId);
  281 + List<Users> userses = usersService.queryUsers(usersQuery);
  282 + if (CollectionUtils.isNotEmpty(userses))
  283 + {
  284 + for (Users users : userses)
  285 + {
  286 + Map<String,String> u = new HashMap<>();
  287 + u.put("id",users.getId()+"");
  288 + u.put("name",users.getName());
  289 + doctors.add(u);
  290 + }
  291 + }
  292 + }
  293 +
  294 + data.put("doctors",doctors);
  295 +
  296 + ModularFunctionConfigQuery diagnoseConfigQuery = new ModularFunctionConfigQuery();
  297 + diagnoseConfigQuery.setHospitalId(hospitalId);
  298 + String isOpen = "false";
  299 + try {
  300 + List<ModularFunctionConfigModel> configModels = modularFunctionConfigServcie.queryDiagnoseConfigs(diagnoseConfigQuery);
  301 + if (CollectionUtils.isNotEmpty(configModels)) {
  302 + for (ModularFunctionConfigModel model : configModels) {
  303 + List<Map<String, Object>> list = model.getConfigs();
  304 + if (CollectionUtils.isNotEmpty(list)) {
  305 + for (Map<String, Object> config : list) {
  306 + if ("66".equals(String.valueOf(config.get("type")))) {
  307 + isOpen = "2".equals(String.valueOf(config.get("value"))) ? "true" : "false";
  308 + }
  309 + }
  310 + }
  311 + }
  312 + }
  313 + } catch (Exception e) {
  314 + ExceptionUtils.catchException(e, "queryHospitalSmsSendConfig error.");
  315 + }
  316 + data.put("isOpen",isOpen);
  317 +
  318 + return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  319 +
  320 + }
255 321  
256 322 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9580efd
... ... @@ -1479,6 +1479,8 @@
1479 1479 bm.setBlNo(b.getBlNo());
1480 1480  
1481 1481 bm.setOpenDisease(b.getOpenDisease());
  1482 + bm.setOpenDiseaseType(b.getOpenDiseaseType());
  1483 + bm.setOpenDiseaseEndTime(b.getOpenDiseaseType() ==null ? null : DateUtil.addMonth(bm.getBuildDate(),Integer.parseInt(b.getOpenDiseaseType())));
1482 1484  
1483 1485 return bm;
1484 1486 }
1485 1487  
1486 1488  
1487 1489  
1488 1490  
... ... @@ -5121,22 +5123,81 @@
5121 5123 request.setBuildDate(DateUtil.getyyyy_MM_dd(new Date()));
5122 5124 request.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
5123 5125  
  5126 +
5124 5127 UsersQuery usersQuery = new UsersQuery();
5125 5128 usersQuery.setYn(YnEnums.YES.getId());
5126 5129 usersQuery.setOrgId(Integer.parseInt(appRequest.getHospitalId()));
5127 5130 List<Users> users = usersService.queryUsers(usersQuery);
5128   - BaseObjectResponse baseObjectResponse = addBabyBookbuilding(request, users.get(0).getId());
  5131 + Integer userId = users.get(0).getId();
  5132 +
  5133 + if (CollectionUtils.isNotEmpty(appRequest.getDiseases()))
  5134 + {
  5135 + request.setOpenDisease("2");//开通疾病
  5136 + request.setOpenDiseaseType(appRequest.getOpenDisType());
  5137 + request.setBuildDoctor(appRequest.getDoctorId());
  5138 + userId = Integer.parseInt(appRequest.getDoctorId());
  5139 + }
  5140 +
  5141 + BaseObjectResponse baseObjectResponse = addBabyBookbuilding(request, userId);
5129 5142 if (baseObjectResponse.getErrorcode() != 0)
5130 5143 {
5131 5144 return baseObjectResponse;
5132 5145 }
5133 5146 appRequest.setId(String.valueOf(baseObjectResponse.getData()));
  5147 +
  5148 +
  5149 +
5134 5150 }
5135 5151  
5136 5152 BabyModel babyModelDb = babyService.getOneBabyById(appRequest.getId());
5137 5153  
  5154 + if (CollectionUtils.isNotEmpty(appRequest.getDiseases()))
  5155 + {
  5156 + //创建儿童检查
  5157 + createBabyCheck(babyModelDb,appRequest.getDiseases());
  5158 + }
  5159 +
5138 5160 return new BaseObjectResponse()
5139 5161 .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(babyModelDb.getEncoded());
5140 5162 }
  5163 + @Autowired
  5164 + private GuidelinesService guidelinesService;
  5165 +
  5166 + public void createBabyCheck(BabyModel babyModelDb,List<String> diseases)
  5167 + {
  5168 +
  5169 + int babyMonth = DateUtil.getBabyAgeMonth(babyModelDb.getBirth(),new Date());
  5170 +
  5171 + BabyCheckRequest request = new BabyCheckRequest();
  5172 + request.setPid(babyModelDb.getPid());
  5173 + request.setBuildId(babyModelDb.getId());
  5174 + request.setCheckDate(DateUtil.getyyyy_MM_dd(new Date()));
  5175 + request.setCheckDoctor(babyModelDb.getBuildDoctor());
  5176 + request.setDiseases(diseases);
  5177 + request.setMonthAge(DateUtil.getBabyMonthAge(babyModelDb.getBirth(), new Date()));
  5178 +
  5179 + GuidelinesQuery guidelinesQuery=new GuidelinesQuery();
  5180 + guidelinesQuery.setType(3);
  5181 + guidelinesQuery.setMaxStart(babyMonth);
  5182 + guidelinesQuery.setMinEnd(babyMonth);
  5183 + guidelinesQuery.setNumber(babyMonth);
  5184 +
  5185 + //指导意见
  5186 + List<Guidelines> list = guidelinesService.queryGuidelines(guidelinesQuery);
  5187 + StringBuilder stringBuilder=new StringBuilder(500);
  5188 + if(CollectionUtils.isNotEmpty(list)){
  5189 + for(Guidelines guidelines:list){
  5190 + stringBuilder.append(guidelines.getCategory()).append(" ").append(guidelines.getContent()).append("\r\n");
  5191 + }
  5192 + }
  5193 + request.setGuideSuggest(stringBuilder.toString());
  5194 +
  5195 +
  5196 + babyCheckFacade.addBabyCheck(request,Integer.parseInt(babyModelDb.getBuildDoctor()));
  5197 +
  5198 + }
  5199 +
  5200 +
  5201 +
5141 5202 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 9580efd
... ... @@ -1950,7 +1950,7 @@
1950 1950 model.setWeight(checkModel.getWeight());
1951 1951 model.setHead(checkModel.getHead());
1952 1952 model.setHeightWeight(checkModel.getHeightWeight());
1953   - model.setGrowthEvaluate(JsonUtil.toList(checkModel.getGrowthEvaluate(), String.class));
  1953 + model.setGrowthEvaluate(checkModel.getGrowthEvaluate() == null ? null : JsonUtil.toList(checkModel.getGrowthEvaluate(), String.class));
1954 1954  
1955 1955  
1956 1956 model.setBilirubinHead(checkModel.getBilirubinHead());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java View file @ 9580efd
... ... @@ -22,6 +22,37 @@
22 22 private String mommyName;
23 23 private String vcCardNo;
24 24 private String hospitalId;
  25 +
  26 + private String doctorId;
  27 + //儿童疾病
  28 + private List<String> diseases;
  29 +
  30 + private String openDisType;
  31 +
  32 + public String getOpenDisType() {
  33 + return openDisType;
  34 + }
  35 +
  36 + public void setOpenDisType(String openDisType) {
  37 + this.openDisType = openDisType;
  38 + }
  39 +
  40 + public List<String> getDiseases() {
  41 + return diseases;
  42 + }
  43 +
  44 + public void setDiseases(List<String> diseases) {
  45 + this.diseases = diseases;
  46 + }
  47 +
  48 + public String getDoctorId() {
  49 + return doctorId;
  50 + }
  51 +
  52 + public void setDoctorId(String doctorId) {
  53 + this.doctorId = doctorId;
  54 + }
  55 +
25 56 public String getId() {
26 57 return id;
27 58 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ 9580efd
... ... @@ -367,6 +367,15 @@
367 367  
368 368 //是否开通疾病发生推送 0或者空没有开通 1开通
369 369 private String openDisease;
  370 + private String openDiseaseType; //1一个月 12一年
  371 +
  372 + public String getOpenDiseaseType() {
  373 + return openDiseaseType;
  374 + }
  375 +
  376 + public void setOpenDiseaseType(String openDiseaseType) {
  377 + this.openDiseaseType = openDiseaseType;
  378 + }
370 379  
371 380 public String getOpenDisease() {
372 381 return openDisease;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 9580efd
... ... @@ -309,7 +309,25 @@
309 309  
310 310 //是否开通疾病发生推送 1或者空没有开通 2开通
311 311 private String openDisease;
  312 + private String openDiseaseType;
  313 + private String openDiseaseEndTime;
312 314  
  315 + public String getOpenDiseaseEndTime() {
  316 + return openDiseaseEndTime;
  317 + }
  318 +
  319 + public void setOpenDiseaseEndTime(String openDiseaseEndTime) {
  320 + this.openDiseaseEndTime = openDiseaseEndTime;
  321 + }
  322 +
  323 + public String getOpenDiseaseType() {
  324 + return openDiseaseType;
  325 + }
  326 +
  327 + public void setOpenDiseaseType(String openDiseaseType) {
  328 + this.openDiseaseType = openDiseaseType;
  329 + }
  330 +
313 331 public String getOpenDisease() {
314 332 return openDisease;
315 333 }
... ... @@ -1317,7 +1335,9 @@
1317 1335 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
1318 1336 setFileCode(destModel.getFileCode());
1319 1337  
1320   - setOpenDisease((StringUtils.isEmpty(destModel.getOpenDisease()) || "1".equals(destModel.getOpenDisease())) ? "未开通" : "已开通" );
  1338 + setOpenDisease((StringUtils.isEmpty(destModel.getOpenDisease()) || "1".equals(destModel.getOpenDisease())) ? "未开通" : "已开通");
  1339 + setOpenDiseaseType(StringUtils.isEmpty(destModel.getOpenDiseaseType()) ? "" : "1".equals(destModel.getOpenDiseaseType()) ? "一个月" : "一年");
  1340 + setOpenDiseaseEndTime(destModel.getOpenDiseaseEndTime() == null ? "" : DateUtil.getyyyy_MM_dd(destModel.getOpenDiseaseEndTime()) );
1321 1341 return this;
1322 1342 }
1323 1343  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 9580efd
... ... @@ -37,7 +37,7 @@
37 37 */
38 38 @Service("syncDataTaskService")
39 39 public class SyncDataTaskService {
40   -
  40 + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
41 41 private static final Map<String,String> urls = new LinkedHashMap<>();
42 42  
43 43 static
... ... @@ -167,8 +167,9 @@
167 167 {
168 168 if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals(
169 169 model.getClassName()) || "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName())
170   - || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
171   - || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB"))
  170 +// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89")
  171 +// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB")
  172 + )
172 173 {
173 174 //System.out.println("archiveData="+model.getClassName());
174 175 boo = true;