|
@@ -147,7 +147,7 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
|
|
|
checkbox(mappings,"样品储存要求", "☐室温 ☐冷藏(0℃~8℃) ☐冷冻(≤18℃) ☐避光 ☐干燥 ☐其他", detail.getStorageRequirements());
|
|
|
mappings.put("样品储存要求-其他", detail.getStorageRequirementsOther());
|
|
|
checkbox(mappings,"样品保留期限", "☐常规样品一个月(默认) ☐新鲜产品一周 ☐冷冻产品三周", detail.getRetentionPeriod());
|
|
|
- mappings.put("非危险性样品", "☐非危险性样品");
|
|
|
+ mappings.put("非危险性样品", (WhetherEnum.NO.getCode().equals(detail.getHazard()) ? "☑" : "☐") + "非危险性样品");
|
|
|
checkbox(mappings,"危险性样品", "☐易燃易爆 ☐腐蚀性 ☐毒性(非剧毒) ☐氧化剂 ☐其他", detail.getHazardDescription());
|
|
|
mappings.put("危险性样品-其他", detail.getHazardDescriptionOther());
|
|
|
checkbox(mappings,"服务时限", "☐标准时间(7个工作日) ☐5个工作日\n\n☐3个工作日 ☐1个工作日\n\n☐加急", detail.getServiceDeadline());
|
|
@@ -184,14 +184,6 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
|
|
|
}
|
|
|
checkbox(mappings,"矿物质条目", "☐硒 ☐总磷 ☐氟 ☐铜 ☐铁 ☐锌 ☐锰 ☐钙 ☐钾 ☐钠 ☐镁 ☐其他", join);
|
|
|
mappings.put("矿物质条目-其他", foodMineral.getString("qt"));
|
|
|
- //污染物
|
|
|
- JSONObject foodPollutant = detectionObj.getJSONObject("foodPollutant");
|
|
|
- join = CollUtil.join(foodPollutant.getJSONArray("values"), ",");
|
|
|
- if (StrUtil.isNotBlank(join)) {
|
|
|
- sb.append(",").append(foodPollutant.getString("title"));
|
|
|
- }
|
|
|
- checkbox(mappings,"污染物条目", "☐亚硝酸盐 ☐铅 ☐镉 ☐铬 ☐总砷 ☐汞 ☐游离棉酚 ☐组胺 ☐苯并(a)芘 ☐其他", join);
|
|
|
- mappings.put("污染物条目-其他", foodPollutant.getString("qt"));
|
|
|
//维生素
|
|
|
JSONObject foodVitamin = detectionObj.getJSONObject("foodVitamin");
|
|
|
join = CollUtil.join(foodVitamin.getJSONArray("values"), ",");
|
|
@@ -200,6 +192,14 @@ public class SampleFoodServiceImpl extends ServiceImpl<SampleFoodMapper, SampleF
|
|
|
}
|
|
|
checkbox(mappings,"维生素条目", "☐维生素D3 ☐维生素E ☐维生素B1 ☐维生素B6 ☐泛酸 ☐维生素C ☐生物素 ☐维生素A ☐维生素K3 ☐维生素B2 ☐烟酸 ☐维生素B12 ☐叶酸 ☐左旋肉碱 ☐其他", join);
|
|
|
mappings.put("维生素条目-其他", foodVitamin.getString("qt"));
|
|
|
+ //污染物
|
|
|
+ JSONObject foodPollutant = detectionObj.getJSONObject("foodPollutant");
|
|
|
+ join = CollUtil.join(foodPollutant.getJSONArray("values"), ",");
|
|
|
+ if (StrUtil.isNotBlank(join)) {
|
|
|
+ sb.append(",").append(foodPollutant.getString("title"));
|
|
|
+ }
|
|
|
+ checkbox(mappings,"污染物条目", "☐亚硝酸盐 ☐铅 ☐镉 ☐铬 ☐总砷 ☐汞 ☐游离棉酚 ☐组胺 ☐苯并(a)芘 ☐其他", join);
|
|
|
+ mappings.put("污染物条目-其他", foodPollutant.getString("qt"));
|
|
|
//真菌毒素
|
|
|
JSONObject foodMucus = detectionObj.getJSONObject("foodMucus");
|
|
|
join = CollUtil.join(foodMucus.getJSONArray("values"), ",");
|