Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -833,6 +833,11 @@ public class CtqyyClient extends CommonHttpClient {
 //                    else
 //                        thrInvResultResponse.setInvCode(ptxhInvResponse.getInDept());
 
+                    thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo());
+                    thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName());
+                    thrInvResultResponse.setChargeTime(ptxhInvResponse.getFeeTime());
+                    thrInvResultResponse.setChargeUser(ptxhInvResponse.getFeeOper());
+
                     thrInvResultResponse.setInvCode("1000003");
                     thrInvResultResponse.setDeptCode("1002");
                     thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo());

src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java

@@ -170,4 +170,15 @@ public class ThrInvResultResponse {
      * 患者名称
      */
     private String sickerName;
+
+    /**
+     * 收费时间
+     */
+    private String chargeTime;
+
+    /**
+     * 收费人员
+     */
+    private String chargeUser;
+
 }