Merge remote-tracking branch 'origin/his/xm5y' into his/xm5y

src/main/java/com/diagbot/facade/str/AStrOperativeNoteFacade.java

@@ -137,6 +137,8 @@ public class AStrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
                     aMedicalRecordFacade.executeByView(hisViewVos.get(0), modeId);
                     this.dealData(strOperativeNote);
                 }
+            }else{
+                aMedicalRecordFacade.executeByView(hisViewVos.get(0), modeId);
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);

src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mrqc-sys</id>
+
+	<classpath>
+		<dir name="${rebel.projectpath.mrqc-sys}/target/classes">
+		</dir>
+	</classpath>
+
+</application>