fix：[档案管理]给药制剂，麻精药翻译

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java

@@ -674,8 +674,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
@@ -704,8 +704,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -1430,8 +1430,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         this.updateById(gyzjOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
@@ -1460,8 +1460,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         this.updateById(gyzjOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -671,8 +671,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
@@ -701,8 +701,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -1337,8 +1337,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
@@ -1367,8 +1367,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         this.updateById(mjyOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
-        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getJyjsrq()));
         formData.put("原因", form.getRemark());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java

@@ -107,6 +107,13 @@ public class GyzjJcnrUtil {
         mapLang.put("拒绝入库","Reject Check-in");
         mapLang.put("目的","Purpose");
 
+        mapLang.put("同意归档","同意归档");
+        mapLang.put("拒绝归档","拒绝归档");
+        mapLang.put("同意解档","同意解档");
+        mapLang.put("拒绝解档","拒绝解档");
+        mapLang.put("同意借阅","同意借阅");
+        mapLang.put("拒绝借阅","拒绝借阅");
+        mapLang.put("确认归还","确认归还");
     }
 
     public static void main(String[] args) {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java

@@ -102,7 +102,14 @@ public class MjyJcnrUtil {
 
         mapLang.put("入库位置","Check-in Location");
         mapLang.put("入库条件","Check-in Condition");
-        mapLang.put("减少量","Reduction");
+        mapLang.put("同意归档","同意归档");
+        mapLang.put("拒绝归档","拒绝归档");
+        mapLang.put("同意解档","同意解档");
+        mapLang.put("拒绝解档","拒绝解档");
+        mapLang.put("同意借阅","同意借阅");
+        mapLang.put("拒绝借阅","拒绝借阅");
+        mapLang.put("确认归还","确认归还");
+
     }
 
     public static void main(String[] args) {